diff options
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui')
-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.1.bb (renamed from meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb) | 7 |
2 files changed, 2 insertions, 49 deletions
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 deleted file mode 100644 index cd6ca32d00..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch +++ /dev/null @@ -1,44 +0,0 @@ -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.1.bb index 7b46c2a76c..a8ede836e5 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.1.bb @@ -9,11 +9,8 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" # 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" +SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" |