From e6f07da735d1b27e4daf6757b5d195ee544efdbf Mon Sep 17 00:00:00 2001 From: Zhang Peng Date: Tue, 24 Mar 2026 20:59:16 +0800 Subject: [PATCH] xfce4-power-manager: upgrade 4.20.0 -> 4.21.1 ChangeLog: https://gitlab.xfce.org/xfce/xfce4-power-manager/-/blob/xfce4-power-manager-4.21.1/NEWS?ref_type=tags Add patch to fix absolute buildpath in generated enum files. Signed-off-by: Zhang Peng Signed-off-by: Khem Raj --- ...splay-full-path-in-generated-headers.patch | 36 +++++++++++++++++++ ....20.0.bb => xfce4-power-manager_4.21.1.bb} | 13 ++++--- 2 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_4.20.0.bb => xfce4-power-manager_4.21.1.bb} (77%) diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch new file mode 100644 index 0000000000..0d3457e404 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/files/0001-build-Do-not-display-full-path-in-generated-headers.patch @@ -0,0 +1,36 @@ +From 3f69abae74f4c0ad41c8fa2886148db834ddb9f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Mon, 16 Mar 2026 16:46:52 +0100 +Subject: [PATCH] build: Do not display full path in generated headers + +Upstream-Status: Backport [https://gitlab.xfce.org/xfce/xfce4-power-manager/-/commit/3f69abae74f4c0ad41c8fa2886148db834ddb9f1] + +Signed-off-by: Zhang Peng +--- + common/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/common/meson.build b/common/meson.build +index 7f71309f..cdae226f 100644 +--- a/common/meson.build ++++ b/common/meson.build +@@ -37,7 +37,7 @@ common_sources += gnome.mkenums( + install_header: false, + sources: 'xfpm-enum-glib.h', + fhead: '#ifndef _XFPM_ENUM_TYPES_H\n#define _XFPM_ENUM_TYPES_H\n#include \nG_BEGIN_DECLS\n', +- fprod: '/* enumerations from "@filename@" */\n', ++ fprod: '/* enumerations from "@basename@" */\n', + vhead: 'GType @enum_name@_get_type (void);\n#define XFPM_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', + ftail: 'G_END_DECLS\n\n#endif /* _XFPM_ENUM_TYPES_H__ */', + ) +@@ -46,7 +46,7 @@ common_sources += gnome.mkenums( + install_header: false, + sources: 'xfpm-enum-glib.h', + fhead: '#include "xfpm-enum-types.h"\n#include "xfpm-enum-glib.h"\n\n', +- fprod: '\n/* enumerations from "@filename@" */\n', ++ fprod: '\n/* enumerations from "@basename@" */\n', + 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.34.1 diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.20.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.21.1.bb similarity index 77% rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.20.0.bb rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.21.1.bb index c6eed849be..65b8f84e27 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.20.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.21.1.bb @@ -11,18 +11,17 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[sha256sum] = "971391cef63352833bdd92df28957392e17e1f2b3d486c0f57294fd204d6ed29" +XFCE_COMPRESS_TYPE = "xz" +XFCEBASEBUILDCLASS = "meson" -EXTRA_OECONF = " \ - GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \ - --enable-panel-plugins \ -" +SRC_URI += "file://0001-build-Do-not-display-full-path-in-generated-headers.patch" +SRC_URI[sha256sum] = "bb89be7b1be431b29e765e2c632e98fb20a688e495e4ef18495bd70c1524767a" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ " -PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" -PACKAGECONFIG[wayland] = "--enable-wayland, --disable-wayland, wayland-native" +PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland-native" PACKAGES += "xfce4-powermanager-plugin"