diff --git a/nautilus-3.22.0.tar.xz b/nautilus-3.22.0.tar.xz deleted file mode 100644 index c9ef22b..0000000 --- a/nautilus-3.22.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816 -size 5131288 diff --git a/nautilus-3.22.1.tar.xz b/nautilus-3.22.1.tar.xz new file mode 100644 index 0000000..ee48dab --- /dev/null +++ b/nautilus-3.22.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17e37ffecebb2cf29e6bfb52111a951f0c67534b9dabf0210c12d15abb7dbddc +size 5139460 diff --git a/nautilus-enable-eject-option-on-selection-menu.patch b/nautilus-enable-eject-option-on-selection-menu.patch deleted file mode 100644 index 1ddb052..0000000 --- a/nautilus-enable-eject-option-on-selection-menu.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: nautilus-3.21.91/src/nautilus-files-view.c -=================================================================== ---- nautilus-3.21.91.orig/src/nautilus-files-view.c -+++ nautilus-3.21.91/src/nautilus-files-view.c -@@ -7218,7 +7218,12 @@ real_update_actions_state (NautilusFiles - can_move_files && !selection_contains_recent); - - /* Drive menu */ -- show_mount = show_unmount = show_eject = show_start = show_stop = show_detect_media = FALSE; -+ show_mount = (selection != NULL); -+ show_unmount = (selection != NULL); -+ show_eject = (selection != NULL); -+ show_start = (selection != NULL && selection_count == 1); -+ show_stop = (selection != NULL && selection_count == 1); -+ show_detect_media = (selection != NULL && selection_count == 1); - for (l = selection; l != NULL && (show_mount || show_unmount - || show_eject - || show_start || show_stop diff --git a/nautilus-fix-desktop-icon-smash.patch b/nautilus-fix-desktop-icon-smash.patch deleted file mode 100644 index 41e0678..0000000 --- a/nautilus-fix-desktop-icon-smash.patch +++ /dev/null @@ -1,85 +0,0 @@ -From: d82b5bb6e06b6761bd5d5f3dc9a0762ce55517b4 Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Fri, 7 Oct 2016 12:24:18 +0100 -Subject: [PATCH] nautilus-canvas: Don't lay down desktop icons if we haven't - -Sometimes we were trying to lay down icons before size_allocate had been -run. When this has happened, gtk_widget_get_allocation returns 1×1 as -our size. This messes up the algorithm and causes icons to be -overlapping on the canvas. - -This case happens when using Nautilus as the desktop in early-startup -(e.g. from its XDG autostart file). It can happen that we have read the -desktop files before the allocation has happened. - -We fix this by noticing if we're called before size_allocate and then -deferring icon layout until later on, after size_allocate has happened. - -This behaviour was introduced in commit -e0081be7cd65de6422529d831f7882009ce00a9d, which sorts and freezes the -desktop in early-startup. - -https://bugzilla.suse.com/show_bug.cgi?id=979072 - -https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1611955 - -https://bugzilla.gnome.org/show_bug.cgi?id=765601 - - -diff -Nura nautilus-3.22.0/src/nautilus-canvas-container.c nautilus-3.22.0_new/src/nautilus-canvas-container.c ---- nautilus-3.22.0/src/nautilus-canvas-container.c 2016-09-13 21:06:51.000000000 +0000 -+++ nautilus-3.22.0_new/src/nautilus-canvas-container.c 2016-10-09 10:01:33.953215876 +0000 -@@ -1432,6 +1432,9 @@ - - g_assert (NAUTILUS_IS_CANVAS_CONTAINER (container)); - -+ /* We can't get the right allocation if the size hasn't been allocated yet */ -+ g_return_if_fail (container->details->has_been_allocated); -+ - if (icons == NULL) - { - return; -@@ -1938,6 +1941,9 @@ - EelDRect icon_rect; - GtkAllocation allocation; - -+ /* We can't get the right allocation if the size hasn't been allocated yet */ -+ g_return_if_fail (container->details->has_been_allocated); -+ - /* Get container dimensions */ - gtk_widget_get_allocation (GTK_WIDGET (container), &allocation); - height = CANVAS_HEIGHT (container, allocation); -@@ -2218,7 +2224,13 @@ - redo_layout (NautilusCanvasContainer *container) - { - unschedule_redo_layout (container); -- redo_layout_internal (container); -+ /* We can't lay out if the size hasn't been allocated yet; wait for it to -+ * be and then we will be called again from size_allocate () -+ */ -+ if (container->details->has_been_allocated) -+ { -+ redo_layout_internal (container); -+ } - } - - static void -@@ -7836,6 +7848,18 @@ - NautilusCanvasIcon *icon; - NautilusCanvasPosition position; - -+ /* This early-exit avoids freezing the icons before they have been properly -+ * positioned, since we won't re-layout if auto_layout is FALSE. -+ * -+ * The container will freeze the icons after it lays them out once we've -+ * been allocated (e.g. in lay_out_icons_vertical_desktop). -+ */ -+ if (!container->details->has_been_allocated) -+ { -+ g_debug ("Not freezing icon positions yet; we haven't been allocated"); -+ return; -+ } -+ - changed = container->details->auto_layout; - container->details->auto_layout = FALSE; - diff --git a/nautilus.changes b/nautilus.changes index 0d1eb83..4f331a2 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Oct 14 17:05:32 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.22.1: + + Multiple batch renaming fixes. + + Multiple compression integration fixes. + + Fix not showing "eject" and other options for devices in the + context menu in the desktop. + + Rework clipboard handling, fixing desktop<->Nautilus + interaction. + + Fix overlaping icons on desktop in some cases, noticeabily in + Ubuntu. + + Fix wrong progress information in operations when skipping + files. + + Fix gnome-shell search only searching for whole words. + + Show location as default for list view on Recent. + + Fix context menu position in Wayland or other non-global + coordinates systems. + + Update man page of nautilus. + + Add revealer for warnings in batch rename dialog. + + Add tooltips to batch rename dialog file names. + + Port nautilus classes to G_DECLARE. + + Extend Nautilus File API for regular files. + + Don't crash for simple leaks on the views. + + Updated translations. +- Drop nautilus-enable-eject-option-on-selection-menu.patch and + nautilus-fix-desktop-icon-smash.patch: Fixed upstream. + ------------------------------------------------------------------- Sun Oct 9 07:46:04 UTC 2016 - qzhao@suse.com diff --git a/nautilus.spec b/nautilus.spec index 83ec40c..e35bc3e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -17,7 +17,7 @@ Name: nautilus -Version: 3.22.0 +Version: 3.22.1 Release: 0 Summary: File Manager for the GNOME Desktop License: GPL-2.0+ @@ -27,10 +27,6 @@ Source: http://download.gnome.org/sources/nautilus/3.22/%{name}-%{versio # fate#308344 bgo#602147 Source1: mount-archive.desktop Source99: baselibs.conf -# PATCH-FIX-UPSTREAM nautilus-enable-eject-option-on-selection-menu.patch bsc#981950 bgo#768355 tyang@suse.com -- Enable eject option on selection menu -Patch0: nautilus-enable-eject-option-on-selection-menu.patch -# PATCH-FIX-UPSTREAM nautilus-fix-desktop-icon-smash.patch bsc#979072 bgo#765601 qzhao@suse.com -- Fix icons smash at first boot -Patch1: nautilus-fix-desktop-icon-smash.patch # needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -113,8 +109,6 @@ This package contains development files for nautilus. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif