diff --git a/gcc-10.patch b/gcc-10.patch deleted file mode 100644 index 49bad24..0000000 --- a/gcc-10.patch +++ /dev/null @@ -1,94 +0,0 @@ -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 b0c033a..a0fd0b3 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,14 +1,13 @@ Name: nemo Summary: File manager for Cinnamon -Version: 4.4.2 -Release: 4%{?dist} +Version: 4.6.0 +Release: 1%{?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} @@ -16,7 +15,7 @@ Requires: gvfs-goa%{?_isa} Requires: xapps%{?_isa} >= 1.4.0 # required for for gtk-stock fallback Requires: adwaita-icon-theme -Requires: cinnamon-translations >= 4.4.0 +Requires: cinnamon-translations >= 4.6.0 BuildRequires: meson BuildRequires: intltool @@ -24,7 +23,7 @@ BuildRequires: python3-gobject-base BuildRequires: desktop-file-utils BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(cinnamon-desktop) >= 4.4.0 +BuildRequires: pkgconfig(cinnamon-desktop) >= 4.6.0 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(exempi-2.0) @@ -123,6 +122,9 @@ rm -f %buildroot%{_datadir}/icons/hicolor/.icon-theme.cache %{_datadir}/gir-1.0/*.gir %changelog +* Wed May 13 2020 Leigh Scott - 4.6.0-1 +- Update to 4.6.0 release + * Wed Jan 29 2020 Fedora Release Engineering - 4.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 180464a..85eb581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nemo-4.4.2.tar.gz) = b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c +SHA512 (nemo-4.6.0.tar.gz) = 9912155b0409346352518fdcce8282fcc03ef2a8053de5b6f5839bec70035edb1c9cd84f25314e7ee843b10469b4573f77108a5908597fc91592e7d261f263c3