commit: 7ab21899e52edc2ae869bb502ef984afa26d74aa Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Mar 26 09:11:58 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Mar 26 09:11:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab21899
xfce-base/xfce4-settings: Backport helper directory fix Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../files/xfce4-settings-4.21.0-helper-dir.patch | 41 ++++++++++++++++++++++ ...21.0.ebuild => xfce4-settings-4.21.0-r1.ebuild} | 5 +++ 2 files changed, 46 insertions(+) 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?= <[email protected]> +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 similarity index 95% rename from xfce-base/xfce4-settings/xfce4-settings-4.21.0.ebuild rename to 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
