From 1b8dfe266937a37a4c642f96ceb2347bf4c00a17 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 10 Oct 2014 03:20:04 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- ...01-configure.in-hard-code-path-to-iceauth.patch | 40 ++++++++++++++++++++++ .../xfce4-session/xfce4-session_4.10.1.bb | 36 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb (limited to 'meta-xfce/recipes-xfce/xfce4-session') diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch new file mode 100644 index 0000000000..d619cde6ca --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch @@ -0,0 +1,40 @@ +From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 31 Dec 2012 16:35:29 +0100 +Subject: [PATCH] configure.ac: hard code path to iceauth +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +workaround AC_PATH_PROG which was meant to find programs required at build-time +not at run-time. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Andreas Müller +--- + configure.ac | 8 +------- + 1 files changed, 1 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3cf3510..505e744 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -111,13 +111,7 @@ XDT_FEATURE_DEBUG([xfsm_debug_default]) + dnl Check for linker optimizations + XDT_FEATURE_LINKER_OPTS() + +-dnl Check for iceauth +-AC_PATH_PROG([ICEAUTH], [iceauth]) +-if test x"$ICEAUTH" != x""; then +- AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) +-else +- AC_MSG_ERROR([iceauth missing, please check your X11 installation]) +-fi ++AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth]) + + dnl Find a location for the session desktop file + AC_MSG_CHECKING([what xsession-prefix to use]) +-- +1.7.4.4 + diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb new file mode 100644 index 0000000000..74289fb356 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" +RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" + +inherit xfce update-alternatives + +SRC_URI[md5sum] = "1757657c1d590aa6274b7b7cbba33352" +SRC_URI[sha256sum] = "0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83" +SRC_URI += " \ + file://0001-configure.in-hard-code-path-to-iceauth.patch \ +" + +ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY_${PN} = "100" + +# protect from frightening message that xfce might not work correctly +pkg_postinst_${PN} () { + echo 127.0.0.1 ${MACHINE} >> /etc/hosts +} + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" +PACKAGECONFIG[systemd] = "--enable-systemd, --disable-systemd, polkit, systemd" +PACKAGECONFIG[consolekit] = ",,,consolekit" + +FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ + ${libdir}/xfce4/session/*-*-* \ + ${datadir}/xsessions \ + ${datadir}/themes/Default/balou/*" + +FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" + +FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.*a" -- cgit v1.2.3-54-g00ecf