[119958] users/devans/GNOME-3/stable/dports/gnome/tracker

devans at macports.org devans at macports.org
Sun May 11 18:05:17 PDT 2014


Revision: 119958
          https://trac.macports.org/changeset/119958
Author:   devans at macports.org
Date:     2014-05-11 18:05:17 -0700 (Sun, 11 May 2014)
Log Message:
-----------
GNOME-3/stable: tracker, update to version 1.0.1 for testing.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-printgiferror.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile	2014-05-12 00:41:00 UTC (rev 119957)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile	2014-05-12 01:05:17 UTC (rev 119958)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                tracker
-version             1.0.0
+version             1.0.1
 license             GPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Metadata database, indexer and search tool.
@@ -21,8 +21,8 @@
 
 use_xz              yes
 
-checksums           rmd160  0246a1feebf57c54d4d94d3723b1e7802a890a2d \
-                    sha256  a1d033faf2c78f0e239f3c2c961b96623c9a7dabd938c08e3f5660bd70f54ba2
+checksums           rmd160  bf3f39f21e8bc4e6ada921c416004c72e53c4281 \
+                    sha256  76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889
 
 depends_build       port:pkgconfig \
                     port:intltool
@@ -53,7 +53,6 @@
 patchfiles          patch-configure.ac.diff \
                     patch-extract-configure.ac.diff \
                     patch-libtracker-sparql-suffix.diff \
-                    patch-printgiferror.diff \
                     patch-module-flags-no-undefined.diff \
                     patch-tracker-extract-libav.diff
 

Deleted: users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-printgiferror.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-printgiferror.diff	2014-05-12 00:41:00 UTC (rev 119957)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-printgiferror.diff	2014-05-12 01:05:17 UTC (rev 119958)
@@ -1,118 +0,0 @@
---- src/tracker-extract/tracker-extract-gif.c.orig	2014-03-22 11:26:52.000000000 +0100
-+++ src/tracker-extract/tracker-extract-gif.c	2014-03-22 11:56:42.000000000 +0100
-@@ -73,18 +73,16 @@
- 	return (GIF_OK);
- }
- 
--#if GIFLIB_MAJOR >= 5
-+#if (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4
- static inline void
--gif_error (const gchar *action, int err)
-+gif_error (const gchar *action)
- {
--	const char *str = GifErrorString (err);
-+	const char *str = GifErrorString ();
- 	if (str != NULL) {
- 		g_message ("%s, error: '%s'", action, str);
--	} else {
--		g_message ("%s, undefined error %d", action, err);
- 	}
- }
--#endif /* GIFLIB_MAJOR >= 5 */
-+#endif /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
- 
- static void
- read_metadata (TrackerSparqlBuilder *preupdate,
-@@ -111,22 +109,22 @@
- 		ExtBlock extBlock;
- 
- 		if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) {
--#if GIFLIB_MAJOR < 5
-+#if ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR < 2) || GIFLIB_MAJOR < 4)
- 			PrintGifError ();
--#else  /* GIFLIB_MAJOR < 5 */
--			gif_error ("Could not read next GIF record type", gifFile->Error);
--#endif /* GIFLIB_MAJOR < 5 */
-+#else  /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
-+			gif_error ("Could not read next GIF record type");
-+#endif /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
- 			return;
- 		}
- 
- 		switch (RecordType) {
- 			case IMAGE_DESC_RECORD_TYPE:
- 			if (DGifGetImageDesc(gifFile) == GIF_ERROR) {
--#if GIFLIB_MAJOR < 5
--				PrintGifError();
--#else  /* GIFLIB_MAJOR < 5 */
--				gif_error ("Could not get GIF record information", gifFile->Error);
--#endif /* GIFLIB_MAJOR < 5 */
-+#if ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR < 2) || GIFLIB_MAJOR < 4)
-+                PrintGifError ();
-+#else  /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
-+				gif_error ("Could not get GIF record information");
-+#endif /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
- 				return;
- 			}
- 
-@@ -136,11 +134,11 @@
- 			framedata = g_malloc (framewidth*frameheight);
- 
- 			if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) {
--#if GIFLIB_MAJOR < 5
--				PrintGifError();
--#else  /* GIFLIB_MAJOR < 5 */
--				gif_error ("Could not load a block of GIF pixes", gifFile->Error);
--#endif /* GIFLIB_MAJOR < 5 */
-+#if ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR < 2) || GIFLIB_MAJOR < 4)
-+                PrintGifError ();
-+#else  /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
-+				gif_error ("Could not load a block of GIF pixes");
-+#endif /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
- 				return;
- 			}
- 
-@@ -616,7 +614,7 @@
- 	gchar *filename, *uri;
- 	GFile *file;
- 	int fd;
--#if GIFLIB_MAJOR >= 5
-+#if (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4
- 	int err;
- #endif
- 
-@@ -643,13 +641,13 @@
- 		return FALSE;
- 	}	
- 
--#if GIFLIB_MAJOR < 5
-+#if ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR < 2) || GIFLIB_MAJOR < 4)
- 	if ((gifFile = DGifOpenFileHandle (fd)) == NULL) {
- 		PrintGifError ();
--#else   /* GIFLIB_MAJOR < 5 */
--	if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) {
--		gif_error ("Could not open GIF file with handle", err);
--#endif /* GIFLIB_MAJOR < 5 */
-+#else  /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
-+	if ((gifFile = DGifOpenFileHandle (fd)) == NULL) {
-+		gif_error ("Could not open GIF file with handle");
-+#endif /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
- 		g_free (filename);
- 		close (fd);
- 		return FALSE;
-@@ -671,11 +669,11 @@
- 	g_free (uri);
- 
- 	if (DGifCloseFile (gifFile) != GIF_OK) {
--#if GIFLIB_MAJOR < 5
-+#if ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR < 2) || GIFLIB_MAJOR < 4)
- 		PrintGifError ();
--#else  /* GIFLIB_MAJOR < 5 */
--		gif_error ("Could not close GIF file", gifFile->Error);
--#endif /* GIFLIB_MAJOR < 5 */
-+#else  /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
-+		gif_error ("Could not close GIF file");
-+#endif /* (GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4 */
- 	}
- 
- 	return TRUE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140511/cbc7a196/attachment-0001.html>


More information about the macports-changes mailing list