[arch-commits] Commit in kicad/repos (12 files)
Kyle Keen
kkeen at nymeria.archlinux.org
Wed Mar 6 14:22:48 UTC 2013
Date: Wednesday, March 6, 2013 @ 15:22:48
Author: kkeen
Revision: 85759
archrelease: copy trunk to community-i686, community-x86_64
Added:
kicad/repos/community-i686/PKGBUILD
(from rev 85758, kicad/trunk/PKGBUILD)
kicad/repos/community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
(from rev 85758, kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
kicad/repos/community-i686/kicad.install
(from rev 85758, kicad/trunk/kicad.install)
kicad/repos/community-x86_64/PKGBUILD
(from rev 85758, kicad/trunk/PKGBUILD)
kicad/repos/community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
(from rev 85758, kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
kicad/repos/community-x86_64/kicad.install
(from rev 85758, kicad/trunk/kicad.install)
Deleted:
kicad/repos/community-i686/PKGBUILD
kicad/repos/community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
kicad/repos/community-i686/kicad.install
kicad/repos/community-x86_64/PKGBUILD
kicad/repos/community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
kicad/repos/community-x86_64/kicad.install
--------------------------------------------------------------------+
community-i686/PKGBUILD | 102 +++++-----
community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch | 22 +-
community-i686/kicad.install | 30 +-
community-x86_64/PKGBUILD | 102 +++++-----
community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch | 22 +-
community-x86_64/kicad.install | 30 +-
6 files changed, 160 insertions(+), 148 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-03-06 14:22:23 UTC (rev 85758)
+++ community-i686/PKGBUILD 2013-03-06 14:22:48 UTC (rev 85759)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Marq Schneider <queueRAM at gmail.com>
-
-pkgname=kicad
-pkgver=20120119
-_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=3256
-pkgrel=4
-pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
-arch=('i686' 'x86_64')
-url="http://iut-tice.ujf-grenoble.fr/kicad/"
-license=('GPL')
-depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('cmake' 'zlib' 'mesa')
-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
- kicad-boost-polygon-declare-gtlsort-earlier.patch)
-md5sums=('d65574c42efd72638aed80adef367c3b'
- 'a2c39704238946e74a5ed0c38326345f')
-
-build() {
- cd "$srcdir/KiCad_sources"
-
- patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
-
- # FS#31559
- sed -i 's/-O2/-O1/' CMakeLists.txt
-
- # build and install kicad
- mkdir -p build/Release
- cd build/Release
- cmake ../.. -DKICAD_STABLE_VERSION=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/KiCad_sources/build/Release"
-
- make DESTDIR="$pkgdir" install
-
- # copy updated linux icons
- #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
-}
Copied: kicad/repos/community-i686/PKGBUILD (from rev 85758, kicad/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-03-06 14:22:48 UTC (rev 85759)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Marq Schneider <queueRAM at gmail.com>
+
+pkgname=kicad
+pkgver=20130226
+_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
+_pkgbzr=3974
+pkgrel=4
+pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
+arch=('i686' 'x86_64')
+url="http://iut-tice.ujf-grenoble.fr/kicad/"
+license=('GPL')
+depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('cmake' 'zlib' 'mesa')
+optdepends=('kicad-docs-bzr: for documentation'
+ 'kicad-library-bzr: for footprints')
+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)
+md5sums=('9b7748efedc355473c72fdb7c37b0500'
+ 'a2c39704238946e74a5ed0c38326345f')
+
+build() {
+ 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
+
+ # build and install kicad
+ mkdir -p build/Release
+ cd build/Release
+ cmake ../.. -DKICAD_STABLE_VERSION=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ 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/"
+}
+
Deleted: community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
===================================================================
--- community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch 2013-03-06 14:22:23 UTC (rev 85758)
+++ community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch 2013-03-06 14:22:48 UTC (rev 85759)
@@ -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"
Copied: kicad/repos/community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch (from rev 85758, kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
===================================================================
--- community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch (rev 0)
+++ community-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch 2013-03-06 14:22:48 UTC (rev 85759)
@@ -0,0 +1,11 @@
+--- 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: community-i686/kicad.install
===================================================================
--- community-i686/kicad.install 2013-03-06 14:22:23 UTC (rev 85758)
+++ community-i686/kicad.install 2013-03-06 14:22:48 UTC (rev 85759)
@@ -1,15 +0,0 @@
-pkgname=kicad
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: kicad/repos/community-i686/kicad.install (from rev 85758, kicad/trunk/kicad.install)
===================================================================
--- community-i686/kicad.install (rev 0)
+++ community-i686/kicad.install 2013-03-06 14:22:48 UTC (rev 85759)
@@ -0,0 +1,15 @@
+pkgname=kicad
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-mime-database usr/share/mime > /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-03-06 14:22:23 UTC (rev 85758)
+++ community-x86_64/PKGBUILD 2013-03-06 14:22:48 UTC (rev 85759)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Marq Schneider <queueRAM at gmail.com>
-
-pkgname=kicad
-pkgver=20120119
-_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=3256
-pkgrel=4
-pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
-arch=('i686' 'x86_64')
-url="http://iut-tice.ujf-grenoble.fr/kicad/"
-license=('GPL')
-depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('cmake' 'zlib' 'mesa')
-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
- kicad-boost-polygon-declare-gtlsort-earlier.patch)
-md5sums=('d65574c42efd72638aed80adef367c3b'
- 'a2c39704238946e74a5ed0c38326345f')
-
-build() {
- cd "$srcdir/KiCad_sources"
-
- patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
-
- # FS#31559
- sed -i 's/-O2/-O1/' CMakeLists.txt
-
- # build and install kicad
- mkdir -p build/Release
- cd build/Release
- cmake ../.. -DKICAD_STABLE_VERSION=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/KiCad_sources/build/Release"
-
- make DESTDIR="$pkgdir" install
-
- # copy updated linux icons
- #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
-}
Copied: kicad/repos/community-x86_64/PKGBUILD (from rev 85758, kicad/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-03-06 14:22:48 UTC (rev 85759)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Marq Schneider <queueRAM at gmail.com>
+
+pkgname=kicad
+pkgver=20130226
+_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
+_pkgbzr=3974
+pkgrel=4
+pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
+arch=('i686' 'x86_64')
+url="http://iut-tice.ujf-grenoble.fr/kicad/"
+license=('GPL')
+depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('cmake' 'zlib' 'mesa')
+optdepends=('kicad-docs-bzr: for documentation'
+ 'kicad-library-bzr: for footprints')
+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)
+md5sums=('9b7748efedc355473c72fdb7c37b0500'
+ 'a2c39704238946e74a5ed0c38326345f')
+
+build() {
+ 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
+
+ # build and install kicad
+ mkdir -p build/Release
+ cd build/Release
+ cmake ../.. -DKICAD_STABLE_VERSION=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ 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/"
+}
+
Deleted: community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
===================================================================
--- community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch 2013-03-06 14:22:23 UTC (rev 85758)
+++ community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch 2013-03-06 14:22:48 UTC (rev 85759)
@@ -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"
Copied: kicad/repos/community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch (from rev 85758, kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
===================================================================
--- community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch (rev 0)
+++ community-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch 2013-03-06 14:22:48 UTC (rev 85759)
@@ -0,0 +1,11 @@
+--- 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: community-x86_64/kicad.install
===================================================================
--- community-x86_64/kicad.install 2013-03-06 14:22:23 UTC (rev 85758)
+++ community-x86_64/kicad.install 2013-03-06 14:22:48 UTC (rev 85759)
@@ -1,15 +0,0 @@
-pkgname=kicad
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: kicad/repos/community-x86_64/kicad.install (from rev 85758, kicad/trunk/kicad.install)
===================================================================
--- community-x86_64/kicad.install (rev 0)
+++ community-x86_64/kicad.install 2013-03-06 14:22:48 UTC (rev 85759)
@@ -0,0 +1,15 @@
+pkgname=kicad
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-mime-database usr/share/mime > /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
More information about the arch-commits
mailing list