gentoo auto-resync : 27:03:2025 - 00:31:42

4 files changed, 48 insertions, 1 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 436625bb5bd7..8ae8bb919fc2 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index eba22f71388d..e8f709579be5 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,3 +1,4 @@
+AUX xfce4-settings-4.21.0-helper-dir.patch 1448 BLAKE2B bded3b732ab14503951f0c34f95f31867f2e51906833db24ac8b7d7f839dc95efdd35a982af19e3833504c7244522f9d555a169b5070890e244842411e698184 SHA512 dbebaae5d5e2e5fe041bd0240853bd3fada0743acc96261ac8235b91003bac6051c1ea0b60a31f7f60b94127a5f007902c05c623de69e1253e4e72891154f149
 DIST xfce4-settings-4.18.6.tar.bz2 1560269 BLAKE2B c6336c98ad16c968c2400c9a888ad8eaed39d0f25116b2f767d70c4d3e75bd7f0fef8381fb8cd3105afb7b0786f0b17a285153534421748a91bc6845c252f53a SHA512 e9615e8409f597b53bf118908c0a8c5f893b335915dd009c5b7da9ba8403a0de74b751dec7482f3076cd880f2bd3cffc1f45a13a1e88196fb7f0c87c996794b7
 DIST xfce4-settings-4.20.0.tar.bz2 2495778 BLAKE2B d35725ccce4ac88b0d2e4b69896dee14b20a0b9b2a019db02c5fe61cb9e5b966dc0c9985b1f6b1f3853be87d16feb0fcaf0af1e08c0842226addec21bf06871f SHA512 ab728bfce9aefe14c59dce0f93a84d395826ffc37d3a7bafc40fce61055ce4b7d9265c65460bf7ee69e4c8f4efd7e0b88b3670d859d48d4602c17acc20556528
 DIST xfce4-settings-4.20.1.tar.bz2 2507814 BLAKE2B a0963f1a2ac19c177aa172d22d78b11492d34776eccd723d048a2bb8e6469ff790b27c2e21b838a5cc2d99d7b334051fbed2878c740138c1ad04a00111ac0519 SHA512 d29307ab93f4db961154541bddc9cfa80886c7ab7bcd42941995c1b9ff24fd8816e65bd690e35c247e25913c352d653386743663443def0b825d415f40b50ef9
@@ -5,5 +6,5 @@ DIST xfce4-settings-4.21.0.tar.xz 966708 BLAKE2B 6b1d2e78cb2650d96dc4ee4a06e5a98
 EBUILD xfce4-settings-4.18.6-r1.ebuild 1872 BLAKE2B 3e65bad61d55fd367aef74001df1082f2e75d4f111b6a2df68bee17c68d5eaba585b92fc364c60321ed3186c1c52b4b258f3c4740de0d827da5e2cd07cbaf95c SHA512 df4fcb51324cc900ef1d9901137bfcfbf8d434878c2c9e33626858006aa8e24a8d286b39d622ba8d069790d84639054aab53861d23e57c0aca785d2b6db7d73a
 EBUILD xfce4-settings-4.20.0.ebuild 2212 BLAKE2B 8144f392bc16ddfdf0ffe7a51e2ff6302c3ca3c3ebbfebf377a69f8e003af8cdd97ae5e8ee67e78eae240af5334b3041a462d763810c35ac2ed6e78031574b17 SHA512 ff947c0a9798d6dd80766765d5695933e09b3525f7982c6c4eee7fdf006862ecea1938b57a4045d065c9a07a15b24526d1a00e1df76c355c1954f6f48060d2d8
 EBUILD xfce4-settings-4.20.1.ebuild 2242 BLAKE2B c32d2301cd3eec2dab204526e5d5834bb03ed1a3c46a297245ff7ff65c3cff3549a3628ff13dfa5b65ce55d79035483d890103a3c0486ceb44e85f8c228de646 SHA512 0ae9d4cdfd991063ebfd0e8a9ed666b6c43802bbc616ab2beea1edfa0106db0a4122b87d11a4456890f3065e2097675c2f998be5cd17d0b9e289e77f92571bc7
-EBUILD xfce4-settings-4.21.0.ebuild 2182 BLAKE2B cb2f7d1fcbbfe5ef8c8a7158ef0d73b8efb8ff855d0589bf13668c976b2b5c40db2081d868e026c48efc6a433ed59fb3ebccbaf169a6a058c55e023881013039 SHA512 bb35e726ebfba8672340722520fe7a835be93b7d79b7cf576f8d539976648d603e131f49a2ac77f807ca6263cd89c5e7a14b7ee1f17069aad9af298b6bdbf4ee
+EBUILD xfce4-settings-4.21.0-r1.ebuild 2292 BLAKE2B 5df861dbf3d2a4ff7284deaab8152fcf668d99e297126ee6ba4a95106632f2bc0e0a9c074230801de7d70106b7560fec466379cb523f884646feb0bcf2281d46 SHA512 396f15945947c4a0c3d210b787297ff5077674bfb60ab6240f8189793fb6167344c9ed1b8c71f8f203bd45a2a8bc25f7ec32405f6cc30ea06dc4b83fde89fb8b
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.21.0-helper-dir.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.21.0-helper-dir.patch
new file mode 100644
index 000000000000..e6af0462b61b
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.21.0-helper-dir.patch
@@ -0,0 +1,41 @@
+From 47c212082abd71345a46a2308faa6a8b770765a9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Wed, 26 Mar 2025 10:00:41 +0100
+Subject: [PATCH] meson-build: Fix wrong HELPERDIR substitution
+
+Fixes: ec25fe9df81f9b95600bae846204e4a6f1ba94c2
+Closes: #598
+---
+ dialogs/meson.build               | 2 +-
+ dialogs/mime-settings/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dialogs/meson.build b/dialogs/meson.build
+index 5e24904a..99adab6a 100644
+--- a/dialogs/meson.build
++++ b/dialogs/meson.build
+@@ -34,7 +34,7 @@ foreach dir : dirs
+     ],
+     c_args: [
+       '-DG_LOG_DOMAIN="@0@"'.format('bin'),
+-      '-DHELPERDIR="@0@"'.format(helper_path_prefix),
++      '-DHELPERDIR="@0@"'.format(helper_path_prefix / 'xfce4' / 'settings'),
+     ],
+     include_directories: [
+       include_directories('..'),
+diff --git a/dialogs/mime-settings/meson.build b/dialogs/mime-settings/meson.build
+index 1a4a7bba..3249db40 100644
+--- a/dialogs/mime-settings/meson.build
++++ b/dialogs/mime-settings/meson.build
+@@ -108,7 +108,7 @@ helpers = run_command('sh', '-c', 'echo helpers' / '*.desktop.in.in', check: tru
+ foreach helper_in_in : helpers
+   helper_in = configure_file(
+     configuration: configuration_data({
+-      'HELPERDIR': helper_path_prefix,
++      'HELPERDIR': helper_path_prefix / 'xfce4',
+     }),
+     input: helper_in_in,
+     output: fs.stem(helper_in_in),
+-- 
+GitLab
+
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.21.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.21.0-r1.ebuild
index 6766b6590568..2a122c5e707a 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.21.0.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.21.0-r1.ebuild
@@ -62,6 +62,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/598
+	"${FILESDIR}/${P}-helper-dir.patch"
+)
+
 src_prepare() {
 	default
 	python_fix_shebang dialogs/mime-settings/helpers/xfce4-compose-mail