[packages/tracker] - added giflib patch (fixes build with giflib >= 5.1)

qboosh qboosh at pld-linux.org
Fri Jul 11 20:59:36 CEST 2014


commit 2b073573b6a69ae5d301e939bd8a3549e4f67a2c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 11 21:04:24 2014 +0200

    - added giflib patch (fixes build with giflib >= 5.1)

 tracker-giflib.patch | 22 ++++++++++++++++++++++
 tracker.spec         |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/tracker.spec b/tracker.spec
index 0f0e1b4..a3a16ae 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -18,6 +18,7 @@ Source0:	http://ftp.gnome.org/pub/GNOME/sources/tracker/1.0/%{name}-%{version}.t
 # Source0-md5:	649f7e3d2c4c9dc01dfa51e131010ba3
 Patch0:		link.patch
 Patch1:		force-tb-fx-miners.patch
+Patch2:		%{name}-giflib.patch
 URL:		http://projects.gnome.org/tracker/
 BuildRequires:	NetworkManager-devel >= 0.8.0
 BuildRequires:	autoconf >= 2.64
@@ -223,6 +224,7 @@ API tracker dla języka Vala.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}
diff --git a/tracker-giflib.patch b/tracker-giflib.patch
new file mode 100644
index 0000000..b45a698
--- /dev/null
+++ b/tracker-giflib.patch
@@ -0,0 +1,22 @@
+--- tracker-1.0.2/src/tracker-extract/tracker-extract-gif.c.orig	2014-05-28 10:47:09.000000000 +0200
++++ tracker-1.0.2/src/tracker-extract/tracker-extract-gif.c	2014-07-11 20:26:35.476861511 +0200
+@@ -684,12 +684,15 @@
+ 
+ 	g_free (uri);
+ 
+-	if (DGifCloseFile (gifFile) != GIF_OK) {
+ #if GIFLIB_MAJOR < 5
++	if (DGifCloseFile (gifFile) != GIF_OK)
+ 		print_gif_error ();
+-#else  /* GIFLIB_MAJOR < 5 */
++#elif (GIFLIB_MAJOR == 5) && (GIFLIB_MINOR == 0)
++	if (DGifCloseFile (gifFile) != GIF_OK)
+ 		gif_error ("Could not close GIF file", gifFile->Error);
+-#endif /* GIFLIB_MAJOR < 5 */
+-	}
++#else  /* GIFLIB >= 5.1 */
++	if (DGifCloseFile (gifFile, &err) != GIF_OK)
++		gif_error ("Could not close GIF file", err);
++#endif /* GIFLIB_MAJOR ... */
+ 
+ 	return TRUE;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tracker.git/commitdiff/2b073573b6a69ae5d301e939bd8a3549e4f67a2c



More information about the pld-cvs-commit mailing list