thunar: upgrade 4.21.5 -> 4.21.6
PATCH v2 1/1 thunar: upgrade 4.21.5 -> 4.21.6
Drop backported patch which is already built into this new version.
Changelog: https://gitlab.xfce.org/xfce/thunar/-/tags/thunar-4.21.6
Signed-off-by Jason Schonberg <[email protected]>
---
.../oe-npm-cache | 0
....18.bb => nodejs-oe-cache-native_24.19.bb} | 0
.../{nodejs_24.18.1.bb => nodejs_24.19.0.bb} | 2 +-
.../0001-Properly-guard-gdkx.h-include.patch | 37 -------------------
.../{thunar_4.21.5.bb => thunar_4.21.6.bb} | 4 +-
5 files changed, 2 insertions(+), 41 deletions(-)
rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-24.18 => nodejs-oe-cache-24.19}/oe-npm-cache (100%)
rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-native_24.18.bb => nodejs-oe-cache-native_24.19.bb} (100%)
rename meta-oe/recipes-devtools/nodejs/{nodejs_24.18.1.bb => nodejs_24.19.0.bb} (98%)
delete mode 100644 meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch
rename meta-xfce/recipes-xfce/thunar/{thunar_4.21.5.bb => thunar_4.21.6.bb} (88%)meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-24.19/oe-npm-cache renamed from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-24.18/oe-npm-cache +0 -0
meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_24.19.bb renamed from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_24.18.bb +0 -0
meta-oe/recipes-devtools/nodejs/nodejs_24.19.0.bb renamed from meta-oe/recipes-devtools/nodejs/nodejs_24.18.1.bb +1 -1
@@ -35,7 +35,7 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ SRC_URI:append:class-target = " \ file://0009-Using-native-binaries.patch \ " -SRC_URI[sha256sum] = "86d40d594bbdfcf69009a62fdf43cb19ae72b6cb5822d2bdd8349c5a1b2fa628" +SRC_URI[sha256sum] = "f6d95e10a0431ee1067fc6aabe9f762908b4716dd35324e1ddb4b1466b76659f" S = "${UNPACKDIR}/node-v${PV}"
meta-xfce/recipes-xfce/thunar/files/0001-Properly-guard-gdkx.h-include.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From dd7fbf4540891053a4083228aac2485e6c469199 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <[email protected]> -Date: Sat, 11 Apr 2026 18:07:05 +0200 -Subject: [PATCH] Properly guard gdkx.h include - -Fixes: #1820 - -Upstream-Status: Backport [https://gitlab.xfce.org/xfce/thunar/-/commit/201f8ca0c3bc7b5e651201526fc3006a130718eb] - -Signed-off-by: Changqing Li <[email protected]> ---- - thunar/thunar-session-client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c -index c36719c..2832818 100644 ---- a/thunar/thunar-session-client.c -+++ b/thunar/thunar-session-client.c -@@ -30,6 +30,7 @@ - - #ifdef ENABLE_LIBSM - #include <X11/SM/SMlib.h> -+#include <gdk/gdkx.h> - #endif - - #include "thunar/thunar-application.h" -@@ -38,7 +39,6 @@ - #include "thunar/thunar-private.h" - #include "thunar/thunar-session-client.h" - --#include <gdk/gdkx.h> - #include <glib/gstdio.h> - - --- -2.34.1 -
meta-xfce/recipes-xfce/thunar/thunar_4.21.6.bb renamed from meta-xfce/recipes-xfce/thunar/thunar_4.21.5.bb +1 -3
@@ -11,9 +11,7 @@ GTKDOC_MESON_OPTION = "gtk-doc" inherit xfce gobject-introspection mime-xdg perlnative gtk-doc -SRC_URI[sha256sum] = "eddbd4bab29c73718734e0bfcf650ceea8b4fcc8cb2cbb0b24fe22b286a2be00" - -SRC_URI += "file://0001-Properly-guard-gdkx.h-include.patch" +SRC_URI[sha256sum] = "5412d3feb14b4c47ccea8b00e9a9e3dcc1ea0e86e305abcee344f2fe82518bf8" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[pcre] = "-Dpcre2=enabled,-Dpcre2=disabled,libpcre2"
Signature · 1 line
2.43.0