yair's patch

2 files changed, 13 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7981b1f17ec..779b640e33a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Oct 13 00:59:55 UTC 2016
 pkgbase = cenon
 	pkgdesc = GNUstep vector editor for EPS, DXF, Gerber, HPGL. Includes docs and examples.
 	pkgver = 4.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.cenon.info
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index da39d8f8ae96..fe3d36bcf143 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=cenon
 pkgver=4.0.2
 _libver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNUstep vector editor for EPS, DXF, Gerber, HPGL.  Includes docs and examples."
 arch=('i686' 'x86_64')
 url="http://www.cenon.info"
@@ -10,9 +10,6 @@ license=('custom:vhfPL')
 depends=('gnustep-base' 'gnustep-gui')
 makedepends=('gnustep-make' 'gcc-objc')
 options=('!strip')
-#source=(http://www.vhf-group.com/vhf-interservice/download/source/Cenon-$pkgver.tar.bz2
-#  http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-$_libver-1.tar.bz2
-#  http://www.vhf-group.com/vhf-interservice/download/doc/Cenon-4.0_gb.pdf
 source=("http://www.cenon.zone/download/source/Cenon-$pkgver.tar.bz2"
   "http://www.cenon.zone/download/source/CenonLibrary-$_libver-1.tar.bz2"
   "http://www.cenon.zone/download/doc/Cenon-4.0_gb.pdf"
@@ -22,10 +19,18 @@ md5sums=('ba6519d09106a250cbec72b28f970bbc'
          'SKIP'
          '015e2c1538788eb42c1320353a2da6e5')
 
+prepare() {
+  cd "$srcdir/Cenon"
+  patch -p1 VHFShared/vhfCompatibility.h "$srcdir/gcc47.patch"
+
+  sed -i 's|Diff((VFloat)|Diff((float)|' TileScrollView.m
+  sed -i 's|(VFloat)\[\[resPopupListButton|[[resPopupListButton|' TileScrollView.m
+  sed -i 's|\[\[resPopupListButton|[(TileScrollView*)[resPopupListButton|' TileScrollView.m
+}
+
 build() {
   cd "$srcdir/Cenon"
 
-  patch -p1 VHFShared/vhfCompatibility.h "$srcdir/gcc47.patch"
   export CFLAGS="$CFLAGS -g"
   export CXXFLAGS="$CXXFLAGS -g"