The FreeBSD GNOME team proudly presents GNOME 3.18 for FreeBSD.

The offical GNOME 3.18 release notes can be found at
https://help.gnome.org/misc/release-notes/3.18/

This update doesn't contain the glib/gtk c++ bindings which will
be done in a another update due to the requirement on c++11 and the
amount of fallout this probably will give.

GDM is still at version 3.16 due to some issues.

Bump mate-themes to use the gtk 3.18 version of the themes.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:	207006

5 files changed, 61 insertions, 38 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index ee3854d8f955..aee8124868d3 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tracker
-PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTVERSION=	1.6.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
@@ -25,8 +24,8 @@ RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		sqlite tar:xz
+USES=		desktop-file-utils gettext gmake gnome libarchive libtool \
+		pathfix pkgconfig sqlite tar:xz
 USE_GNOME=	gtk30 intltool introspection:build libxslt:build
 USE_LDCONFIG=	yes
 USE_GSTREAMER1=	yes
@@ -45,20 +44,23 @@ CONFIGURE_ARGS=	--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/servic
 		--enable-generic-media-extractor=gstreamer
 # disable evolution miner until tracker fixes the dep
 CONFIGURE_ARGS+=	--disable-miner-evolution
+CONFIGURE_ENV+=		enable_miner_evolution=no \
+			DATADIRNAME=share
 INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.freedesktop.Tracker.DB.gschema.xml \
 		org.freedesktop.Tracker.Extract.gschema.xml \
 		org.freedesktop.Tracker.FTS.gschema.xml \
 		org.freedesktop.Tracker.Miner.Files.gschema.xml \
+		org.freedesktop.Tracker.Needle.gschema.xml \
 		org.freedesktop.Tracker.Store.gschema.xml \
 		org.freedesktop.Tracker.Writeback.gschema.xml \
 		org.freedesktop.Tracker.enums.xml \
 		org.freedesktop.Tracker.gschema.xml
 
-PLIST_SUB=	TRACKER_VER="1.0" LIBVER=400
+PLIST_SUB=	TRACKER_VER="1.0" LIBVER=601
 
 OPTIONS_DEFINE=		AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS \
-			NAUTILUS WEB_MINERS
+			WEB_MINERS
 OPTIONS_DEFAULT=	AUDIO_MINERS DOCUMENT_MINERS GRAPHIC_MINERS
 OPTIONS_SUB=yes
 WEB_MINERS_DESC=	Support for Firefox, Thunderbird
@@ -97,7 +99,9 @@ GRAPHIC_MINERS_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 				libpng.so:${PORTSDIR}/graphics/png \
 				libtiff.so:${PORTSDIR}/graphics/tiff
 
-NAUTILUS_CONFIGURE_ENABLE=	nautilus-extension
-NAUTILUS_USE=		GNOME=nautilus3
+# cirular dependancy tracker -> nautilus -> tracker
+CONFIGURE_ARGS=		--disable-nautilus-extension
+#NAUTILUS_CONFIGURE_ENABLE=	nautilus-extension
+#NAUTILUS_USE=		GNOME=nautilus3
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index 6cb9d709d522..5f32f9890baf 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tracker-1.4.1.tar.xz) = 94ecf25a64f4502664e0c45ec25dae0a91f00ad893fb85dd1c2ffe336563e328
-SIZE (tracker-1.4.1.tar.xz) = 5937232
+SHA256 (tracker-1.6.1.tar.xz) = 653ed73f4f454b836df56bec1f1141c7a8d77cbeba97ea1e38df9f60a5f0c1ed
+SIZE (tracker-1.6.1.tar.xz) = 4905544
diff --git a/sysutils/tracker/files/patch-configure b/sysutils/tracker/files/patch-configure
index 6c7ff680fefa..5c395589562a 100644
--- a/sysutils/tracker/files/patch-configure
+++ b/sysutils/tracker/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-03-16 09:35:17.635124000 +0100
-+++ configure	2015-03-16 09:36:55.795920000 +0100
-@@ -21333,8 +21333,6 @@
+--- configure.orig	2015-07-21 23:39:50.000000000 +0200
++++ configure	2015-08-14 14:37:54.000000000 +0200
+@@ -21334,8 +21334,6 @@
  # First test for 3_3_5
  TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
                                          evolution-shell-3.0       >= 3.1
@@ -9,7 +9,7 @@
                                          libemail-engine
                                          evolution-data-server-1.2 >= $EDS_REQUIRED
                                          camel-1.2                 >= $CAMEL_REQUIRED"
-@@ -21428,7 +21426,6 @@
+@@ -21429,7 +21427,6 @@
  # Second test for 3_2
  TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
                                        evolution-shell-3.0       >= 3.1
@@ -17,7 +17,7 @@
                                        evolution-data-server-1.2 >= $EDS_REQUIRED
                                        camel-1.2                 >= $CAMEL_REQUIRED"
  
-@@ -21518,7 +21515,6 @@
+@@ -21519,7 +21516,6 @@
  # Third test for 2_91
  TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
                                         evolution-shell-3.0
@@ -25,7 +25,7 @@
                                         evolution-data-server-1.2 >= $EDS_REQUIRED
                                         camel-1.2                 >= $CAMEL_REQUIRED"
  
-@@ -21604,7 +21600,6 @@
+@@ -21605,7 +21601,6 @@
  # Fourth test others (do we really want support for anything < 3.2)?
  TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
                                         evolution-shell           >= $EVO_SHELL_REQUIRED
@@ -33,7 +33,7 @@
                                         evolution-data-server-1.2 >= $EDS_REQUIRED
                                         camel-1.2                 >= $CAMEL_REQUIRED"
  
-@@ -24317,14 +24312,14 @@
+@@ -24247,14 +24242,14 @@
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1      >= \$DBUS_REQUIRED
@@ -51,7 +51,7 @@
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -24337,14 +24332,16 @@
+@@ -24267,14 +24262,16 @@
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1      >= \$DBUS_REQUIRED
@@ -71,7 +71,7 @@
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -24366,10 +24363,12 @@
+@@ -24296,10 +24293,12 @@
  fi
          if test $_pkg_short_errors_supported = yes; then
  	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1      >= $DBUS_REQUIRED
@@ -86,7 +86,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$HAL_PKG_ERRORS" >&5
-@@ -25567,7 +25566,6 @@
+@@ -25497,7 +25496,6 @@
  if test "${with_evolution_plugin_dir+set}" = set; then :
    withval=$with_evolution_plugin_dir;
  fi
@@ -94,3 +94,35 @@
                 tracker_miner_evolution_install_dir=$withval,
                 tracker_miner_evolution_install_dir=`$PKG_CONFIG $evolution_plugin_name --variable=plugindir`,
  
+@@ -27296,7 +27294,6 @@
+ OLD_LDFLAGS="$LDFLAGS"
+ OLD_LIBS="$LIBS"
+ CFLAGS=""
+-LDFLAGS=""
+ LIBS=""
+ 
+ # Check whether --enable-libgif was given.
+@@ -27406,7 +27403,6 @@
+ OLD_LDFLAGS="$LDFLAGS"
+ OLD_LIBS="$LIBS"
+ CFLAGS=""
+-LDFLAGS=""
+ LIBS=""
+ 
+ # Check whether --enable-libjpeg was given.
+@@ -27516,7 +27512,6 @@
+ OLD_LDFLAGS="$LDFLAGS"
+ OLD_LIBS="$LIBS"
+ CFLAGS=""
+-LDFLAGS=""
+ LIBS=""
+ 
+ # Check whether --enable-libtiff was given.
+@@ -27626,7 +27621,6 @@
+ OLD_LDFLAGS="$LDFLAGS"
+ OLD_LIBS="$LIBS"
+ CFLAGS=""
+-LDFLAGS=""
+ LIBS=""
+ 
+ # Check whether --enable-libpng was given.
diff --git a/sysutils/tracker/files/patch-src_tracker-extract_tracker-extract-gstreamer.c b/sysutils/tracker/files/patch-src_tracker-extract_tracker-extract-gstreamer.c
deleted file mode 100644
index 687809913cc9..000000000000
--- a/sysutils/tracker/files/patch-src_tracker-extract_tracker-extract-gstreamer.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/tracker-extract/tracker-extract-gstreamer.c.orig
-+++ src/tracker-extract/tracker-extract-gstreamer.c
-@@ -1647,7 +1647,9 @@ tracker_extract_gstreamer (const gchar          *uri,
- 		                  graph);
- 
- #ifdef HAVE_LIBMEDIAART
--		if (extractor->media_art_type != MEDIA_ART_NONE) {
-+		if (extractor->media_art_type != MEDIA_ART_NONE &&
-+		    (extractor->media_art_artist != NULL ||
-+		     extractor->media_art_title != NULL)) {
- 			GError *error = NULL;
- 			gboolean success = TRUE;
- 
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 19dcd910ad2c..981b0477df85 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -38,17 +38,17 @@ lib/girepository-%%TRACKER_VER%%/TrackerMiner-1.0.typelib
 lib/libtracker-control-%%TRACKER_VER%%.a
 lib/libtracker-control-%%TRACKER_VER%%.so
 lib/libtracker-control-%%TRACKER_VER%%.so.0
-lib/libtracker-control-%%TRACKER_VER%%.so.0.%%LIBVER%%.1
+lib/libtracker-control-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
 lib/libtracker-miner-%%TRACKER_VER%%.a
 lib/libtracker-miner-%%TRACKER_VER%%.so
 lib/libtracker-miner-%%TRACKER_VER%%.so.0
-lib/libtracker-miner-%%TRACKER_VER%%.so.0.%%LIBVER%%.1
+lib/libtracker-miner-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
 lib/libtracker-sparql-%%TRACKER_VER%%.a
 lib/libtracker-sparql-%%TRACKER_VER%%.so
 lib/libtracker-sparql-%%TRACKER_VER%%.so.0
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0.%%LIBVER%%.1
-%%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.a
-%%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.so
+lib/libtracker-sparql-%%TRACKER_VER%%.so.0.%%LIBVER%%.0
+@comment %%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.a
+@comment %%NAUTILUS%%lib/nautilus/extensions-3.0/libnautilus-tracker-tags.so
 %%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.a
 %%DOCUMENT_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-abw.so
 %%GRAPHIC_MINERS%%lib/tracker-%%TRACKER_VER%%/extract-modules/libextract-bmp.a