aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-11-20 19:14:18 +0100
committerKhem Raj <raj.khem@gmail.com>2021-11-20 12:07:09 -0800
commitde3d9b76d4a997c2fb391d12398f69bfc6e6716b (patch)
treedfe63e43fff5697beec5b3d49ff833733f4e67e3 /meta-xfce
parent0397c734885a9c48bbde03e1e46fcfcb8bdd6f05 (diff)
downloadmeta-openembedded-contrib-de3d9b76d4a997c2fb391d12398f69bfc6e6716b.tar.gz
libxfce4ui: upgrade 4.16.0 -> 4.16.1
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 <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch44
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb (renamed from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb)7
2 files changed, 2 insertions, 49 deletions
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?= <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-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb
index 7b46c2a76c..a8ede836e5 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb
+++ b/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}"