Source: xfce4-session
Version: 4.12.1-2
Severity: important
Tags: patch
User: debian-h...@lists.debian.org
Usertags: hurd, linux
Hello,
Currently xfce4-session fails to build from source due to
UP_BACKEND_SUSPEND_COMMAND and UP_BACKEND_HIBERNATE_COMMAND not being
defined. The attached patch hurd.patch fixes that by defining GNU in
configure.ac check for that value in xfsm-shutdown-helper/main.c.
Additionally, a build-dependency of pm-utils is added to debian/control
to make sure that the pm-suspend and pm-hibernate binaries are
available. pm-utils should also be a dependency for GNU/Linux.
Additionally the package fails to build twice in a row both for both
GNU/Linux and GNU/Hurd. The second build fails with:
make[4]: Entering directory
'/home/srs/Hurd/DEBs/linux_DEBs/xfce4-session/xfce4-session-4.12.1/xfce4-session'
make[4]: *** No rule to make target 'xfsm-marshal.c', needed by
'xfce4_session-xfsm-marshal.o'. Stop.
make[4]: Leaving directory
'/home/srs/Hurd/DEBs/linux_DEBs/xfce4-session/xfce4-session-4.12.1/xfce4-session'
Makefile:554: recipe for target 'all' failed
For this no patch has been developed yet. The problem seen to be
related to xdt-autogen versus plain usage of autoreconf. The generated
Makefiles the second time comments out the target for e.g.
xfsm-marshal.c.
autoreconf fails due to that some constructs in configure.ac are different
when using xdt-autogen.
Thanks!
Index: xfce4-session-4.12.1/configure.ac
===================================================================
--- xfce4-session-4.12.1.orig/configure.ac
+++ xfce4-session-4.12.1/configure.ac
@@ -35,7 +35,7 @@ AC_PROG_MAKE_SET()
dnl Initialize automake
AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE()
+AM_MAINTAINER_MODE([enable])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl Set helper path prefix
@@ -182,7 +182,7 @@ fi
dnl Compile time default choice of backend
AC_ARG_WITH([backend],
AS_HELP_STRING([--with-backend=<option>],
- [Default backend to use linux, freebsd, openbsd]))
+ [Default backend to use linux, freebsd, openbsd, gnu]))
# default to a sane option
AC_CANONICAL_HOST
if test x$with_backend = x; then
@@ -190,7 +190,8 @@ if test x$with_backend = x; then
[*-linux*], [with_backend=linux],
[*-*freebsd*], [with_backend=freebsd],
[*-*dragonfly*], [with_backend=freebsd],
- [*-openbsd*], [with_backend=openbsd])
+ [*-openbsd*], [with_backend=openbsd],
+ [*-gnu*], [with_backend=gnu])
fi
AC_DEFINE_UNQUOTED(BACKEND, "$with_backend", [backend])
AC_SUBST(BACKEND, "$with_backend")
@@ -204,6 +205,10 @@ fi
if test x$with_backend = xopenbsd; then
AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
fi
+if test x$with_backend = xgnu; then
+ AC_DEFINE(BACKEND_TYPE_GNU, 1, [GNU/Hurd suspend/hibernate backend])
+fi
+AM_CONDITIONAL([HAVE_POLKIT], [test x$with_backend = xgnu])
dnl check for location Xfce glade files were installed to
XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
Index: xfce4-session-4.12.1/xfsm-shutdown-helper/main.c
===================================================================
--- xfce4-session-4.12.1.orig/xfsm-shutdown-helper/main.c
+++ xfce4-session-4.12.1/xfsm-shutdown-helper/main.c
@@ -83,7 +83,7 @@
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
#endif
-#if BACKEND_TYPE_LINUX
+#if defined(BACKEND_TYPE_LINUX) || defined(BACKEND_TYPE_GNU)
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate"
#endif
--- a/debian/control 2015-03-16 18:02:04.000000000 +0100
+++ b/debian/control 2015-05-12 14:39:50.000000000 +0200
@@ -8,7 +8,7 @@
libxfce4ui-1-dev (>= 4.12.1), libwnck-dev, x11-xserver-utils,
libxfconf-0-dev (>= 4.10), libglade2-dev, intltool (>= 0.31),
dpkg-dev (>= 1.16.1), libpolkit-gobject-1-dev, xfce4-dev-tools, libtool,
- dh-autoreconf
+ dh-autoreconf, pm-utils [linux-any hurd-any]
Standards-Version: 3.9.6
Homepage: http://www.xfce.org/
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
