r50013 - /desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Sep  2 15:23:43 2016
New Revision: 50013

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50013
Log:
Actually add the patch

Added:
    desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch

Added: desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch?rev=50013&op=file
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch	(added)
+++ desktop/unstable/gnome-user-share/debian/patches/20-build-Don-t-install-systemd-user-unit-files-if-targe.patch	[utf-8] Fri Sep  2 15:23:43 2016
@@ -0,0 +1,59 @@
+From 3b508c68dd0b3b888b67b3cca98e82b3e9d3ce9f Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Fri, 2 Sep 2016 17:07:59 +0200
+Subject: [PATCH] build: Don't install systemd user unit files if target
+ directory is not set
+
+Instead of making systemd.pc mandatory (and thus the package
+non-buildable on non-systemd systems), check if the systemduserunitdir
+is properly set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770758
+---
+ configure.ac     | 6 ++----
+ data/Makefile.am | 2 ++
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 247b54a..e962df1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,14 +99,12 @@ AM_GLIB_GNU_GETTEXT
+ 
+ dnl ==========================================================================
+ dnl systemd user unit directory
+-PKG_CHECK_EXISTS([systemd],, [AC_MSG_ERROR([systemd development headers not found])])
+ AC_ARG_WITH([systemduserunitdir],
+ 	    AS_HELP_STRING([--with-systemduserunitdir=DIR], [Directory for systemd user service files]),
+ 	    [],
+ 	    [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
+-if test x$with_systemduserunitdir != xno; then
+-	AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
+-fi
++AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
++AM_CONDITIONAL([HAVE_SYSTEMD], [test -n "$with_systemduserunitdir" -a "x$with_systemduserunitdir" != xno])
+ 
+ dnl ==========================================================================
+ dnl Check for SELinux
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 8b89428..bde8244 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -12,12 +12,14 @@ gsettings_DATA = $(gsettings_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_NOMERGE_RULE@
+ @GSETTINGS_RULES@
+ 
++if HAVE_SYSTEMD
+ systemdservicedir = $(systemduserunitdir)
+ systemdservice_in_files = gnome-user-share-webdav.service.in
+ systemdservice_DATA = gnome-user-share-webdav.service
+ 
+ $(systemdservice_DATA): gnome-user-share-webdav.service.in Makefile
+ 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++endif
+ 
+ convertdir = $(datadir)/GConf/gsettings
+ convert_DATA = gnome-user-share.convert
+-- 
+2.9.3
+