Date: Tuesday, January 7, 2014 @ 09:43:13
Author: bpiotrowski
Revision: 103526
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
kicad/repos/community-staging-i686/
kicad/repos/community-staging-i686/PKGBUILD
(from rev 103525, kicad/trunk/PKGBUILD)
kicad/repos/community-staging-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
(from rev 103525,
kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
kicad/repos/community-staging-i686/kicad.install
(from rev 103525, kicad/trunk/kicad.install)
kicad/repos/community-staging-i686/wxgtk3.0.patch
(from rev 103525, kicad/trunk/wxgtk3.0.patch)
kicad/repos/community-staging-x86_64/
kicad/repos/community-staging-x86_64/PKGBUILD
(from rev 103525, kicad/trunk/PKGBUILD)
kicad/repos/community-staging-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
(from rev 103525,
kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
kicad/repos/community-staging-x86_64/kicad.install
(from rev 103525, kicad/trunk/kicad.install)
kicad/repos/community-staging-x86_64/wxgtk3.0.patch
(from rev 103525, kicad/trunk/wxgtk3.0.patch)
----------------------------------------------------------------------------+
community-staging-i686/PKGBUILD |
57 ++++++++++
community-staging-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch |
11 +
community-staging-i686/kicad.install |
15 ++
community-staging-i686/wxgtk3.0.patch |
12 ++
community-staging-x86_64/PKGBUILD |
57 ++++++++++
community-staging-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch |
11 +
community-staging-x86_64/kicad.install |
15 ++
community-staging-x86_64/wxgtk3.0.patch |
12 ++
8 files changed, 190 insertions(+)
Copied: kicad/repos/community-staging-i686/PKGBUILD (from rev 103525,
kicad/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-01-07 08:43:13 UTC (rev 103526)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Kyle Keen <keen...@gmail.com>
+# Contributor: Marq Schneider <queue...@gmail.com>
+
+pkgname=kicad
+pkgver=20130518
+_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
+_pkgbzr=4017
+pkgrel=2
+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' 'libsm')
+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
+ wxgtk3.0.patch)
+md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79'
+ 'a2c39704238946e74a5ed0c38326345f'
+ 'ec3e7581c814ca2b76becc7b30a8529f')
+
+build() {
+ cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
+
+ patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
+ patch -p1 < "$srcdir/wxgtk3.0.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/"
+}
+
Copied:
kicad/repos/community-staging-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
(from rev 103525,
kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
===================================================================
--- community-staging-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
(rev 0)
+++ community-staging-i686/kicad-boost-polygon-declare-gtlsort-earlier.patch
2014-01-07 08:43:13 UTC (rev 103526)
@@ -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"
Copied: kicad/repos/community-staging-i686/kicad.install (from rev 103525,
kicad/trunk/kicad.install)
===================================================================
--- community-staging-i686/kicad.install (rev 0)
+++ community-staging-i686/kicad.install 2014-01-07 08:43:13 UTC (rev
103526)
@@ -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
+}
Copied: kicad/repos/community-staging-i686/wxgtk3.0.patch (from rev 103525,
kicad/trunk/wxgtk3.0.patch)
===================================================================
--- community-staging-i686/wxgtk3.0.patch (rev 0)
+++ community-staging-i686/wxgtk3.0.patch 2014-01-07 08:43:13 UTC (rev
103526)
@@ -0,0 +1,12 @@
+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__
Copied: kicad/repos/community-staging-x86_64/PKGBUILD (from rev 103525,
kicad/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-01-07 08:43:13 UTC (rev 103526)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Kyle Keen <keen...@gmail.com>
+# Contributor: Marq Schneider <queue...@gmail.com>
+
+pkgname=kicad
+pkgver=20130518
+_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
+_pkgbzr=4017
+pkgrel=2
+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' 'libsm')
+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
+ wxgtk3.0.patch)
+md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79'
+ 'a2c39704238946e74a5ed0c38326345f'
+ 'ec3e7581c814ca2b76becc7b30a8529f')
+
+build() {
+ cd "$srcdir/stable_${_pkgver}_BZR${_pkgbzr}"
+
+ patch -p0 < "$srcdir/kicad-boost-polygon-declare-gtlsort-earlier.patch"
+ patch -p1 < "$srcdir/wxgtk3.0.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/"
+}
+
Copied:
kicad/repos/community-staging-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
(from rev 103525,
kicad/trunk/kicad-boost-polygon-declare-gtlsort-earlier.patch)
===================================================================
--- community-staging-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
(rev 0)
+++ community-staging-x86_64/kicad-boost-polygon-declare-gtlsort-earlier.patch
2014-01-07 08:43:13 UTC (rev 103526)
@@ -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"
Copied: kicad/repos/community-staging-x86_64/kicad.install (from rev 103525,
kicad/trunk/kicad.install)
===================================================================
--- community-staging-x86_64/kicad.install (rev 0)
+++ community-staging-x86_64/kicad.install 2014-01-07 08:43:13 UTC (rev
103526)
@@ -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
+}
Copied: kicad/repos/community-staging-x86_64/wxgtk3.0.patch (from rev 103525,
kicad/trunk/wxgtk3.0.patch)
===================================================================
--- community-staging-x86_64/wxgtk3.0.patch (rev 0)
+++ community-staging-x86_64/wxgtk3.0.patch 2014-01-07 08:43:13 UTC (rev
103526)
@@ -0,0 +1,12 @@
+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__
