r44405 - in /desktop/unstable/gnome-system-monitor/debian: changelog control control.in patches/ patches/0001-Add-support-for-libsystemd.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Mon May 18 22:06:12 UTC 2015
Author: biebl
Date: Mon May 18 22:06:12 2015
New Revision: 44405
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44405
Log:
Build against libsystemd. (Closes: #779753)
Added:
desktop/unstable/gnome-system-monitor/debian/patches/
desktop/unstable/gnome-system-monitor/debian/patches/0001-Add-support-for-libsystemd.patch
desktop/unstable/gnome-system-monitor/debian/patches/series
Modified:
desktop/unstable/gnome-system-monitor/debian/changelog
desktop/unstable/gnome-system-monitor/debian/control
desktop/unstable/gnome-system-monitor/debian/control.in
Modified: desktop/unstable/gnome-system-monitor/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/changelog?rev=44405&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/changelog [utf-8] Mon May 18 22:06:12 2015
@@ -2,6 +2,7 @@
* New upstream release.
* Drop obsolete --disable-scrollkeeper configure switch.
+ * Build against libsystemd. (Closes: #779753)
-- Michael Biebl <biebl at debian.org> Mon, 18 May 2015 14:57:57 +0200
Modified: desktop/unstable/gnome-system-monitor/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control?rev=44405&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/control [utf-8] Mon May 18 22:06:12 2015
@@ -24,7 +24,7 @@
libgtop2-dev (>= 2.28.2),
librsvg2-dev (>= 2.35.0),
libwnck-3-dev (>= 2.91.0),
- libsystemd-login-dev (>= 44) [linux-any],
+ libsystemd-dev [linux-any],
libxml2-dev,
pkg-config (>= 0.19),
yelp-tools
Modified: desktop/unstable/gnome-system-monitor/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control.in?rev=44405&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-system-monitor/debian/control.in [utf-8] Mon May 18 22:06:12 2015
@@ -20,7 +20,7 @@
libgtop2-dev (>= 2.28.2),
librsvg2-dev (>= 2.35.0),
libwnck-3-dev (>= 2.91.0),
- libsystemd-login-dev (>= 44) [linux-any],
+ libsystemd-dev [linux-any],
libxml2-dev,
pkg-config (>= 0.19),
yelp-tools
Added: desktop/unstable/gnome-system-monitor/debian/patches/0001-Add-support-for-libsystemd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/0001-Add-support-for-libsystemd.patch?rev=44405&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/0001-Add-support-for-libsystemd.patch (added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/0001-Add-support-for-libsystemd.patch [utf-8] Mon May 18 22:06:12 2015
@@ -0,0 +1,54 @@
+From: Michael Biebl <biebl at debian.org>
+Date: Mon, 18 May 2015 23:49:50 +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.
+While at it, simplify the check by bumping the minimum required version
+to v44.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749560
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779753
+
+---
+ configure.ac | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 522c232..a89aa72 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,9 +37,7 @@ GIOMM_REQUIRED=2.27
+ GLIBMM_REQUIRED=2.27
+ LIBXML_REQUIRED=2.0
+ RSVG_REQUIRED=2.35
+-SYSTEMD_REQUIRED=38
+-# systemd v43 used the C++ keyword 'class' as a function parameter. This breaks the build for C++ programs.
+-SYSTEMD_EXCLUDED=43
++SYSTEMD_REQUIRED=44
+
+ PKG_CHECK_MODULES(GSM,
+ glib-2.0 >= $GLIB_REQUIRED
+@@ -68,13 +66,13 @@ PKG_CHECK_MODULES(SCRIPTS, glib-2.0 >= $GLIB_REQUIRED)
+ have_systemd=no
+ AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [disable systemd support]),,enable_systemd=no)
+ if test "x$enable_systemd" != "xno"; then
+- PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login >= $SYSTEMD_REQUIRED ],
+- [ PKG_CHECK_MODULES(SYSTEMD_EX, [ libsystemd-login = $SYSTEMD_EXCLUDED ],
+- AC_MSG_ERROR([*** systemd v43 found but it has a bug in its header files (uses C++ keyword)]), # Can't use systemd v43
+- [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) have_systemd=yes])],
+- have_systemd=no)
++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes],
++ [PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login >= $SYSTEMD_REQUIRED],
++ [have_systemd=yes])])
+ if test "x$have_systemd" = xno; then
+ AC_MSG_ERROR([*** systemd support requested but libraries not found])
++ else
++ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available])
+ fi
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_systemd" = "yes"])
+--
+2.1.4
+
Added: desktop/unstable/gnome-system-monitor/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/series?rev=44405&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/series (added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/series [utf-8] Mon May 18 22:06:12 2015
@@ -0,0 +1 @@
+0001-Add-support-for-libsystemd.patch
More information about the pkg-gnome-commits
mailing list