Tue Jun 17 03:23:47 UTC 2014

3 files changed, 39 insertions, 28 deletions

diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index a5fbb6ce3..d07fdea0a 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 111472 2014-05-19 09:49:08Z spupykin $
+# $Id: PKGBUILD 113162 2014-06-14 19:22:15Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-gui
 pkgver=0.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUstep GUI class library"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
@@ -16,17 +16,19 @@ conflicts=('gnustep-gui-svn')
 groups=('gnustep-core')
 options=('!makeflags')
 source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz
-        giflib-5.0.patch)
+        giflib-5.1.patch)
 md5sums=('bd289f0c7b2626d093ad92364069b9a7'
-         'b998c0bc3e2bc260c2779d7a50ce6407')
+         '78b6470b9a43ac7025621fef07d2faef')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i ../giflib-5.1.patch
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   . /etc/profile.d/GNUstep.sh
   ./configure --prefix=/usr --sysconfdir=/etc/GNUstep
-#  sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h
-#  sed -i 's|png_sizeof|sizeof|g' Source/NSBitmapImageRep+PNG.m
-#  patch -Np1 -i ../giflib-5.0.patch
   make
 }
 
diff --git a/community/gnustep-gui/giflib-5.0.patch b/community/gnustep-gui/giflib-5.0.patch
deleted file mode 100644
index 3d8a32d27..000000000
--- a/community/gnustep-gui/giflib-5.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN a/Source/NSBitmapImageRep+GIF.m b/Source/NSBitmapImageRep+GIF.m
---- a/Source/NSBitmapImageRep+GIF.m	2013-01-13 14:57:37.000000000 +0100
-+++ b/Source/NSBitmapImageRep+GIF.m	2013-07-30 11:30:19.630935640 +0200
-@@ -142,7 +142,7 @@ static int gs_gif_output(GifFileType *fi
-     }
- 
-   gs_gif_init_input_source(&src, imageData);
--  file = DGifOpen(&src, gs_gif_input);
-+  file = DGifOpen(&src, gs_gif_input, NULL);
-   if (file == NULL)
-     {
-       /* we do not use giferror here because it doesn't
-@@ -216,7 +216,7 @@ static int gs_gif_output(GifFileType *fi
- 
-   /* open the image */
-   gs_gif_init_input_source(&src, imageData);
--  file = DGifOpen(&src, gs_gif_input);
-+  file = DGifOpen(&src, gs_gif_input, NULL);
-   if (file == NULL)
-     {
-       /* we do not use giferror here because it doesn't
diff --git a/community/gnustep-gui/giflib-5.1.patch b/community/gnustep-gui/giflib-5.1.patch
new file mode 100644
index 000000000..61b2aef80
--- /dev/null
+++ b/community/gnustep-gui/giflib-5.1.patch
@@ -0,0 +1,30 @@
+diff -wbBur gnustep-gui-0.24.0/Source/NSBitmapImageRep+GIF.m gnustep-gui-0.24.0.my/Source/NSBitmapImageRep+GIF.m
+--- gnustep-gui-0.24.0/Source/NSBitmapImageRep+GIF.m	2013-11-24 15:56:33.000000000 +0400
++++ gnustep-gui-0.24.0.my/Source/NSBitmapImageRep+GIF.m	2014-05-29 18:48:13.333993653 +0400
+@@ -161,7 +161,7 @@
+       return NO;
+     }
+ 
+-  DGifCloseFile(file);
++  DGifCloseFile(file, NULL);
+   return YES;
+ }
+ 
+@@ -180,7 +180,7 @@
+    SET_ERROR_MSG(msg); \
+    if (file != NULL) \
+      {\
+-       DGifCloseFile(file); \
++       DGifCloseFile(file, NULL); \
+      }\
+    if (imgBuffer != NULL) \
+      {\
+@@ -392,7 +392,7 @@
+           withValue: [NSNumber numberWithInt: 0]];
+ 
+   /* don't forget to close the gif */
+-  DGifCloseFile(file);
++  DGifCloseFile(file, NULL);
+ 
+   return self;
+ }