xfce4-session: get rid of machine-host
PATCH 1/4 xfce4-session: get rid of machine-host
OE-Core's base-file does add hostname to hosts since:
commit 31e6d08f20a804fccb958e19045d8f9e9806071a
Author: Chen Qi <[email protected]> Date: Tue Jan 8 17:12:52 2019 +0800
netbase/base-files: move /etc/hosts from netbase to base-files
Move /etc/hosts to base-files, and also add entry to it according to hostname setting. This fixes the problem of commands like `hostname -f' failing due to lack of such entry.
--- meta-xfce/conf/layer.conf | 4 ---- .../recipes-xfce/xfce4-session/machine-host.bb | 17 ----------------- .../xfce4-session/xfce4-session_4.13.1.bb | 2 -- 3 files changed, 23 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
meta-xfce/conf/layer.conf +0 -4
@@ -20,7 +20,3 @@ LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" LAYERSERIES_COMPAT_xfce-layer = "thud warrior" - -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ - xfce4-session->machine-host \ -"
meta-xfce/recipes-xfce/xfce4-session/machine-host.bb deleted +0 -17
@@ -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}"
meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +0 -2
@@ -30,5 +30,3 @@ FILES_${PN} += " \ FILES_${PN} += " \ ${libdir}/xfce4/session/splash-engines/*.la \ " - -RDEPENDS_${PN} += "machine-host"
Signature · 1 line
2.20.1
PATCH 2/4 xfce4-session: remove strange entry in FILES_${PN}
--- meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb | 4 ---- 1 file changed, 4 deletions(-)
meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +0 -4
@@ -26,7 +26,3 @@ FILES_${PN} += " \ ${datadir}/themes/Default/balou/* \ ${datadir}/polkit-1 \ " - -FILES_${PN} += " \ - ${libdir}/xfce4/session/splash-engines/*.la \ -"
Signature · 1 line
2.20.1
PATCH 3/4 libxfce4ui: Add PACKAGECONFIG 'gladeui2' for glade (gtk3) support
In reply to Andreas MüllerThis is necessary to open glade files shipped by xfce packages already ported to GTK3.
--- meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb +7 -2
@@ -18,6 +18,7 @@ EXTRA_OECONF += "--with-vendor-info=${DISTRO}" PACKAGECONFIG ??= "" PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3"
@@ -25,8 +26,12 @@ FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2 FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" PACKAGES += "${PN}-glade" -FILES_${PN}-glade = "${libdir}/glade3 \ - ${datadir}/glade3" +FILES_${PN}-glade = " \ + ${libdir}/glade \ + ${libdir}/glade3 \ + ${datadir}/glade \ + ${datadir}/glade3 \ +" RDEPENDS_${PN}-gtk2 = "${PN}" RDEPENDS_${PN}-gtk3 = "${PN}"
Signature · 1 line
2.20.1
PATCH 4/4 glade3: move to to meta-xfce
In reply to Andreas Müller* lubxfce4ui is the last recipe requiring glade3 optionally
* old glade3 is necessary to open xfce glade files based on gtk2
* meta-xfce depends on gnome-layer already so no adjustment in layer dependencies is necessary
---
.../0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch | 0
.../glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch | 0
.../recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch | 0
{meta-gnome => meta-xfce}/recipes-devtools/glade/glade3_3.8.5.bb | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename {meta-gnome => meta-xfce}/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch (100%)
rename {meta-gnome => meta-xfce}/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch (100%)
rename {meta-gnome => meta-xfce}/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch (100%)
rename {meta-gnome => meta-xfce}/recipes-devtools/glade/glade3_3.8.5.bb (100%)meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch renamed from meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch +0 -0
meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch renamed from meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch +0 -0
meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch renamed from meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch +0 -0
meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb renamed from meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb +0 -0
Signature · 1 line
2.20.1