[arch-commits] Commit in kicad/trunk (PKGBUILD wxgtk3.0.patch)

[Bartłomiej Piotrowski]

    Date: Tuesday, January 7, 2014 @ 09:43:01
  Author: bpiotrowski
Revision: 103525

upgpkg: kicad 20130518-2

rebuild against wxgtk 3.0.0

Added:
  kicad/trunk/wxgtk3.0.patch
Modified:
  kicad/trunk/PKGBUILD

----------------+
 PKGBUILD       |   11 +++++++----
 wxgtk3.0.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-07 08:03:36 UTC (rev 103524)
+++ PKGBUILD	2014-01-07 08:43:01 UTC (rev 103525)
@@ -6,25 +6,28 @@
 pkgver=20130518
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
 _pkgbzr=4017
-pkgrel=1
+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')
+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)
+        kicad-boost-polygon-declare-gtlsort-earlier.patch
+        wxgtk3.0.patch)
 md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79'
-         'a2c39704238946e74a5ed0c38326345f')
+         '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

Added: wxgtk3.0.patch
===================================================================
--- wxgtk3.0.patch	                        (rev 0)
+++ wxgtk3.0.patch	2014-01-07 08:43:01 UTC (rev 103525)
@@ -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__