Index: Makefile =================================================================== --- Makefile (Revision 546391) +++ Makefile (Arbeitskopie) @@ -3,7 +3,7 @@ PORTNAME= caja PORTVERSION= 1.22.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm mate MASTER_SITES= MATE DIST_SUBDIR= mate Index: files/patch-ZZZ-fix-fno-common-build-g6bf49f348d8 =================================================================== --- files/patch-ZZZ-fix-fno-common-build-g6bf49f348d8 (nicht existent) +++ files/patch-ZZZ-fix-fno-common-build-g6bf49f348d8 (Arbeitskopie) @@ -0,0 +1,94 @@ +From 6bf49f348d8ce6debc8f645b667422bb9a261a2b Mon Sep 17 00:00:00 2001 +From: rbuj +Date: Thu, 30 Jan 2020 10:56:12 +0100 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag + +--- eel/eel-background.c.orig 2019-12-23 17:17:34 UTC ++++ eel/eel-background.c +@@ -36,7 +36,6 @@ + #include + #include + #include +-#include + + 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,11 @@ 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; + } + 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(-) + +--- libcaja-private/caja-global-preferences.c.orig 2019-12-23 17:17:34 UTC ++++ libcaja-private/caja-global-preferences.c +@@ -34,6 +34,19 @@ + #include + #include + ++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 + */ +--- libcaja-private/caja-global-preferences.h.orig 2019-12-23 17:17:34 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 + Property changes on: files/patch-ZZZ-fix-fno-common-build-g6bf49f348d8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (Revision 546391) +++ pkg-plist (Arbeitskopie) @@ -239,4 +239,6 @@ share/pixmaps/caja/erase.png share/pixmaps/caja/knob.png share/pixmaps/caja/thumbnail_frame.png +share/mime/application/x-mate-saved-search.xml +share/mime/packages/caja.xml @dir lib/caja/extensions-2.0