From 18f36cd84f231d17853b9347dd4b88cf7e324d57 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 9 Jan 2021 16:11:30 +0100 Subject: libxfce4ui: Fix sporadic install error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 32 ---------------- ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 32 ++++++++++++++++ .../libxfce4ui/0002-Remove-GTK2-leftovers.patch | 44 ++++++++++++++++++++++ .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | 7 +++- 4 files changed, 81 insertions(+), 34 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch deleted file mode 100644 index 616142761e..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 708e59caaf1c0c271a96a4d1fe46b122aff45e34 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 27 Aug 2012 09:16:29 +0200 -Subject: [PATCH] libxfce4kbd-private/xfce4-keyboard-shortcuts.xml: fix xfwm4 - crash on first start -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending -Signed-off-by: Andreas Müller - ---- - libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -index 723a10d..e6502f3 100644 ---- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -+++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -75,4 +75,8 @@ - - - -+ -+ -+ -+ - --- -1.7.6.5 - diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch new file mode 100644 index 0000000000..616142761e --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -0,0 +1,32 @@ +From 708e59caaf1c0c271a96a4d1fe46b122aff45e34 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 27 Aug 2012 09:16:29 +0200 +Subject: [PATCH] libxfce4kbd-private/xfce4-keyboard-shortcuts.xml: fix xfwm4 + crash on first start +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending +Signed-off-by: Andreas Müller + +--- + libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +index 723a10d..e6502f3 100644 +--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml ++++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +@@ -75,4 +75,8 @@ + + + ++ ++ ++ ++ + +-- +1.7.6.5 + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch new file mode 100644 index 0000000000..cd6ca32d00 --- /dev/null +++ b/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?= +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 +--- + 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-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb index 7a269ad666..6fbf1cf258 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ b/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}" -- cgit v1.2.3-54-g00ecf