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

16 files changed, 103 insertions, 88 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 4a65a3a02a0b..da3fcb8b6cb4 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	3.16.3
-PORTREVISION=	2
+PORTVERSION=	3.18.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +15,6 @@ BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
 		iso-codes>=0:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libxklavier.so:${PORTSDIR}/x11/libxklavier \
 		libupower-glib.so:${PORTSDIR}/sysutils/upower \
 		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
 		libcolord.so:${PORTSDIR}/graphics/colord \
@@ -40,7 +38,7 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 CONFLICTS=	gnome-media-2.[0-9]*
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c++11-lib gettext gmake pathfix pkgconfig tar:xz
+USES=		compiler:c++11-lib gettext gmake gnome pathfix pkgconfig tar:xz
 USE_GNOME=	gnomedesktop3 intltool libxml2
 USE_XORG=	xscrnsaver x11 xxf86misc kbproto xi
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 5c64fb9998b9..76d67713faf4 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-control-center-3.16.3.tar.xz) = ff9fe9c703be1d0e3afdef7b9ea331e436846ccd4d35090d501ba9510ee5a0c5
-SIZE (gnome3/gnome-control-center-3.16.3.tar.xz) = 7045744
+SHA256 (gnome3/gnome-control-center-3.18.2.tar.xz) = 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad
+SIZE (gnome3/gnome-control-center-3.18.2.tar.xz) = 7113676
diff --git a/sysutils/gnome-control-center/files/patch-panels_info_info.ui b/sysutils/gnome-control-center/files/patch-panels_info_info.ui
new file mode 100644
index 000000000000..f566f32f4c42
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_info_info.ui
@@ -0,0 +1,13 @@
+Disable check for updates button
+
+--- panels/info/info.ui.orig	2015-09-01 11:14:23.676754000 +0200
++++ panels/info/info.ui	2015-09-01 11:14:39.051974000 +0200
+@@ -551,7 +551,7 @@
+                                     <property name="can_focus">True</property>
+                                     <property name="receives_default">True</property>
+                                     <property name="use_action_appearance">False</property>
+-                                    <property name="visible">True</property>
++                                    <property name="visible">False</property>
+                                   </object>
+                                   <packing>
+                                     <property name="expand">False</property>
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 61cdebf195cc..0eabc6063d84 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -26,7 +26,6 @@ share/applications/gnome-user-accounts-panel.desktop
 share/bash-completion/completions/gnome-control-center
 share/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
 share/dbus-1/services/org.gnome.ControlCenter.service
-%%DATADIR%%/datetime/backward
 %%DATADIR%%/icons/hicolor/16x16/devices/audio-headset.svg
 %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
 %%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
@@ -174,6 +173,7 @@ share/locale/fi/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/fi/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/fr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
 share/locale/gl/LC_MESSAGES/gnome-control-center-2.0.mo
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index be064a2d78ae..b37810dbc391 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-power-manager
-PORTVERSION=	3.16.1
+PORTVERSION=	3.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk30 intlhack
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index e927aa59478c..b77e9949fd68 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-power-manager-3.16.1.tar.xz) = a4177dbff9fac1f1babf0d2715f950ee0fa3dd143d7b5d89311f33afca924231
-SIZE (gnome3/gnome-power-manager-3.16.1.tar.xz) = 432360
+SHA256 (gnome3/gnome-power-manager-3.18.0.tar.xz) = afe5921a4313d15757f39f6ff4ec6f7c9e9cbb9b2aaa0b8a290e1cd7557e28f0
+SIZE (gnome3/gnome-power-manager-3.18.0.tar.xz) = 433960
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f091646571c7..5335333e733a 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.16.4
+PORTVERSION=	3.18.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -33,7 +33,7 @@ PORTSCOUT=	limitw:1,even
 
 USE_XORG=	xxf86misc
 USE_GNOME=	gnomedesktop3 intltool libxslt
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
@@ -64,6 +64,7 @@ GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
 		org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
 		org.gnome.settings-daemon.plugins.power.gschema.xml \
+		org.gnome.settings-daemon.plugins.power.gschema.xml.override \
 		org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
 		org.gnome.settings-daemon.plugins.sharing.gschema.xml \
 		org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
@@ -73,4 +74,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
 		${WRKSRC}/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
 
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/org.gnome.settings-daemon.plugins.power.gschema.xml.override \
+		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index a612ff66f94f..0c8ea22f7742 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-settings-daemon-3.16.4.tar.xz) = 15da8a112368c18e8b22b553cea5109c96bb8f7c097bb4f0bb685e10bd93edb5
-SIZE (gnome3/gnome-settings-daemon-3.16.4.tar.xz) = 1605708
+SHA256 (gnome3/gnome-settings-daemon-3.18.2.tar.xz) = 3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f
+SIZE (gnome3/gnome-settings-daemon-3.18.2.tar.xz) = 1626400
diff --git a/sysutils/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.xml.override b/sysutils/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.xml.override
new file mode 100644
index 000000000000..7f28bf9004c8
--- /dev/null
+++ b/sysutils/gnome-settings-daemon/files/org.gnome.settings-daemon.plugins.power.gschema.xml.override
@@ -0,0 +1,7 @@
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-type = 'nothing'
+sleep-inactive-battery-type = 'nothing'
+button-suspend = 'nothing'
+button-power = 'nothing'
+button-sleep = 'nothing'
+
diff --git a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
deleted file mode 100644
index 70f064a773c8..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-data_org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in.orig	2014-03-04 16:15:04.000000000 +0000
-+++ data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in	2014-03-14 00:09:44.592409466 +0000
-@@ -26,7 +26,7 @@
-       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
-     </key>
-     <key name="sleep-inactive-ac-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
-       <description>The type of sleeping that should be performed when the computer is inactive.</description>
-     </key>
-@@ -36,12 +36,12 @@
-       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
-     </key>
-     <key name="sleep-inactive-battery-type" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
-       <description>The type of sleeping that should be performed when the computer is inactive.</description>
-     </key>
-     <key name="button-suspend" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Suspend button action</summary>
-       <description>The action to take when the system suspend button is pressed.</description>
-     </key>
-@@ -57,7 +57,7 @@
-     </key>
-     <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
-     <key name="button-power" enum="org.gnome.settings-daemon.GsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Power button action</summary>
-       <description>The action to take when the system power button is pressed.</description>
-     </key>
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 97a1ead5b862..b4a21ba94056 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -28,6 +28,9 @@ lib/gnome-settings-daemon-3.0/libmedia-keys.a
 lib/gnome-settings-daemon-3.0/libmedia-keys.so
 lib/gnome-settings-daemon-3.0/libmouse.a
 lib/gnome-settings-daemon-3.0/libmouse.so
+lib/gnome-settings-daemon-3.0/liborientation.a
+lib/gnome-settings-daemon-3.0/liborientation.so
+lib/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/libpower.a
 lib/gnome-settings-daemon-3.0/libpower.so
 %%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.a
@@ -67,6 +70,7 @@ libexec/gsd-test-housekeeping
 libexec/gsd-test-keyboard
 libexec/gsd-test-media-keys
 libexec/gsd-test-mouse
+libexec/gsd-test-orientation
 %%CUPS%%libexec/gsd-test-print-notifications
 %%SMARTCARD%%libexec/gsd-test-smartcard
 libexec/gsd-test-sound
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