diff options
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce')
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb (renamed from meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch (renamed from meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch) | 0 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch | 44 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | 7 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb (renamed from meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb (renamed from meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb) | 2 |
6 files changed, 52 insertions, 5 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb index bbaa6fd6f7..3e596323d6 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb @@ -9,7 +9,7 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb" +SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 616142761e..616142761e 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch new file mode 100644 index 0000000000..cd6ca32d00 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch @@ -0,0 +1,44 @@ +From fb7bd8511d55cf0d24f6f93768f51773cf434a59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 8 Jan 2021 21:59:45 +0100 +Subject: [PATCH] Remove GTK2 leftovers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It seems that these cause install performed twice causing natsy races - +see [1] and search for 'TOPDIR/build/tmpfs/hosttools/install -c -m 644 +../../libxfce4ui-4.16.0/libxfce4ui/libxfce4ui.h' + +[1] https://errors.yoctoproject.org/Errors/Details/540832/ + +Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/29] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + libxfce4ui/Makefile.am | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am +index 935eece..bc5afac 100644 +--- a/libxfce4ui/Makefile.am ++++ b/libxfce4ui/Makefile.am +@@ -51,15 +51,6 @@ libxfce4ui_sources = \ + xfce-filename-input.c \ + xfce-titled-dialog.c + +-libxfce4ui_includedir = \ +- $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui +- +-libxfce4ui_include_HEADERS = \ +- $(libxfce4ui_headers) +- +- +- +- + ## + ## GTK+ 3 support library + ## +-- +2.26.2 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb index 7a269ad666..6fbf1cf258 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb @@ -8,8 +8,11 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" -# TODO: Check if this can go -SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +# TODO: Check if 0001-... can go +SRC_URI += " \ + file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ + file://0002-Remove-GTK2-leftovers.patch \ +" SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb index ae05f867f4..6b1a6b482f 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb @@ -8,7 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "6277c448116a91ebfa564972645d8d79ef69864992a02bb164b7b13f98fdfd9b" +SRC_URI[sha256sum] = "67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb index 3f64365f0d..2cbfdadd5f 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb @@ -8,7 +8,7 @@ inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3" +SRC_URI[sha256sum] = "b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ |