diff --git a/gcc-10.patch b/gcc-10.patch new file mode 100644 index 0000000..49bad24 --- /dev/null +++ b/gcc-10.patch @@ -0,0 +1,94 @@ +From b118b8b1023b4c70966baea4f8876088fab737aa Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Thu, 23 Jan 2020 11:32:27 +0000 +Subject: [PATCH] nemo-global-preferences: use 'extern' properly + +--- + libnemo-private/nemo-global-preferences.c | 21 +++++++++++++ + libnemo-private/nemo-global-preferences.h | 38 +++++++++++------------ + 2 files changed, 40 insertions(+), 19 deletions(-) + +diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c +index 0de83e02e..e10d4de8f 100644 +--- a/libnemo-private/nemo-global-preferences.c ++++ b/libnemo-private/nemo-global-preferences.c +@@ -36,6 +36,27 @@ + #include + #include + ++GSettings *nemo_preferences; ++GSettings *nemo_icon_view_preferences; ++GSettings *nemo_list_view_preferences; ++GSettings *nemo_compact_view_preferences; ++GSettings *nemo_desktop_preferences; ++GSettings *nemo_tree_sidebar_preferences; ++GSettings *nemo_window_state; ++GSettings *nemo_plugin_preferences; ++GSettings *nemo_menu_config_preferences; ++GSettings *gnome_lockdown_preferences; ++GSettings *gnome_background_preferences; ++GSettings *gnome_media_handling_preferences; ++GSettings *gnome_terminal_preferences; ++GSettings *cinnamon_privacy_preferences; ++GSettings *cinnamon_interface_preferences; ++ ++GTimeZone *prefs_current_timezone; ++gboolean prefs_current_24h_time_format; ++NemoDateFormat prefs_current_date_format; ++ ++GTimer *nemo_startup_timer; + + static gboolean ignore_view_metadata = FALSE; + static gboolean inherit_folder_view_preference = FALSE; +diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h +index 899e82b1b..9083c6820 100644 +--- a/libnemo-private/nemo-global-preferences.h ++++ b/libnemo-private/nemo-global-preferences.h +@@ -276,28 +276,28 @@ gint nemo_global_preferences_get_tooltip_flags (void); + gboolean nemo_global_preferences_should_load_plugin (const gchar *name, const gchar *key); + gchar **nemo_global_preferences_get_fileroller_mimetypes (void); + +-GSettings *nemo_preferences; +-GSettings *nemo_icon_view_preferences; +-GSettings *nemo_list_view_preferences; +-GSettings *nemo_compact_view_preferences; +-GSettings *nemo_desktop_preferences; +-GSettings *nemo_tree_sidebar_preferences; +-GSettings *nemo_window_state; +-GSettings *nemo_plugin_preferences; +-GSettings *nemo_menu_config_preferences; +-GSettings *gnome_lockdown_preferences; +-GSettings *gnome_background_preferences; +-GSettings *gnome_media_handling_preferences; +-GSettings *gnome_terminal_preferences; +-GSettings *cinnamon_privacy_preferences; +-GSettings *cinnamon_interface_preferences; ++extern GSettings *nemo_preferences; ++extern GSettings *nemo_icon_view_preferences; ++extern GSettings *nemo_list_view_preferences; ++extern GSettings *nemo_compact_view_preferences; ++extern GSettings *nemo_desktop_preferences; ++extern GSettings *nemo_tree_sidebar_preferences; ++extern GSettings *nemo_window_state; ++extern GSettings *nemo_plugin_preferences; ++extern GSettings *nemo_menu_config_preferences; ++extern GSettings *gnome_lockdown_preferences; ++extern GSettings *gnome_background_preferences; ++extern GSettings *gnome_media_handling_preferences; ++extern GSettings *gnome_terminal_preferences; ++extern GSettings *cinnamon_privacy_preferences; ++extern GSettings *cinnamon_interface_preferences; + + /* Cached for fast access and used in nemo-file.c for constructing date/time strings */ +-GTimeZone *prefs_current_timezone; +-gboolean prefs_current_24h_time_format; +-NemoDateFormat prefs_current_date_format; ++extern GTimeZone *prefs_current_timezone; ++extern gboolean prefs_current_24h_time_format; ++extern NemoDateFormat prefs_current_date_format; + +-GTimer *nemo_startup_timer; ++extern GTimer *nemo_startup_timer; + + G_END_DECLS + diff --git a/nemo.spec b/nemo.spec index c5eba1f..45a5cd1 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,13 +1,14 @@ Name: nemo Summary: File manager for Cinnamon Version: 4.4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz Source1: nemo-fedora.gschema.override Patch0: remove_desktop_search.patch Patch1: Don-t-scale-text-size-when-zooming.patch +Patch2: %url/pull/2306.patch#/gcc-10.patch Requires: redhat-menus Requires: gvfs%{?_isa} @@ -65,8 +66,6 @@ for developing nemo extensions. %autosetup -p1 %build -# Issue reported upstream https://github.com/linuxmint/nemo/issues/2305 -export CFLAGS="%{optflags} -fcommon" %meson -D deprecated_warnings=false -D gtk_doc=false %meson_build @@ -124,6 +123,9 @@ rm -f %buildroot%{_datadir}/icons/hicolor/.icon-theme.cache %{_datadir}/gir-1.0/*.gir %changelog +* Thu Jan 23 2020 Leigh Scott - 4.4.2-3 +- Add patch to fix gcc-10 compile issue + * Thu Jan 23 2020 Leigh Scott - 4.4.2-2 - Workaround gcc-10 issue till upstream addresses it