Date: Fri, 28 Aug 2020 11:32:26 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546724 - head/x11-fm/caja/files Message-ID: <202008281132.07SBWQ4X072588@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Aug 28 11:32:26 2020 New Revision: 546724 URL: https://svnweb.freebsd.org/changeset/ports/546724 Log: x11-fm/caja: fix build on recent current Obtained from: https://github.com/mate-desktop/caja/commit/6bf49f348d8ce6debc8f645b667422bb9a261a2b Added: head/x11-fm/caja/files/patch-eel_eel-background.c (contents, props changed) head/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c (contents, props changed) head/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h (contents, props changed) Added: head/x11-fm/caja/files/patch-eel_eel-background.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/caja/files/patch-eel_eel-background.c Fri Aug 28 11:32:26 2020 (r546724) @@ -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; + } Added: head/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c Fri Aug 28 11:32:26 2020 (r546724) @@ -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 + */ Added: head/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h Fri Aug 28 11:32:26 2020 (r546724) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008281132.07SBWQ4X072588>