- Update deskutils/xfce4-tumbler to 0.2.0 [1]

- Update x11-fm/thunar 1.6.12 [2]
- Silence USES portlint warning [2]
- Regenerate patches [2]
- Add warning about COVER tunar plugin requiring manual
  configuration [1]

PR:		220805 [1], 220407 [2]
Submitted by:	Olivier Duchateau <duchateau.olivier@gmail.com>

6 files changed, 20 insertions, 16 deletions

diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 563f7cbd7fd8..020bf66bc329 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tumbler
-PORTVERSION=	0.1.31
-PORTREVISION=	6
+PORTVERSION=	0.2.0
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE
+MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/
 PKGNAMEPREFIX=	xfce4-
 DIST_SUBDIR=	xfce4
 
@@ -16,13 +15,14 @@ LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libdbus-glib-1.so:devel/dbus-glib
+LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
+USES=		gettext-tools gmake libtool localbase:ldflags pathfix \
+		pkgconfig tar:bzip2 xfce
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 intltool intlhack gdkpixbuf2 librsvg2
+USE_GNOME=	glib20 intltool gdkpixbuf2 librsvg2 cairo libgsf
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--enable-xdg-cache \
 		--enable-pixbuf-thumbnailer \
@@ -34,8 +34,8 @@ OPTIONS_DEFINE=	NLS FONTS JPEG FFMPEG POPPLER \
 OPTIONS_DEFAULT=	FONTS JPEG POPPLER GSTREAMER ODF
 
 FONTS_DESC=	Fonts thumbnailer plugin
-COVER_DESC=	Open Movie Database thumbnailer plugin
-GSTREAMER_DESC=	GStreamer (1.0) thumbnailer plugin
+COVER_DESC=	Open Movie Database plugin (check pkg-message)
+GSTREAMER_DESC=	GStreamer thumbnailer plugin
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo
index b1cc29e6b842..e855e3f13529 100644
--- a/deskutils/xfce4-tumbler/distinfo
+++ b/deskutils/xfce4-tumbler/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/tumbler-0.1.31.tar.bz2) = d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173
-SIZE (xfce4/tumbler-0.1.31.tar.bz2) = 550650
+TIMESTAMP = 1500302233
+SHA256 (xfce4/tumbler-0.2.0.tar.bz2) = 4e27a59694b0a5cc69ebccbdb00c724e670b5b7c30bc4dc0b461aac93f234fac
+SIZE (xfce4/tumbler-0.2.0.tar.bz2) = 571300
diff --git a/deskutils/xfce4-tumbler/files/patch-configure b/deskutils/xfce4-tumbler/files/patch-configure
index bb6859d3c1e0..60658a7e1bab 100644
--- a/deskutils/xfce4-tumbler/files/patch-configure
+++ b/deskutils/xfce4-tumbler/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-05-06 20:24:28.000000000 +0200
-+++ configure	2013-05-06 20:27:59.000000000 +0200
-@@ -13880,7 +13880,7 @@
+--- configure.orig	2015-02-28 16:28:14 UTC
++++ configure
+@@ -14427,7 +14427,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
  
      fi
    fi
diff --git a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
index 0084f724b3ba..783d00df99ea 100644
--- a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
+++ b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
@@ -1,4 +1,4 @@
---- tumblerd/tumbler.rc.orig	2015-02-28 15:23:08 UTC
+--- tumblerd/tumbler.rc.orig	2017-05-28 10:17:58 UTC
 +++ tumblerd/tumbler.rc
 @@ -37,7 +37,7 @@ MaxFileSize=0
  
@@ -12,7 +12,7 @@
 @@ -58,7 +58,7 @@ MaxFileSize=0
  
  # ffmpegthumbnailer plugin
- [FfmegThumbnailer]
+ [FfmpegThumbnailer]
 -Disabled=false
 +Disabled=true
  Priority=2
diff --git a/deskutils/xfce4-tumbler/files/pkg-message.in b/deskutils/xfce4-tumbler/files/pkg-message.in
index 6e2424ee2314..0921aaa232a5 100644
--- a/deskutils/xfce4-tumbler/files/pkg-message.in
+++ b/deskutils/xfce4-tumbler/files/pkg-message.in
@@ -3,4 +3,6 @@ To override the default configuration, you must copy the rc-file:
 	mkdir ~/.config/tumbler
 	cp %%PREFIX%%/etc/xdg/tumbler/tumbler.rc ~/.config/tumbler
 
+The COVER plugin requires manual configuration.
+
 For more information see http://docs.xfce.org/xfce/thunar/tumbler
diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist
index 0bfa3d4c0227..d92aeb2ffd33 100644
--- a/deskutils/xfce4-tumbler/pkg-plist
+++ b/deskutils/xfce4-tumbler/pkg-plist
@@ -22,6 +22,7 @@ lib/libtumbler-1.so.0.0.0
 lib/tumbler-1/plugins/cache/tumbler-cache-plugin.so
 lib/tumbler-1/plugins/cache/tumbler-xdg-cache.so
 %%COVER%%lib/tumbler-1/plugins/tumbler-cover-thumbnailer.so
+lib/tumbler-1/plugins/tumbler-desktop-thumbnailer.so
 %%FFMPEG%%lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.so
 %%FONTS%%lib/tumbler-1/plugins/tumbler-font-thumbnailer.so
 %%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.so