- Update to 0.3.2

- Remove unneeded patch (send to upstream)
- Add patch for new themes
- Submitter-, self-hosting of the tarball, because it is not well formed for
  Gtk+ < 3.20

PR:		212553
Submitted by:	olivierd

5 files changed, 26 insertions, 15 deletions

diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 62e90467b3bb..0bcfb803a460 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -6,9 +6,11 @@
 # Support of GTK+ is checked at compile time and themes directories too.
 
 PORTNAME=	xfce4-notifyd
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+#MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	http://errements.eu/distfiles/ \
+		LOCAL/ehaupt
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/deskutils/xfce4-notifyd/distinfo b/deskutils/xfce4-notifyd/distinfo
index 8c50a43ab9e6..e898f8316202 100644
--- a/deskutils/xfce4-notifyd/distinfo
+++ b/deskutils/xfce4-notifyd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473189353
-SHA256 (xfce4/xfce4-notifyd-0.3.1.tar.bz2) = ef02b7e0101034df19ca5dddae387a2625e46380f0d2af3b4f4713c219d1f863
-SIZE (xfce4/xfce4-notifyd-0.3.1.tar.bz2) = 429056
+TIMESTAMP = 1473486137
+SHA256 (xfce4/xfce4-notifyd-0.3.2.tar.bz2) = 471dab69bbcd18bd6fcea155678ed53b90c9bd942b5ad106aaad516eeaabb5c2
+SIZE (xfce4/xfce4-notifyd-0.3.2.tar.bz2) = 422817
diff --git a/deskutils/xfce4-notifyd/files/patch-Makefile.in b/deskutils/xfce4-notifyd/files/patch-Makefile.in
new file mode 100644
index 000000000000..cbb95f8c1e72
--- /dev/null
+++ b/deskutils/xfce4-notifyd/files/patch-Makefile.in
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	2016-09-09 21:30:26 UTC
++++ Makefile.in
+@@ -650,10 +650,14 @@ dist_smoketheme_DATA = themes/$(theme_di
+ zomgponiesthemedir = $(datadir)/themes/ZOMG-PONIES!/xfce-notify-4.0
+ dist_zomgponiestheme_DATA = themes/$(theme_dir)/ZOMG-PONIES!/gtk.css
+ dist_themes = \
++	themes/gtk-3.0/Bright/gtk.css \
+ 	themes/gtk-3.0/Default/gtk.css \
++	themes/gtk-3.0/Retro/gtk.css \
+ 	themes/gtk-3.0/Smoke/gtk.css \
+ 	themes/gtk-3.0/ZOMG-PONIES!/gtk.css \
++	themes/gtk-3.20/Bright/gtk.css \
+ 	themes/gtk-3.20/Default/gtk.css \
++	themes/gtk-3.20/Retro/gtk.css \
+ 	themes/gtk-3.20/Smoke/gtk.css \
+ 	themes/gtk-3.20/ZOMG-PONIES!/gtk.css
+ 
diff --git a/deskutils/xfce4-notifyd/files/patch-xfce4-notifyd_xfce-notify-daemon.c b/deskutils/xfce4-notifyd/files/patch-xfce4-notifyd_xfce-notify-daemon.c
deleted file mode 100644
index 79e554f94156..000000000000
--- a/deskutils/xfce4-notifyd/files/patch-xfce4-notifyd_xfce-notify-daemon.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfce4-notifyd/xfce-notify-daemon.c.orig	2016-09-06 13:19:50 UTC
-+++ xfce4-notifyd/xfce-notify-daemon.c
-@@ -706,6 +706,7 @@ xfce_notify_daemon_window_size_allocate(
-     widget_screen = gtk_widget_get_screen (widget);
-     display = gdk_screen_get_display (widget_screen);
-     device_manager = gdk_display_get_device_manager (display);
-+    pointer = gdk_device_manager_get_client_pointer (device_manager);
- #endif
- 
-     gdk_device_get_position (pointer, &p_screen, &x, &y);
diff --git a/deskutils/xfce4-notifyd/pkg-plist b/deskutils/xfce4-notifyd/pkg-plist
index 50c57030924d..b5ea49ff77d7 100644
--- a/deskutils/xfce4-notifyd/pkg-plist
+++ b/deskutils/xfce4-notifyd/pkg-plist
@@ -54,6 +54,8 @@ share/icons/hicolor/48x48/apps/xfce4-notifyd.png
 %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-notifyd.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-notifyd.mo
+share/themes/Bright/xfce-notify-4.0/gtk.css
 share/themes/Default/xfce-notify-4.0/gtk.css
+share/themes/Retro/xfce-notify-4.0/gtk.css
 share/themes/Smoke/xfce-notify-4.0/gtk.css
 share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtk.css