commit: 73c40c29e8a21d2db574c71acf7266cc3645a874 Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> AuthorDate: Mon Jan 15 09:15:11 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jan 16 03:35:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c40c29
xfce-base/thunar: Backport upstream master changes Thunar-4.19.2 fails to build as some switch cases attempt to declare variables. Upstream fixed the issue by converting those cases into anonymous blocks. Backporting those changes from https://gitlab.xfce.org/xfce/thunar/-/merge_requests/428 to 4.19.2 fixes the issue. Signed-off-by: Nicholas Vinson <nvinson234 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34815 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../files/thunar-4.19.2-build-gio-extensions.patch | 42 ++++++++++++++++++++++ xfce-base/thunar/thunar-4.19.2.ebuild | 7 +++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/xfce-base/thunar/files/thunar-4.19.2-build-gio-extensions.patch b/xfce-base/thunar/files/thunar-4.19.2-build-gio-extensions.patch new file mode 100644 index 000000000000..1416b1943f29 --- /dev/null +++ b/xfce-base/thunar/files/thunar-4.19.2-build-gio-extensions.patch @@ -0,0 +1,42 @@ +Patch from https://gitlab.xfce.org/xfce/thunar/-/merge_requests/428 +diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c +index 5132e7d4..207800e7 100644 +--- a/thunar/thunar-gio-extensions.c ++++ b/thunar/thunar-gio-extensions.c +@@ -1578,11 +1578,13 @@ thunar_g_file_info_set_attribute (GFileInfo *info, + break; + + case THUNAR_GTYPE_STRINGV: ++ { + gchar **setting_values; + setting_values = g_strsplit (setting_value, THUNAR_METADATA_STRING_DELIMETER, 100); + g_file_info_set_attribute_stringv (info, setting_name, setting_values); + g_strfreev (setting_values); + break; ++ } + + default: + g_warning ("ThunarGType not supported, skipping"); +@@ -1603,6 +1605,7 @@ thunar_g_file_info_get_attribute (GFileInfo *info, + return g_strdup (g_file_info_get_attribute_string (info, setting_name)); + + case THUNAR_GTYPE_STRINGV: ++ { + gchar **stringv = g_file_info_get_attribute_stringv (info, setting_name); + GList *string_list = NULL; + gchar *joined_string = NULL; +@@ -1616,6 +1619,7 @@ thunar_g_file_info_get_attribute (GFileInfo *info, + joined_string = thunar_util_strjoin_list (string_list, THUNAR_METADATA_STRING_DELIMETER); + g_list_free (string_list); + return joined_string; ++ } + + default: + g_warning ("ThunarGType not supported, skipping"); +@@ -1760,4 +1764,4 @@ thunar_g_file_get_metadata_setting (GFile *file, + g_free (attr_name); + + return attr_value; +-} +\ No newline at end of file ++} diff --git a/xfce-base/thunar/thunar-4.19.2.ebuild b/xfce-base/thunar/thunar-4.19.2.ebuild index 6bfa97ad9d27..ef7d9b40f176 100644 --- a/xfce-base/thunar/thunar-4.19.2.ebuild +++ b/xfce-base/thunar/thunar-4.19.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,6 +50,11 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # https://gitlab.xfce.org/xfce/thunar/-/merge_requests/428 + "${FILESDIR}/thunar-4.19.2-build-gio-extensions.patch" +) + src_configure() { local myconf=( $(use_enable introspection)
