[118158] users/devans/dports/gnome/tracker

24 Mar 2014

Revision: 118158
          https://trac.macports.org/changeset/118158
Author:   devans@macports.org
Date:     2014-03-23 22:26:37 -0700 (Sun, 23 Mar 2014)
Log Message:
-----------
devans/dports: tracker, update to version 0.17.8, build still fails (#42956).

Modified Paths:
--------------
    users/devans/dports/gnome/tracker/Portfile

Added Paths:
-----------
    users/devans/dports/gnome/tracker/files/
    users/devans/dports/gnome/tracker/files/patch-configure.ac.diff
    users/devans/dports/gnome/tracker/files/patch-extract-configure.ac.diff
    users/devans/dports/gnome/tracker/files/patch-printgiferror.diff

Modified: users/devans/dports/gnome/tracker/Portfile
===================================================================

--- users/devans/dports/gnome/tracker/Portfile	2014-03-24 01:09:19 UTC (rev 118157)
+++ users/devans/dports/gnome/tracker/Portfile	2014-03-24 05:26:37 UTC (rev 118158)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                tracker
-version             0.17.7
+version             0.17.8
 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  313fe92498cc240c279ba5d302985850dd1952ca \
-                    sha256  8f76ff3251dba4b175316717eae83572243cf95015a27a9d6c8244d1a91b331b
+checksums           rmd160  f690effd787e332e6d6f1b8cba531549b7f35956 \
+                    sha256  55a5fa556e98b33df1f064378f9c0e3f06db2fb302d444890a127f0d14ef2c15
 
 depends_build       port:pkgconfig \
                     port:intltool
@@ -42,6 +42,7 @@
                     port:libiptcdata \
                     port:exempi \
                     port:taglib \
+                    port:gtk3 \
                     port:libxml2 \
                     port:poppler \
                     port:libgsf \
@@ -54,6 +55,19 @@
 #depends_run         port:gnome-settings-daemon \
 #                    port:yelp
 
+patchfiles          patch-configure.ac.diff \
+                    patch-extract-configure.ac.diff \
+                    patch-printgiferror.diff
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf      yes
+autoreconf.args     -fvi
+
 configure.args      --disable-schemas-compile \
                     --disable-silent-rules \
                     --disable-functional-tests \

Added: users/devans/dports/gnome/tracker/files/patch-configure.ac.diff
===================================================================
--- users/devans/dports/gnome/tracker/files/patch-configure.ac.diff	                        (rev 0)
+++ users/devans/dports/gnome/tracker/files/patch-configure.ac.diff	2014-03-24 05:26:37 UTC (rev 118158)
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2014-03-21 10:36:04.000000000 -0700
++++ configure.ac	2014-03-21 10:37:09.000000000 -0700
+@@ -497,8 +497,8 @@
+ ####################################################################
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
++#AM_GNU_GETTEXT_VERSION([0.17])
++#AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST(GETTEXT_PACKAGE)

Added: users/devans/dports/gnome/tracker/files/patch-extract-configure.ac.diff
===================================================================
--- users/devans/dports/gnome/tracker/files/patch-extract-configure.ac.diff	                        (rev 0)
+++ users/devans/dports/gnome/tracker/files/patch-extract-configure.ac.diff	2014-03-24 05:26:37 UTC (rev 118158)
@@ -0,0 +1,40 @@
+--- configure.orig1	2014-03-22 09:59:44.000000000 +0100
++++ configure.ac	2014-03-22 11:12:09.000000000 +0100
+@@ -985,6 +985,9 @@
+    TRACKER_EXTRACT_CFLAGS="$TRACKER_EXTRACT_CFLAGS $LIBMEDIAART_CFLAGS"
+    TRACKER_EXTRACT_LIBS="$TRACKER_EXTRACT_LIBS $LIBMEDIAART_LIBS"
+ 
++   LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $LIBMEDIAART_CFLAGS"
++   LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $LIBMEDIAART_LIBS"
++
+    # Used for .pc file...
+    LIBTRACKER_MINER_PC_REQUIRES="libmediaart-1.0"
+    AC_SUBST(LIBTRACKER_MINER_PC_REQUIRES)
+@@ -1834,6 +1837,9 @@
+    AC_SUBST(LIBGIF_CFLAGS)
+    AC_SUBST(LIBGIF_LIBS)
+ 
++   LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $LIBGIF_CFLAGS"
++   LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $LIBGIF_LIBS"
++
+    if test "x$have_libgif" = "xyes"; then
+       AC_DEFINE(HAVE_LIBGIF, [], [Define if we have libgif])
+    fi
+@@ -2004,13 +2010,16 @@
+ 
+ if test "x$enable_libvorbis" != "xno" ; then
+    PKG_CHECK_MODULES(LIBVORBIS,
+-                     [vorbisfile >= $LIBVORBIS_REQUIRED],
++                     [vorbisfile >= $LIBVORBIS_REQUIRED vorbis >= $LIBVORBIS_REQUIRED],
+                      [have_libvorbis=yes],
+                      [have_libvorbis=no])
+ 
+    AC_SUBST(LIBVORBIS_CFLAGS)
+    AC_SUBST(LIBVORBIS_LIBS)
+ 
++   LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $LIBVORBIS_CFLAGS"
++   LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $LIBVORBIS_LIBS"
++
+    if test "x$have_libvorbis" = "xyes"; then
+       AC_DEFINE(HAVE_LIBVORBIS, [], [Define if we have libvorbis])
+    fi

Added: users/devans/dports/gnome/tracker/files/patch-printgiferror.diff
===================================================================
--- users/devans/dports/gnome/tracker/files/patch-printgiferror.diff	                        (rev 0)
+++ users/devans/dports/gnome/tracker/files/patch-printgiferror.diff	2014-03-24 05:26:37 UTC (rev 118158)
@@ -0,0 +1,118 @@
+--- 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;

    

devans＠macports.org

tags

participants (1)