<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118158] users/devans/dports/gnome/tracker</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118158">118158</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-23 22:26:37 -0700 (Sun, 23 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>devans/dports: tracker, update to version 0.17.8, build still fails (#42956).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansdportsgnometrackerPortfile">users/devans/dports/gnome/tracker/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/dports/gnome/tracker/files/</li>
<li><a href="#usersdevansdportsgnometrackerfilespatchconfigureacdiff">users/devans/dports/gnome/tracker/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansdportsgnometrackerfilespatchextractconfigureacdiff">users/devans/dports/gnome/tracker/files/patch-extract-configure.ac.diff</a></li>
<li><a href="#usersdevansdportsgnometrackerfilespatchprintgiferrordiff">users/devans/dports/gnome/tracker/files/patch-printgiferror.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansdportsgnometrackerPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/dports/gnome/tracker/Portfile (118157 => 118158)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name tracker
</span><del>-version 0.17.7
</del><ins>+version 0.17.8
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Metadata database, indexer and search tool.
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 313fe92498cc240c279ba5d302985850dd1952ca \
- sha256 8f76ff3251dba4b175316717eae83572243cf95015a27a9d6c8244d1a91b331b
</del><ins>+checksums rmd160 f690effd787e332e6d6f1b8cba531549b7f35956 \
+ sha256 55a5fa556e98b33df1f064378f9c0e3f06db2fb302d444890a127f0d14ef2c15
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> port:libiptcdata \
</span><span class="cx"> port:exempi \
</span><span class="cx"> port:taglib \
</span><ins>+ port:gtk3 \
</ins><span class="cx"> port:libxml2 \
</span><span class="cx"> port:poppler \
</span><span class="cx"> port:libgsf \
</span><span class="lines">@@ -54,6 +55,19 @@
</span><span class="cx"> #depends_run port:gnome-settings-daemon \
</span><span class="cx"> # port:yelp
</span><span class="cx">
</span><ins>+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
+
</ins><span class="cx"> configure.args --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-functional-tests \
</span></span></pre></div>
<a id="usersdevansdportsgnometrackerfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: users/devans/dports/gnome/tracker/files/patch-configure.ac.diff (0 => 118158)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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)
</ins></span></pre></div>
<a id="usersdevansdportsgnometrackerfilespatchextractconfigureacdiff"></a>
<div class="addfile"><h4>Added: users/devans/dports/gnome/tracker/files/patch-extract-configure.ac.diff (0 => 118158)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="usersdevansdportsgnometrackerfilespatchprintgiferrordiff"></a>
<div class="addfile"><h4>Added: users/devans/dports/gnome/tracker/files/patch-printgiferror.diff (0 => 118158)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+--- 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;
</ins></span></pre>
</div>
</div>
</body>
</html>