[arch-commits] Commit in kicad/trunk (3 files)

[Kyle Keen]

    Date: Thursday, December 3, 2015 @ 11:14:40
  Author: kkeen
Revision: 148193

upgpkg: kicad 4.0.0-1

Modified:
  kicad/trunk/PKGBUILD
Deleted:
  kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch
  kicad/trunk/wxgtk3.0.patch

---------------------------------------------------+
 PKGBUILD                                          |   72 ++++++++------------
 kicad-boost-polygon-declare-gtlsort-earlier.patch |   11 ---
 wxgtk3.0.patch                                    |   12 ---
 3 files changed, 30 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-03 08:56:42 UTC (rev 148192)
+++ PKGBUILD	2015-12-03 10:14:40 UTC (rev 148193)
@@ -3,70 +3,58 @@
 # Contributor: Marq Schneider <queueRAM at gmail.com>
 
 pkgname=kicad
-pkgver=20130518
-_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=4017
-pkgrel=3
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
 arch=('i686' 'x86_64')
-url="http://iut-tice.ujf-grenoble.fr/kicad/"
+#url="http://iut-tice.ujf-grenoble.fr/kicad/"
+url="http://kicad-pcb.org/"
 license=('GPL')
-depends=('glu' 'wxgtk2.8' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm')
-makedepends=('cmake' 'zlib' 'mesa')
-optdepends=('kicad-docs-bzr: for documentation'
-            'kicad-library-bzr: for footprints')
+depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm' 'boost-libs' 'glew')
+makedepends=('cmake' 'zlib' 'mesa' 'boost')
+optdepends=('kicad-library: for footprints and symbols'
+            'kicad-library-3d: for 3d models of components')
+# python optdep for plugins?
 install=kicad.install
-source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources-stable_${_pkgver}_BZR${_pkgbzr}.zip
-        kicad-boost-polygon-declare-gtlsort-earlier.patch
-        wxgtk3.0.patch)
-md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79'
-         'a2c39704238946e74a5ed0c38326345f'
-         'ec3e7581c814ca2b76becc7b30a8529f')
+source=("https://launchpad.net/kicad/4.0/4.0.0/+download/kicad-4.0.0.tar.xz"
+        "https://github.com/KiCad/kicad-i18n/archive/4.0.0.tar.gz")
+md5sums=('f4f7ea77ee854ca12e1fd4463f681657'
+         '991a099359fbbe6fa0dbba960b44eecb')
 
-#source=(https://launchpad.net/ubuntu/trusty/+source/kicad/0.${pkgver}+bzr${_pkgbzr}-2/+files/kicad_0.${pkgver}+bzr${_pkgbzr}.orig.tar.gz)
-# patches from https://launchpad.net/ubuntu/trusty/+source/kicad/0.20130727+bzr4024-2/+files/kicad_0.20130727+bzr4024-2.debian.tar.gz ?
+# svn rm the patches!
 
 build() {
-  cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
+  cd "$srcdir/kicad-$pkgver"
 
-  # kicad-boost-polygon-declare-gtlsort-earlier.patch
-  #sed -i '20i #include "detail/polygon_sort_adaptor.hpp"' include/boost/polygon/polygon.hpp
-  patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
-  #patch -p1 < "$srcdir/wxgtk3.0.patch"
-  #sed -i 's/wxStandardPaths/&::Get/' common/edaappl.cpp
-
-  # harmless build blocking error
-  # see https://lists.launchpad.net/kicad-developers/msg07841.html
-  # for proper fix
-  sed -i 's|^#.*error "You must use|//&|' include/common.h
-
   # FS#31559
-  sed -i 's/-O2/-O1/' CMakeLists.txt
+  # trying without this hack for 4.0.0 ...
+  #sed -i 's/-O2/-O1/' CMakeLists.txt
 
-  # Fix build with GCC 5.1 and C++11 ABI
-  CXXFLAGS+=' -D_GLIBCXX_USE_CXX11_ABI=0'
-  CXXFLAGS+=' -Wno-deprecated-declarations -Wno-unused-local-typedefs'
-
   # build and install kicad
   mkdir -p build/Release
   cd build/Release
-  # STABLE_VERSION gets removed, eventually
-  # gets ported to wxgtk3, eventually
   cmake ../.. -DKICAD_STABLE_VERSION=ON    \
               -DCMAKE_BUILD_TYPE=Release   \
-              -DCMAKE_INSTALL_PREFIX=/usr \
-              -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' \
-              -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8'
+              -DCMAKE_INSTALL_PREFIX=/usr  \
+              -DKICAD_SKIP_BOOST=ON        \
+              -DBUILD_GITHUB_PLUGIN=ON
   make
+
+  cd "$srcdir/kicad-i18n-$pkgver"
+  mkdir -p build/Release
+  cd build/Release
+  cmake ../.. -DKICAD_STABLE_VERSION=ON
+  make
 }
 
 package() {
-  cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}/build/Release"
+  cd "$srcdir/kicad-$pkgver/build/Release"
 
   make DESTDIR="$pkgdir" install
 
   # copy updated linux icons
   #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
+
+  cd "$srcdir/kicad-i18n-$pkgver/build/Release"
+  make DESTDIR="$pkgdir" install
 }
-
-

Deleted: kicad-boost-polygon-declare-gtlsort-earlier.patch
===================================================================
--- kicad-boost-polygon-declare-gtlsort-earlier.patch	2015-12-03 08:56:42 UTC (rev 148192)
+++ kicad-boost-polygon-declare-gtlsort-earlier.patch	2015-12-03 10:14:40 UTC (rev 148193)
@@ -1,11 +0,0 @@
---- include/boost/polygon/polygon.hpp.orig	2012-04-09 13:07:03.293907598 -0500
-+++ include/boost/polygon/polygon.hpp	2012-04-09 13:07:43.759923812 -0500
-@@ -24,6 +24,8 @@
- #include "transform.hpp"
- #include "detail/transform_detail.hpp"
- 
-+#include "detail/polygon_sort_adaptor.hpp"
-+
- //interval
- #include "interval_data.hpp"
- #include "interval_traits.hpp"

Deleted: wxgtk3.0.patch
===================================================================
--- wxgtk3.0.patch	2015-12-03 08:56:42 UTC (rev 148192)
+++ wxgtk3.0.patch	2015-12-03 10:14:40 UTC (rev 148193)
@@ -1,12 +0,0 @@
-diff -rupN a/common/edaappl.cpp b/common/edaappl.cpp
---- a/common/edaappl.cpp	2013-03-09 21:07:56.000000000 +0000
-+++ b/common/edaappl.cpp	2014-01-07 07:49:38.984938912 +0000
-@@ -451,7 +451,7 @@ bool EDA_APP::SetBinDir()
- 
-     // Linux and Unix
- #elif defined(__UNIX__)
--    m_BinDir = wxStandardPaths().GetExecutablePath();
-+    m_BinDir = wxStandardPaths::Get().GetExecutablePath();
- #else
-     m_BinDir = argv[0];
- #endif // __UNIX__