From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001 From: ToshikazuOhiwa Date: Mon, 30 Mar 2020 09:24:26 +0900 Subject: agl-basesystem --- .../recipes-xfce/xfce4-session/machine-host.bb | 17 +++++++++ ...01-configure.in-hard-code-path-to-iceauth.patch | 40 ++++++++++++++++++++++ .../xfce4-session/xfce4-session_4.13.1.bb | 34 ++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb create mode 100644 external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch create mode 100644 external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb (limited to 'external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session') 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 new file mode 100644 index 00000000..c7919744 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb @@ -0,0 +1,17 @@ +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/0001-configure.in-hard-code-path-to-iceauth.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch new file mode 100644 index 00000000..d619cde6 --- /dev/null +++ b/external/meta-openembedded/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/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.13.1.bb new file mode 100644 index 00000000..b11aaa4f --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb @@ -0,0 +1,34 @@ +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 + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " \ + file://0001-configure.in-hard-code-path-to-iceauth.patch \ +" +SRC_URI[md5sum] = "a47988a2c871a411c19e3af1eefe591e" +SRC_URI[sha256sum] = "c789f0f8234e06f5266f0c6ccdbdcc3c085e8d9eea06a0eafe8f7cfc4fe23af4" + +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} += " \ + ${libdir}/xfce4/session/splash-engines/*.la \ +" + +RDEPENDS_${PN} += "machine-host" -- cgit 1.2.3-korg