xfce/xfce4-notifyd: version 0.3.3

6 files changed, 133 insertions, 6 deletions

diff --git a/xfce/xfce4-notifyd/DEPENDS b/xfce/xfce4-notifyd/DEPENDS
index 8e1ce6fe2c..d48494178b 100755
--- a/xfce/xfce4-notifyd/DEPENDS
+++ b/xfce/xfce4-notifyd/DEPENDS
@@ -1,6 +1,8 @@
-depends gtk+2 &&
+depends gtk+3 &&
 depends libxfce4ui &&
 depends libxfce4util &&
 depends xfconf &&
 depends dbus &&
-depends dbus-glib
+depends dbus-glib &&
+
+optional_depends systemd "" "" "for systemd support"
diff --git a/xfce/xfce4-notifyd/DETAILS b/xfce/xfce4-notifyd/DETAILS
index 0900645017..bee6d704a7 100755
--- a/xfce/xfce4-notifyd/DETAILS
+++ b/xfce/xfce4-notifyd/DETAILS
@@ -1,9 +1,8 @@
            SPELL=xfce4-notifyd
-         VERSION=0.2.4
+         VERSION=0.3.3
+     SOURCE_HASH="sha1:6e7f0ff0e4399c89f76e788196feffa009cfbb28:UPSTREAM_HASH"
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
-   SOURCE_URL[0]=http://archive.xfce.org/src/apps/${SPELL}/0.2/${SOURCE}
-#     SOURCE_HASH=sha512:16424263c11c531ae52881520226d694a4470473d04e4f44af2e4b87372042422a2b777e764a12978ef57ed7aaed710cd41b15945849b184ce01730d2fd6bf9e
+   SOURCE_URL[0]=http://archive.xfce.org/src/apps/${SPELL}/${VERSION%.*}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
       LICENSE[0]="GPLv2"
diff --git a/xfce/xfce4-notifyd/HISTORY b/xfce/xfce4-notifyd/HISTORY
index 3a4d2fdce9..f832d75aa8 100644
--- a/xfce/xfce4-notifyd/HISTORY
+++ b/xfce/xfce4-notifyd/HISTORY
@@ -1,3 +1,10 @@
+2016-10-16 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 0.3.3, fixed SOURCE_URL[0],
+	  switched to UPSTREAM_HASH once again
+	* DEPENDS: added systemd, optionally; gtk+2 -> gtk+3
+	* PRE_BUILD, no-systemd.patch: added to disable installation of
+	  systemd service file if not needed
+
 2013-10-10 Jeremy Blosser <jblosser@sourcemage.org>
 	* DEPENDS: libxfce4ui
 
diff --git a/xfce/xfce4-notifyd/PRE_BUILD b/xfce/xfce4-notifyd/PRE_BUILD
new file mode 100755
index 0000000000..a86121d02e
--- /dev/null
+++ b/xfce/xfce4-notifyd/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if ! is_depends_enabled ${SPELL} systemd; then
+  patch -p1 < ${SPELL_DIRECTORY}/no-systemd.patch
+fi
diff --git a/xfce/xfce4-notifyd/no-systemd.patch b/xfce/xfce4-notifyd/no-systemd.patch
new file mode 100644
index 0000000000..701f75b931
--- /dev/null
+++ b/xfce/xfce4-notifyd/no-systemd.patch
@@ -0,0 +1,113 @@
+diff -Nuar xfce4-notifyd-0.3.3.orig/Makefile.in xfce4-notifyd-0.3.3/Makefile.in
+--- xfce4-notifyd-0.3.3.orig/Makefile.in	2016-10-16 13:54:39.339465385 -0400
++++ xfce4-notifyd-0.3.3/Makefile.in	2016-10-16 14:11:32.373998557 -0400
+@@ -127,8 +127,7 @@
+ 	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(brightthemedir)" \
+ 	"$(DESTDIR)$(defaultthemedir)" "$(DESTDIR)$(icons48dir)" \
+ 	"$(DESTDIR)$(retrothemedir)" "$(DESTDIR)$(smokethemedir)" \
+-	"$(DESTDIR)$(zomgponiesthemedir)" "$(DESTDIR)$(servicedir)" \
+-	"$(DESTDIR)$(systemd_userdir)"
++	"$(DESTDIR)$(zomgponiesthemedir)" "$(DESTDIR)$(servicedir)"
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) \
+ 	$(xfce4_notifyd_PROGRAMS)
+ am__dirstamp = $(am__leading_dot)dirstamp
+@@ -289,7 +288,7 @@
+ 	$(dist_defaulttheme_DATA) $(dist_icons48_DATA) \
+ 	$(dist_noinst_DATA) $(dist_retrotheme_DATA) \
+ 	$(dist_smoketheme_DATA) $(dist_zomgponiestheme_DATA) \
+-	$(service_DATA) $(systemd_user_DATA)
++	$(service_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ am__recursive_targets = \
+@@ -628,16 +627,12 @@
+ servicedir = $(datadir)/dbus-1/services
+ service_in_files = xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
+ service_DATA = $(service_in_files:.service.in=.service)
+-systemd_userdir = $(prefix)/lib/systemd/user
+-systemd_user_in_files = xfce4-notifyd/xfce4-notifyd.service.in
+-systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+ dist_service = \
+ 	$(service_in_files) \
+-	$(systemd_user_in_files) \
+ 	xfce4-notifyd/notify-dbus.xml \
+ 	xfce4-notifyd/xfce-notify-marshal.list
+ 
+-distclean_service = $(service_DATA) $(systemd_user_DATA)
++distclean_service = $(service_DATA)
+ dist_man1_MANS = \
+ 	xfce4-notifyd-config/xfce4-notifyd-config.1
+ 
+@@ -1386,27 +1381,6 @@
+ 	@list='$(service_DATA)'; test -n "$(servicedir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ 	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
+-install-systemd_userDATA: $(systemd_user_DATA)
+-	@$(NORMAL_INSTALL)
+-	@list='$(systemd_user_DATA)'; test -n "$(systemd_userdir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(systemd_userdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(systemd_userdir)" || exit 1; \
+-	fi; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemd_userdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(systemd_userdir)" || exit $$?; \
+-	done
+-
+-uninstall-systemd_userDATA:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(systemd_user_DATA)'; test -n "$(systemd_userdir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(systemd_userdir)'; $(am__uninstall_files_from_dir)
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run 'make' without going through this Makefile.
+@@ -1710,7 +1684,7 @@
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(xfce4_notifyddir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(brightthemedir)" "$(DESTDIR)$(defaultthemedir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(retrothemedir)" "$(DESTDIR)$(smokethemedir)" "$(DESTDIR)$(zomgponiesthemedir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemd_userdir)"; do \
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(xfce4_notifyddir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(brightthemedir)" "$(DESTDIR)$(defaultthemedir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(retrothemedir)" "$(DESTDIR)$(smokethemedir)" "$(DESTDIR)$(zomgponiesthemedir)" "$(DESTDIR)$(servicedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -1782,7 +1756,7 @@
+ 	install-dist_defaultthemeDATA install-dist_icons48DATA \
+ 	install-dist_retrothemeDATA install-dist_smokethemeDATA \
+ 	install-dist_zomgponiesthemeDATA install-man \
+-	install-serviceDATA install-systemd_userDATA \
++	install-serviceDATA \
+ 	install-xfce4_notifydPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1837,7 +1811,7 @@
+ 	uninstall-dist_icons48DATA uninstall-dist_retrothemeDATA \
+ 	uninstall-dist_smokethemeDATA \
+ 	uninstall-dist_zomgponiesthemeDATA uninstall-man \
+-	uninstall-serviceDATA uninstall-systemd_userDATA \
++	uninstall-serviceDATA \
+ 	uninstall-xfce4_notifydPROGRAMS
+ 
+ uninstall-man: uninstall-man1
+@@ -1863,7 +1837,7 @@
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man install-man1 \
+ 	install-pdf install-pdf-am install-ps install-ps-am \
+-	install-serviceDATA install-strip install-systemd_userDATA \
++	install-serviceDATA install-strip \
+ 	install-xfce4_notifydPROGRAMS installcheck installcheck-am \
+ 	installdirs installdirs-am maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+@@ -1874,7 +1848,7 @@
+ 	uninstall-dist_retrothemeDATA uninstall-dist_smokethemeDATA \
+ 	uninstall-dist_zomgponiesthemeDATA uninstall-man \
+ 	uninstall-man1 uninstall-serviceDATA \
+-	uninstall-systemd_userDATA uninstall-xfce4_notifydPROGRAMS
++	uninstall-xfce4_notifydPROGRAMS
+ 
+ .PRECIOUS: Makefile
+ 
diff --git a/xfce/xfce4-notifyd/xfce4-notifyd-0.2.4.tar.bz2.sig b/xfce/xfce4-notifyd/xfce4-notifyd-0.2.4.tar.bz2.sig
deleted file mode 100644
index aa38cc5eea..0000000000
--- a/xfce/xfce4-notifyd/xfce4-notifyd-0.2.4.tar.bz2.sig
+++ /dev/null