x11-fm/caja: fix build on recent current

Obtained from:	https://github.com/mate-desktop/caja/commit/6bf49f348d8ce6debc8f645b667422bb9a261a2b

3 files changed, 83 insertions, 0 deletions

diff --git a/x11-fm/caja/files/patch-eel_eel-background.c b/x11-fm/caja/files/patch-eel_eel-background.c
new file mode 100644
index 000000000000..4d45b30cc174
--- /dev/null
+++ b/x11-fm/caja/files/patch-eel_eel-background.c
@@ -0,0 +1,29 @@
+--- eel/eel-background.c.orig	2020-08-28 11:28:14 UTC
++++ eel/eel-background.c
+@@ -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 @@ set_root_surface (EelBackground *self,
+ static void
+ init_fade (EelBackground *self)
+ {
++    GSettings *mate_background_preferences;
+     GtkWidget *widget = self->details->widget;
+     gboolean do_fade;
+ 
+@@ -434,8 +434,10 @@ init_fade (EelBackground *self)
+         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;
+     }
diff --git a/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c b/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c
new file mode 100644
index 000000000000..8abd1bc7d6d4
--- /dev/null
+++ b/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c
@@ -0,0 +1,22 @@
+--- libcaja-private/caja-global-preferences.c.orig	2020-08-28 11:29:20 UTC
++++ libcaja-private/caja-global-preferences.c
+@@ -34,6 +34,19 @@
+ #include <eel/eel-string.h>
+ #include <glib/gi18n.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/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h b/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h
new file mode 100644
index 000000000000..685db3aa8a42
--- /dev/null
+++ b/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h
@@ -0,0 +1,32 @@
+--- libcaja-private/caja-global-preferences.h.orig	2020-08-28 11:29:20 UTC
++++ libcaja-private/caja-global-preferences.h
+@@ -211,18 +211,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;
++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;
+ 
+-GSettings *mate_background_preferences;
+-GSettings *mate_lockdown_preferences;
++extern GSettings *mate_background_preferences;
++extern GSettings *mate_lockdown_preferences;
+ 
+ G_END_DECLS
+