diff mbox series

[meta-xfce,47/47] xfce4-settings: upgrade 4.21.1 -> 4.21.2

Message ID 20260625090127.1563-47-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/47] ctags: upgrade 6.2.20260607.0 -> 6.2.20260621.0 | expand

Commit Message

Wang Mingyu June 25, 2026, 9:01 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-build-Do-not-display-full-path-in-generated-headers.patch
removed since it's included in 4.21.2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...splay-full-path-in-generated-headers.patch | 36 -------------------
 ...ngs_4.21.1.bb => xfce4-settings_4.21.2.bb} |  3 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
 rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.21.1.bb => xfce4-settings_4.21.2.bb} (88%)
diff mbox series

Patch

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
deleted file mode 100644
index 50006b1710..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From 93fa2ed9a987c0f03c9f5aa0f31cb770d1cc5f17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
-Date: Mon, 16 Mar 2026 16:44:43 +0100
-Subject: [PATCH] build: Do not display full path in generated headers
-
-Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/93fa2ed9a987c0f03c9f5aa0f31cb770d1cc5f17]
-
-Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
----
- dialogs/mime-settings/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dialogs/mime-settings/meson.build b/dialogs/mime-settings/meson.build
-index b7ca8dc7..5ac9a936 100644
---- a/dialogs/mime-settings/meson.build
-+++ b/dialogs/mime-settings/meson.build
-@@ -30,7 +30,7 @@ enums += gnome.mkenums(
-   install_header: false,
-   sources: 'xfce-mime-helper.h',
-   fhead: '#ifndef __XFCE_MIME_HELPER_ENUM_TYPES_H__\n#define __XFCE_MIME_HELPER_ENUM_TYPES_H__\n#include <libxfce4ui/libxfce4ui.h>\nG_BEGIN_DECLS\n',
--  fprod: '/* enumerations from "@filename@" */\n',
-+  fprod: '/* enumerations from "@basename@" */\n',
-   vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define XFCE_MIME_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
-   ftail: 'G_END_DECLS\n\n#endif /* !__XFCE_MIME_HELPER_ENUM_TYPES_H__ */',
- )
-@@ -39,7 +39,7 @@ enums += gnome.mkenums(
-   install_header: false,
-   sources: 'xfce-mime-helper.h',
-   fhead: '#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include "xfce-mime-helper.h"\n\n#include "xfce-mime-helper-enum-types.h"',
--  fprod: '\n/* enumerations from "@filename@" */',
-+  fprod: '\n/* enumerations from "@basename@" */',
-   vhead: 'GType\n@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G@Type@Value values[] = {',
-   vprod: '\t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
-   vtail: '\t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n  }\n\treturn type;\n}\n',
---
-2.51.2
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.1.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.2.bb
similarity index 88%
rename from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.1.bb
rename to meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.2.bb
index 16b90840c7..df60f8c40d 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.21.2.bb
@@ -12,8 +12,7 @@  inherit xfce features_check mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI += "file://0001-build-Do-not-display-full-path-in-generated-headers.patch"
-SRC_URI[sha256sum] = "e57a33d0bb9d63d0ef6f469c2d42cbf66e37d9127cc204de411b7385274e26d0"
+SRC_URI[sha256sum] = "064f72fb5ead25d9bd1724bea803f1017fc2287b32dc55eacf4f6e3d78e2b7e8"
 
 PACKAGECONFIG ??= " \
     notify \