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

devans at macports.org devans at macports.org
Mon Sep 19 23:55:17 PDT 2016


Revision: 152890
          https://trac.macports.org/changeset/152890
Author:   devans at macports.org
Date:     2016-09-19 23:55:17 -0700 (Mon, 19 Sep 2016)
Log Message:
-----------
GNOME-3/stable: tracker, merge unstable to stable, update to stable version 1.10.0.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile
    users/devans/GNOME-3/stable/dports/gnome/tracker/files/autogen.sh
    users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-configure.ac.diff
    users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-extract-configure.ac.diff
    users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-libtracker-sparql-suffix.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/tracker/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/tracker
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/unstable/dports/gnome/tracker:120511-125755,128305-134575,138764-141384,143149-147065
   + /users/devans/GNOME-3/unstable/dports/gnome/tracker:120511-125755,128305-134575,138764-141384,143149-147065,150441-152860

Modified: users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile	2016-09-20 06:28:17 UTC (rev 152889)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/Portfile	2016-09-20 06:55:17 UTC (rev 152890)
@@ -5,7 +5,7 @@
 PortGroup           gobject_introspection 1.0
 
 name                tracker
-version             1.8.0
+version             1.10.0
 license             GPL-2+ LGPL-2.1+ BSD
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Metadata database, indexer and search tool.
@@ -22,12 +22,11 @@
 
 use_xz              yes
 
-checksums           rmd160  26d6c239b5240fafe8c44a708e44738ec6d98819 \
-                    sha256  a11f31a373bfec3abae38ae719d0a59f666f1f067d8789ade2ed7032a152907d
+checksums           rmd160  4cb952362823d8c5256d4e68503931739f6613e4 \
+                    sha256  df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb
 
 depends_build       port:pkgconfig \
                     port:intltool \
-                    port:gnome-common \
                     port:gtk-doc \
                     port:autoconf \
                     port:automake \

Modified: users/devans/GNOME-3/stable/dports/gnome/tracker/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/files/autogen.sh	2016-09-20 06:28:17 UTC (rev 152889)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/files/autogen.sh	2016-09-20 06:55:17 UTC (rev 152890)
@@ -1,60 +1,68 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
 
-PKG_NAME="tracker"
+cd $srcdir
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/autogen.sh) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
+(test -f configure.ac) || {
+        echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+        exit 1
 }
 
-DIE=0
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
 
-if ! which gnome-autogen.sh ; then
-  echo "You need to install the gnome-common module and make"
-  echo "sure the gnome-autogen.sh script is in your \$PATH."
-  exit 1
-fi
+aclocal --install || exit 1
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
 
-# If no arguments are given, use those used with distcheck
-# equally, use the JHBuild prefix if it is available otherwise fall
-# back to the default (/usr/local)
-if [ $# -eq 0 ] ; then
-  echo "Using distcheck arguments, none were supplied..."
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+        # If no arguments are given, use those used with distcheck
+        # equally, use the JHBuild prefix if it is available otherwise fall
+        # back to the default (/usr/local)
+        if [ $# -eq 0 ] ; then
+                echo "Using distcheck arguments, none were supplied..."
 
-  if test -n "$JHBUILD_PREFIX" ; then
-    echo "Using JHBuild prefix ('$JHBUILD_PREFIX')"
-    NEW_PREFIX="--prefix $JHBUILD_PREFIX --with-bash-completion-dir=$JHBUILD_PREFIX/share/bash-completion/completions"
-  fi
+                if test -n "$JHBUILD_PREFIX" ; then
+                        echo "Using JHBuild prefix ('$JHBUILD_PREFIX')"
+                        NEW_PREFIX="--prefix $JHBUILD_PREFIX --with-bash-completion-dir=$JHBUILD_PREFIX/share/bash-completion/completions"
+                fi
 
-  NEW_ARGS="\
-	--disable-nautilus-extension \
-	--enable-unit-tests \
-	--enable-functional-tests \
-	--enable-gtk-doc \
-	--enable-introspection \
-	--disable-miner-rss \
-	--disable-miner-evolution \
-	--disable-miner-thunderbird \
-	--disable-miner-firefox \
-	--enable-poppler \
-	--enable-exempi \
-	--enable-libiptcdata \
-	--enable-libjpeg \
-	--enable-libtiff \
-	--enable-libvorbis \
-	--enable-libflac \
-	--enable-libgsf \
-	--enable-playlist \
-	--enable-tracker-preferences \
-	--enable-enca"
+                NEW_ARGS="\
+                        --disable-nautilus-extension \
+                        --enable-unit-tests \
+                        --enable-functional-tests \
+                        --enable-gtk-doc \
+                        --enable-introspection \
+                        --disable-miner-rss \
+                        --disable-miner-evolution \
+                        --disable-miner-thunderbird \
+                        --disable-miner-firefox \
+                        --enable-poppler \
+                        --enable-exempi \
+                        --enable-libiptcdata \
+                        --enable-libjpeg \
+                        --enable-libtiff \
+                        --enable-libvorbis \
+                        --enable-libflac \
+                        --enable-libgsf \
+                        --enable-playlist \
+                        --enable-tracker-preferences \
+                        --enable-enca"
 
-  set -- $NEW_PREFIX $NEW_ARGS
+                set -- $NEW_PREFIX $NEW_ARGS
+        fi
+
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type 'make' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
 fi
-
-. gnome-autogen.sh

Modified: users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-configure.ac.diff	2016-09-20 06:28:17 UTC (rev 152889)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-configure.ac.diff	2016-09-20 06:55:17 UTC (rev 152890)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2016-02-19 14:23:52.000000000 -0800
-+++ configure.ac	2016-02-19 14:24:13.000000000 -0800
-@@ -278,7 +278,7 @@
+--- configure.ac.orig	2016-08-23 04:51:14.000000000 -0700
++++ configure.ac	2016-08-25 00:30:26.000000000 -0700
+@@ -274,7 +274,7 @@
  LIBTRACKER_DATA_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                            gio-unix-2.0 >= $GLIB_REQUIRED
                            sqlite3      >= $SQLITE_REQUIRED
@@ -9,7 +9,7 @@
  PKG_CHECK_MODULES(LIBTRACKER_DATA, [$LIBTRACKER_DATA_REQUIRED])
  
  LIBTRACKER_DATA_LIBS="$LIBTRACKER_DATA_LIBS -lz -lm"
-@@ -318,14 +318,14 @@
+@@ -314,14 +314,14 @@
  # Check requirements for libtracker-sparql
  LIBTRACKER_SPARQL_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
                              gio-unix-2.0 >= $GLIB_REQUIRED

Modified: users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-extract-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-extract-configure.ac.diff	2016-09-20 06:28:17 UTC (rev 152889)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-extract-configure.ac.diff	2016-09-20 06:55:17 UTC (rev 152890)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2016-03-01 06:25:50.000000000 -0800
-+++ configure.ac	2016-03-02 11:59:45.000000000 -0800
-@@ -1134,6 +1134,9 @@
+--- configure.ac.orig	2016-08-25 00:23:19.000000000 -0700
++++ configure.ac	2016-08-25 00:23:19.000000000 -0700
+@@ -1136,6 +1136,9 @@
     TRACKER_MINER_FS_CFLAGS="$TRACKER_MINER_FS_CFLAGS $LIBMEDIAART_CFLAGS"
     TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $LIBMEDIAART_LIBS"
  
@@ -10,7 +10,7 @@
     # Used for .pc file...
     LIBTRACKER_MINER_PC_REQUIRES="libmediaart-2.0"
     AC_SUBST(LIBTRACKER_MINER_PC_REQUIRES)
-@@ -2128,6 +2131,9 @@
+@@ -2104,6 +2107,9 @@
     AC_SUBST(LIBGIF_CFLAGS)
     AC_SUBST(LIBGIF_LIBS)
  
@@ -20,7 +20,7 @@
     if test "x$have_libgif" = "xyes"; then
        AC_DEFINE(HAVE_LIBGIF, [], [Define if we have libgif])
     fi
-@@ -2312,13 +2318,16 @@
+@@ -2288,13 +2294,16 @@
  
  if test "x$enable_libvorbis" != "xno" ; then
     PKG_CHECK_MODULES(LIBVORBIS,

Modified: users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-libtracker-sparql-suffix.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-libtracker-sparql-suffix.diff	2016-09-20 06:28:17 UTC (rev 152889)
+++ users/devans/GNOME-3/stable/dports/gnome/tracker/files/patch-libtracker-sparql-suffix.diff	2016-09-20 06:55:17 UTC (rev 152890)
@@ -1,6 +1,6 @@
---- src/libtracker-sparql/Makefile.am.orig	2015-07-05 03:32:27.000000000 -0700
-+++ src/libtracker-sparql/Makefile.am	2015-07-18 03:53:06.000000000 -0700
-@@ -90,7 +90,7 @@
+--- src/libtracker-sparql/Makefile.am.orig	2016-07-16 17:33:00.000000000 -0700
++++ src/libtracker-sparql/Makefile.am	2016-08-25 00:23:19.000000000 -0700
+@@ -97,7 +97,7 @@
  
  if HAVE_INTROSPECTION
  Tracker- at TRACKER_API_VERSION@.typelib: Tracker-$(TRACKER_API_VERSION).gir
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160919/7ba7f4c9/attachment-0001.html>


More information about the macports-changes mailing list