forked from pool/tracker
Dominique Leuenberger
a7bc43011a
Push GNOME 3.13.91 - Add to Staging:E OBS-URL: https://build.opensuse.org/request/show/248736 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=62
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 48f9d0153fd6bde9490ec821d73856a3924f2a25 Mon Sep 17 00:00:00 2001
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Tue, 9 Sep 2014 15:09:28 +0200
|
|
Subject: [PATCH] tracker-extract-gif: add compatibility with GIFLib 5.1.0
|
|
|
|
Signed-off-by: Dominique Leuenberger <dimstar@opensuse.org>
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=736328
|
|
---
|
|
src/tracker-extract/tracker-extract-gif.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
|
|
index 43ba34a..10f87dc 100644
|
|
--- a/src/tracker-extract/tracker-extract-gif.c
|
|
+++ b/src/tracker-extract/tracker-extract-gif.c
|
|
@@ -96,6 +96,12 @@ static inline void print_gif_error()
|
|
}
|
|
#endif /* GIFLIB_MAJOR >= 5 */
|
|
|
|
+/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */
|
|
+#if !defined(GIFLIB_MAJOR) || \
|
|
+ !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1))
|
|
+#define DGifCloseFile(a, b) DGifCloseFile(a)
|
|
+#endif
|
|
+
|
|
static void
|
|
read_metadata (TrackerSparqlBuilder *preupdate,
|
|
TrackerSparqlBuilder *metadata,
|
|
@@ -680,7 +686,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
|
|
|
|
g_free (uri);
|
|
|
|
- if (DGifCloseFile (gifFile) != GIF_OK) {
|
|
+ if (DGifCloseFile (gifFile, NULL) != GIF_OK) {
|
|
#if GIFLIB_MAJOR < 5
|
|
print_gif_error ();
|
|
#else /* GIFLIB_MAJOR < 5 */
|
|
--
|
|
2.0.4
|
|
|