diff options
Diffstat (limited to 'external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session')
| -rw-r--r-- | external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb | 17 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb (renamed from external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb) | 24 |
2 files changed, 15 insertions, 26 deletions
diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb deleted file mode 100644 index c7919744..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Meta package adding machine name to known hosts" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -ALLOW_EMPTY_${PN} = "1" - -LOCALHOSTMACHINE = "127.0.0.1 ${MACHINE}" - -# on some machines starting applications as xfce4-terminal take ages without -# machine name in hosts -pkg_postinst_${PN} () { -if ! grep -q '${LOCALHOSTMACHINE}' $D/etc/hosts ; then - echo '${LOCALHOSTMACHINE}' >> $D/etc/hosts -fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb index b11aaa4f..f497b766 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb @@ -2,18 +2,21 @@ 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+ libwnck3 dbus dbus-glib xfconf polkit" -RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" -inherit xfce update-alternatives distro_features_check +DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" + +inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" + SRC_URI += " \ file://0001-configure.in-hard-code-path-to-iceauth.patch \ " -SRC_URI[md5sum] = "a47988a2c871a411c19e3af1eefe591e" -SRC_URI[sha256sum] = "c789f0f8234e06f5266f0c6ccdbdcc3c085e8d9eea06a0eafe8f7cfc4fe23af4" +SRC_URI[md5sum] = "5ad23062fd08ef5f5ad9b4389c7b54c6" +SRC_URI[sha256sum] = "fbe3a4a60c91589a2024ce12b2d2667625a8fedcbc90ef031831f56319f597af" ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" @@ -27,8 +30,11 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ " -FILES_${PN} += " \ - ${libdir}/xfce4/session/splash-engines/*.la \ +RDEPENDS_${PN} = " \ + dbus-x11 \ + iceauth \ + netbase \ + upower \ + xinit \ + xrdb \ " - -RDEPENDS_${PN} += "machine-host" |