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

[Kyle Keen]

    Date: Wednesday, March 6, 2013 @ 15:22:23
  Author: kkeen
Revision: 85758

upgpkg: kicad 20130226-4

Modified:
  kicad/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-06 11:32:11 UTC (rev 85757)
+++ PKGBUILD	2013-03-06 14:22:23 UTC (rev 85758)
@@ -3,9 +3,9 @@
 # Contributor: Marq Schneider <queueRAM at gmail.com>
 
 pkgname=kicad
-pkgver=20120119
+pkgver=20130226
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=3256
+_pkgbzr=3974
 pkgrel=4
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
 arch=('i686' 'x86_64')
@@ -16,16 +16,21 @@
 optdepends=('kicad-docs-bzr: for documentation' 
             'kicad-library-bzr: for footprints')
 install=kicad.install
-source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources-$_pkgver-BZR$_pkgbzr-stable.zip
+source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}_sources_stable_${_pkgver}_BZR${_pkgbzr}.zip
         kicad-boost-polygon-declare-gtlsort-earlier.patch)
-md5sums=('d65574c42efd72638aed80adef367c3b'
+md5sums=('9b7748efedc355473c72fdb7c37b0500'
          'a2c39704238946e74a5ed0c38326345f')
 
 build() {
-  cd "$srcdir/KiCad_sources"
+  cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
 
   patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
 
+  # 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
 
@@ -39,10 +44,11 @@
 }
 
 package() {
-  cd "$srcdir/KiCad_sources/build/Release"
+  cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}/build/Release"
 
   make DESTDIR="$pkgdir" install
 
   # copy updated linux icons
   #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
 }
+