r44466 - in /desktop/unstable/gvfs/debian: changelog control.in patches/add-support-for-libsystemd.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue May 19 21:47:20 2015
New Revision: 44466

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44466
Log:
Build against libsystemd. (Closes: #779766)

Added:
    desktop/unstable/gvfs/debian/patches/add-support-for-libsystemd.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/control.in
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=44466&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog	[utf-8] Tue May 19 21:47:20 2015
@@ -2,6 +2,7 @@
 
   * Upload to unstable.
   * Track stable releases (again) in debian/watch.
+  * Build against libsystemd. (Closes: #779766)
 
  -- Michael Biebl <biebl at debian.org>  Tue, 19 May 2015 23:17:59 +0200
 

Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=44466&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/control.in	[utf-8] Tue May 19 21:47:20 2015
@@ -37,7 +37,7 @@
                libimobiledevice-dev (>= 1.1.5) [!hurd-any],
                libplist-dev,
                libudisks2-dev (>= 1.97) [linux-any],
-               libsystemd-login-dev (>= 44) [linux-any],
+               libsystemd-dev [linux-any],
                libgtk-3-dev
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Projects/gvfs

Added: desktop/unstable/gvfs/debian/patches/add-support-for-libsystemd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/add-support-for-libsystemd.patch?rev=44466&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/add-support-for-libsystemd.patch	(added)
+++ desktop/unstable/gvfs/debian/patches/add-support-for-libsystemd.patch	[utf-8] Tue May 19 21:47:20 2015
@@ -0,0 +1,44 @@
+From e725735987177ece53196145a7caa4a90714f3c0 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Tue, 19 May 2015 23:38:11 +0200
+Subject: [PATCH] Add support for libsystemd
+
+In systemd v209 the various libsystemd-* libraries were merged into a
+single libsystemd library. So first check for this library and fall back
+to libsystemd-login if not found.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749603
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779766
+---
+ configure.ac | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+Index: gvfs-1.24.1/configure.ac
+===================================================================
+--- gvfs-1.24.1.orig/configure.ac	2015-05-19 23:45:33.346707680 +0200
++++ gvfs-1.24.1/configure.ac	2015-05-19 23:45:33.346707680 +0200
+@@ -262,18 +262,20 @@
+ dnl *** Check for libsystemd-login ***
+ dnl **********************************
+ 
+-AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login]))
++AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login]))
+ msg_libsystemd_login=no
+ LIBSYSTEMD_LOGIN_LIBS=
+ LIBSYSTEMD_LOGIN_CFLAGS=
+ LIBSYSTEMD_LOGIN_REQUIRED=44
+ 
+ if test "x$enable_libsystemd_login" != "xno"; then
+-  PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)
++  PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes],
++                   [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)])
+ 
+   if test "x$msg_libsystemd_login" = "xyes"; then
+-    PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])
+-    AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available])
++    PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],,
++                      [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])])
++    AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if libsystemd_login is available])
+   fi
+ fi
+ 

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=44466&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series	[utf-8] Tue May 19 21:47:20 2015
@@ -5,3 +5,4 @@
 dont-crash-on-null-job.patch
 handle-inactive-vfs.patch
 ref-jobs-in-thread.patch
+add-support-for-libsystemd.patch