aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-03-02 19:55:55 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-03-21 16:42:25 +0100
commit9ebf48a5897e491d06288de5cb06ddab1e68c6d0 (patch)
treeef83632d8a412b82e356d9392a1bcddf923b9ba4
parent0280ff87280ee2ca2dbd88ee556d7eeec029fe09 (diff)
downloadmeta-openembedded-contrib-9ebf48a5897e491d06288de5cb06ddab1e68c6d0.tar.gz
meta-openembedded-contrib-9ebf48a5897e491d06288de5cb06ddab1e68c6d0.tar.bz2
meta-openembedded-contrib-9ebf48a5897e491d06288de5cb06ddab1e68c6d0.zip
xfce4-session: update to 4.12.0
consolekit support is gone Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb31
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.0.bb28
2 files changed, 28 insertions, 31 deletions
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
deleted file mode 100644
index aa82a7caf3..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
-
-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"
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.0.bb
new file mode 100644
index 0000000000..eaef4c6db6
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.0.bb
@@ -0,0 +1,28 @@
+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 polkit"
+RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower"
+
+inherit xfce update-alternatives
+
+SRC_URI[md5sum] = "d75b257bc0954c238d3c82ce498525aa"
+SRC_URI[sha256sum] = "68c85453b097d3ada573dcb7e72acd06e0fc34531996122c10d20096405b7b06"
+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"
+
+FILES_${PN} += " \
+ ${libdir}/xfce4/*/*/*.so \
+ ${libdir}/xfce4/session/*-*-* \
+ ${datadir}/xsessions \
+ ${datadir}/themes/Default/balou/* \
+ ${datadir}/polkit-1 \
+"
+
+FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug"