pool/nautilus
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 415915 from GNOME:Next

Browse Source 
New stable rel, not buildtested

OBS-URL: https://build.opensuse.org/request/show/415915
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=253
This commit is contained in:
Bjørn Lie 2016-07-31 07:27:02 +00:00 committed by Git OBS Bridge
parent 3f37af7b04
commit d1e04e0ec6
6 changed files with 25 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nautilus-3.20.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2a907b994026412a7ed7c8145d4ab4f886ac87e780353b967473305a35e81e8
size 3427792

3
nautilus-3.20.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae
size 3447216

38
nautilus-adjust-style-priority.patch
View File

@ -1,38 +0,0 @@
From 8c0f5970e71a9b6c786e3e14785f2691c731cd38 Mon Sep 17 00:00:00 2001
From: Sebastian Keller <sebastian-keller@gmx.de>
Date: Fri, 29 Apr 2016 00:13:59 +0200
Subject: application: Fix white desktop after changing themes
Changing the theme to Adwaita was causing the Adwaita.css style provider
to get added after the nautilus.css style provider. This caused the
Adwaita.css provider to override the nautilus.css provider, because the
behavior of two style providers with the same priority is undefined and
gtk happens to prefer the style provider that got added last.
https://bugzilla.gnome.org/show_bug.cgi?id=765687
---
src/nautilus-application.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 4bc924d..38e3a25 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -1116,9 +1116,13 @@ theme_changed (GtkSettings *settings)
permanent_provider = gtk_css_provider_new ();
file = g_file_new_for_uri ("resource:///org/gnome/nautilus/css/nautilus.css");
gtk_css_provider_load_from_file (permanent_provider, file, NULL);
+ /* The behavior of two style providers with the same priority is
+ * undefined and gtk happens to prefer the provider that got added last.
+ * Use a higher priority here to avoid this problem.
+ */
gtk_style_context_add_provider_for_screen (screen,
GTK_STYLE_PROVIDER (permanent_provider),
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1);
g_object_unref (file);
}
--
cgit v0.12

59
nautilus-bsc979947.patch
View File

@ -1,59 +0,0 @@
From 58661010db2237c69ad98ee446f20a16ba24888f Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Mon, 20 Jun 2016 11:31:26 -0500
Subject: [PATCH] Only save zoom level if the user has updated it
Don't write the zoom level to gsettings if the user has not made a
change from the system default. This allows an update to be installed
and then rolled back without a system default from the update having
been written to the user's configuration.
https://bugzilla.gnome.org/show_bug.cgi?id=767878
---
src/nautilus-canvas-view.c | 9 ++++++---
src/nautilus-list-view.c | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 2c99ce7..b42a545 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -962,9 +962,12 @@ action_zoom_to_level (GSimpleAction *action,
nautilus_canvas_view_zoom_to_level (view, zoom_level);
g_simple_action_set_state (G_SIMPLE_ACTION (action), state);
- g_settings_set_enum (nautilus_icon_view_preferences,
- NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
- zoom_level);
+ if (g_settings_get_enum (nautilus_icon_view_preferences,
+ NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL) != zoom_level) {
+ g_settings_set_enum (nautilus_icon_view_preferences,
+ NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
+ zoom_level);
+ }
}
static void
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 1c2f996..6237b21 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -2507,9 +2507,12 @@ action_zoom_to_level (GSimpleAction *action,
nautilus_list_view_zoom_to_level (view, zoom_level);
g_simple_action_set_state (G_SIMPLE_ACTION (action), state);
- g_settings_set_enum (nautilus_list_view_preferences,
- NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL,
- zoom_level);
+ if (g_settings_get_enum (nautilus_list_view_preferences,
+ NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL) != zoom_level) {
+ g_settings_set_enum (nautilus_list_view_preferences,
+ NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL,
+ zoom_level);
+ }
}
static void
--
2.6.2

21
nautilus.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Fri Jul 29 17:29:21 UTC 2016 - zaitor@opensuse.org
- Update to version 3.20.2:
+ Fix white desktop background after changing themes.
+ Improve double click detection.
+ Fix path bar menu on wayland appearing on random places.
+ Only save zoom level if the level has changed.
+ Fix date difference calculation for attributes like Modified
Date.
+ Hide floating bar on hover.
+ Fix detection of remote systems for not thumbnailing.
+ Fix sorting on Japanese locale.
+ Fix gnome shell search provider not being recursive.
+ Fix copy operation lags.
+ Avoid unresponsiveness when file chooser is opened.
+ Fix renaming duplicated logic on search and recent.
+ Fix trash handling to delete files if disk is full.
- Drop nautilus-adjust-style-priority.patch and
nautilus-bsc979947.patch: Fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 15 09:05:18 UTC 2016 - tyang@suse.com Fri Jul 15 09:05:18 UTC 2016 - tyang@suse.com

8
nautilus.spec
View File

@ -17,7 +17,7 @@
Name: nautilus Name: nautilus
Version: 3.20.1 Version: 3.20.2
Release: 0 Release: 0
Summary: File Manager for the GNOME Desktop Summary: File Manager for the GNOME Desktop
License: GPL-2.0+ License: GPL-2.0+
@ -26,10 +26,6 @@ Source: http://download.gnome.org/sources/nautilus/3.20/%{name}-%{versio
# fate#308344 bgo#602147 # fate#308344 bgo#602147
Source1: mount-archive.desktop Source1: mount-archive.desktop
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM nautilus-adjust-style-priority.patch bsc#982633 bgo#765687 qzhao@suse.com -- Fix white desktop after changing themes
Patch0: nautilus-adjust-style-priority.patch
# PATCH-FIX-UPSTREAM nautilus-bsc979947.patch bsc#979947 bgo#767878 mgorse@suse.com -- only write zoom level to user configuration if the user has adjusted it.
Patch1: nautilus-bsc979947.patch
# PATCH-FIX-UPSTREAM nautilus-enable-eject-option-on-selection-menu.patch bsc#981950 bgo#768355 tyang@suse.com -- Enable eject option on selection menu # PATCH-FIX-UPSTREAM nautilus-enable-eject-option-on-selection-menu.patch bsc#981950 bgo#768355 tyang@suse.com -- Enable eject option on selection menu
Patch2: nautilus-enable-eject-option-on-selection-menu.patch Patch2: nautilus-enable-eject-option-on-selection-menu.patch
Url: http://www.gnome.org Url: http://www.gnome.org
@ -114,8 +110,6 @@ This package contains development files for nautilus.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1 %patch2 -p1
translation-update-upstream translation-update-upstream