From de3d9b76d4a997c2fb391d12398f69bfc6e6716b Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 20 Nov 2021 19:14:18 +0100 Subject: libxfce4ui: upgrade 4.16.0 -> 4.16.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch submitted made it upstream Release notes for 4.16.1 ======================== - Add 4.16 section to docs - about: Replace stock with regular button - about: Make Close button translatable (Fixes #41) - Fix cast alignment warning - Remove Gtk2 leftovers - Don't reserve vertical space for subtitles in headerbars - Translation Updates Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../libxfce4ui/0002-Remove-GTK2-leftovers.patch | 44 ---------------------- .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb | 28 -------------- .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb | 25 ++++++++++++ 3 files changed, 25 insertions(+), 72 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb (limited to 'meta-xfce/recipes-xfce') 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 deleted file mode 100644 index cd6ca32d00..0000000000 --- a/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?= -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 deleted file mode 100644 index 7b46c2a76c..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" - -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" - -EXTRA_OECONF += "--with-vendor-info=${DISTRO}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -PACKAGES += "${PN}-glade" -FILES:${PN}-glade = " \ - ${libdir}/glade \ - ${datadir}/glade \ -" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb new file mode 100644 index 0000000000..a8ede836e5 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" + +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" +SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6" + +EXTRA_OECONF += "--with-vendor-info=${DISTRO}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +PACKAGES += "${PN}-glade" +FILES:${PN}-glade = " \ + ${libdir}/glade \ + ${datadir}/glade \ +" -- cgit 1.2.3-korg