commit: a305a50eb6bda3b594e8442dd4ec67866950a2d6 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Mon Apr 6 22:09:24 2020 +0000 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> CommitDate: Mon Apr 6 22:14:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a305a50e
mate-base/caja: Fix #708644 Closes: https://bugs.gentoo.org/708644 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> .../{caja-1.22.3.ebuild => caja-1.22.3-r1.ebuild} | 4 + .../caja/files/caja-1.22.3-gcc-10-fno-common.patch | 100 +++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/mate-base/caja/caja-1.22.3.ebuild b/mate-base/caja/caja-1.22.3-r1.ebuild similarity index 97% rename from mate-base/caja/caja-1.22.3.ebuild rename to mate-base/caja/caja-1.22.3-r1.ebuild index 9f8692d776c..1167ca298cd 100644 --- a/mate-base/caja/caja-1.22.3.ebuild +++ b/mate-base/caja/caja-1.22.3-r1.ebuild @@ -58,6 +58,10 @@ PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" # GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed RESTRICT="test" +PATCHES=( + "${FILESDIR}/${P}-gcc-10-fno-common.patch" +) + src_prepare() { # Remove unnecessary CFLAGS. sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ diff --git a/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch b/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch new file mode 100644 index 00000000000..41d0174e4d2 --- /dev/null +++ b/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch @@ -0,0 +1,100 @@ +From 6bf49f348d8ce6debc8f645b667422bb9a261a2b Mon Sep 17 00:00:00 2001 +From: rbuj <[email protected]> +Date: Thu, 30 Jan 2020 10:56:12 +0100 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag + +--- + eel/eel-background.c | 6 ++++-- + libcaja-private/caja-global-preferences.c | 13 ++++++++++++ + libcaja-private/caja-global-preferences.h | 24 +++++++++++------------ + 3 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c +index 2d3c3466c..2f1d90886 100644 +--- a/libcaja-private/caja-global-preferences.c ++++ b/libcaja-private/caja-global-preferences.c +@@ -35,6 +35,19 @@ + #include "caja-file-utilities.h" + #include "caja-file.h" + ++GSettings *caja_preferences; ++GSettings *caja_media_preferences; ++GSettings *caja_window_state; ++GSettings *caja_icon_view_preferences; ++GSettings *caja_desktop_preferences; ++GSettings *caja_tree_sidebar_preferences; ++GSettings *caja_compact_view_preferences; ++GSettings *caja_list_view_preferences; ++GSettings *caja_extension_preferences; ++ ++GSettings *mate_background_preferences; ++GSettings *mate_lockdown_preferences; ++ + /* + * Public functions + */ +diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h +index 2eec02b4a..832811574 100644 +--- a/libcaja-private/caja-global-preferences.h ++++ b/libcaja-private/caja-global-preferences.h +@@ -212,18 +212,18 @@ typedef enum + void caja_global_preferences_init (void); + char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void); + +-GSettings *caja_preferences; +-GSettings *caja_media_preferences; +-GSettings *caja_window_state; +-GSettings *caja_icon_view_preferences; +-GSettings *caja_desktop_preferences; +-GSettings *caja_tree_sidebar_preferences; +-GSettings *caja_compact_view_preferences; +-GSettings *caja_list_view_preferences; +-GSettings *caja_extension_preferences; +- +-GSettings *mate_background_preferences; +-GSettings *mate_lockdown_preferences; ++extern GSettings *caja_preferences; ++extern GSettings *caja_media_preferences; ++extern GSettings *caja_window_state; ++extern GSettings *caja_icon_view_preferences; ++extern GSettings *caja_desktop_preferences; ++extern GSettings *caja_tree_sidebar_preferences; ++extern GSettings *caja_compact_view_preferences; ++extern GSettings *caja_list_view_preferences; ++extern GSettings *caja_extension_preferences; ++ ++extern GSettings *mate_background_preferences; ++extern GSettings *mate_lockdown_preferences; + + G_END_DECLS + +--- a/eel/eel-background.c 2020-04-06 17:58:28.060044227 -0400 ++++ b/eel/eel-background.c 2020-04-06 18:01:18.246099978 -0400 +@@ -36,7 +36,6 @@ + #include <gio/gio.h> + #include <math.h> + #include <stdio.h> +-#include <libcaja-private/caja-global-preferences.h> + + enum + { +@@ -427,6 +426,7 @@ + static void + init_fade (EelBackground *self) + { ++ GSettings *mate_background_preferences; + GtkWidget *widget = self->details->widget; + gboolean do_fade; + +@@ -434,8 +434,11 @@ + return; + } + ++ mate_background_preferences = g_settings_new ("org.mate.background"); + do_fade = g_settings_get_boolean (mate_background_preferences, + MATE_BG_KEY_BACKGROUND_FADE); ++ g_object_unref (mate_background_preferences); ++ + if (!do_fade) { + return; + }
