[packages/gnustep-gui] - updated to 0.24.0 - added giflib patch (fixes build with giflib 5.1+) - BR: libicns-devel (for Mac

[qboosh]

commit b4d1c253d3046ea73a1aa5fc4b5e7e44576b8cc0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 26 10:58:16 2014 +0200

    - updated to 0.24.0
    - added giflib patch (fixes build with giflib 5.1+)
    - BR: libicns-devel (for Mac ICNS icons support)

 gnustep-gui-giflib.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 gnustep-gui.spec         | 13 +++++------
 2 files changed, 63 insertions(+), 7 deletions(-)
---
diff --git a/gnustep-gui.spec b/gnustep-gui.spec
index 93dc4bf..d8e42dd 100644
--- a/gnustep-gui.spec
+++ b/gnustep-gui.spec
@@ -7,19 +7,19 @@
 Summary:	GNUstep GUI library package
 Summary(pl.UTF-8):	Biblioteka GNUstep GUI
 Name:		gnustep-gui
-%define	ver	0.23
-Version:	%{ver}.1
+%define	ver	0.24
+Version:	%{ver}.0
 Release:	1
 License:	LGPL v2+ (library), GPL v3+ (applications)
 Group:		Libraries
 Source0:	ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-# Source0-md5:	1771bdb42f27ee946b17bf60fef5eb2e
+# Source0-md5:	bd289f0c7b2626d093ad92364069b9a7
 Patch0:		%{name}-nocompressdocs.patch
 Patch1:		%{name}-doc.patch
+Patch2:		%{name}-giflib.patch
 URL:		http://www.gnustep.org/
 %{?with_magick:BuildRequires:	ImageMagick-devel}
 BuildRequires:	aspell-devel
-BuildRequires:	audiofile-devel
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	flite-devel
 BuildRequires:	gcc-objc
@@ -27,6 +27,7 @@ BuildRequires:	giflib-devel
 BuildRequires:	gnustep-base-devel >= 1.13.0
 BuildRequires:	gnustep-make-devel
 BuildRequires:	libao-devel
+BuildRequires:	libicns-devel
 BuildRequires:	libicu-devel >= 4.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
@@ -63,10 +64,7 @@ Summary:	GNUstep GUI headers and libs
 Summary(pl.UTF-8):	Pliki nagłówkowe GNUstep GUI
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	audiofile-devel
 Requires:	gnustep-base-devel >= 1.13.0
-Requires:	libjpeg-devel
-Requires:	libtiff-devel
 Conflicts:	gnustep-core
 
 %description devel
@@ -81,6 +79,7 @@ biblioteki GNUstep GUI.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
diff --git a/gnustep-gui-giflib.patch b/gnustep-gui-giflib.patch
new file mode 100644
index 0000000..a49a5fd
--- /dev/null
+++ b/gnustep-gui-giflib.patch
@@ -0,0 +1,57 @@
+--- gnustep-gui-0.24.0/Source/NSBitmapImageRep+GIF.m.orig	2013-11-24 12:56:33.000000000 +0100
++++ gnustep-gui-0.24.0/Source/NSBitmapImageRep+GIF.m	2014-07-26 09:06:35.620852420 +0200
+@@ -161,7 +161,11 @@
+       return NO;
+     }
+ 
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
++  DGifCloseFile(file, NULL);
++#else
+   DGifCloseFile(file);
++#endif
+   return YES;
+ }
+ 
+@@ -176,11 +180,17 @@
+        NSLog(@"%@", msg);\
+      }
+ 
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
++#  define GIF_CLOSE_FILE(file) DGifCloseFile(file, NULL)
++#else
++#  define GIF_CLOSE_FILE(file) DGifCloseFile(file)
++#endif
++
+ #define GIF_CREATE_ERROR(msg) \
+    SET_ERROR_MSG(msg); \
+    if (file != NULL) \
+      {\
+-       DGifCloseFile(file); \
++       GIF_CLOSE_FILE(file); \
+      }\
+    if (imgBuffer != NULL) \
+      {\
+@@ -392,7 +402,11 @@
+           withValue: [NSNumber numberWithInt: 0]];
+ 
+   /* don't forget to close the gif */
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
++  DGifCloseFile(file, NULL);
++#else
+   DGifCloseFile(file);
++#endif
+ 
+   return self;
+ }
+@@ -560,7 +574,11 @@
+ 	}
+       GIFImageP += width;
+     }
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
++  status = EGifCloseFile(GIFFile, NULL);
++#else
+   status = EGifCloseFile(GIFFile);
++#endif
+ 
+   free(GIFImage);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnustep-gui.git/commitdiff/b4d1c253d3046ea73a1aa5fc4b5e7e44576b8cc0