diff --git a/nautilus-3.20.3.tar.xz b/nautilus-3.20.3.tar.xz deleted file mode 100644 index f5686ca..0000000 --- a/nautilus-3.20.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e -size 3437224 diff --git a/nautilus-3.21.91.1.tar.xz b/nautilus-3.21.91.1.tar.xz new file mode 100644 index 0000000..8616e91 --- /dev/null +++ b/nautilus-3.21.91.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da084d51375aacb54e905da977d467aca49a20b906d707df9355eaa90bcf7d04 +size 5119280 diff --git a/nautilus-enable-eject-option-on-selection-menu.patch b/nautilus-enable-eject-option-on-selection-menu.patch index fbae53f..1ddb052 100644 --- a/nautilus-enable-eject-option-on-selection-menu.patch +++ b/nautilus-enable-eject-option-on-selection-menu.patch @@ -1,18 +1,18 @@ -diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index fd4f2f5..a4e62d6 100644 ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -6474,7 +6474,12 @@ real_update_actions_state (NautilusFilesView *view) - can_move_files && !selection_contains_recent); +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 + /* 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 index 1b5564d..c40704c 100644 --- a/nautilus-fix-desktop-icon-smash.patch +++ b/nautilus-fix-desktop-icon-smash.patch @@ -1,22 +1,23 @@ -diff -Nura nautilus-3.20.1/libnautilus-private/nautilus-canvas-container.c nautilus-3.20.1_new/libnautilus-private/nautilus-canvas-container.c ---- nautilus-3.20.1/libnautilus-private/nautilus-canvas-container.c 2016-04-28 09:27:24.000000000 +0000 -+++ nautilus-3.20.1_new/libnautilus-private/nautilus-canvas-container.c 2016-06-23 14:03:49.500258624 +0000 -@@ -1824,7 +1824,8 @@ - } - - /* Check and see if we need to move to a new column */ -- if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height) { -+ if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height && -+ height > 0 && total > 3) { - break; - } +Index: nautilus-3.21.91/src/nautilus-canvas-container.c +=================================================================== +--- nautilus-3.21.91.orig/src/nautilus-canvas-container.c ++++ nautilus-3.21.91/src/nautilus-canvas-container.c +@@ -2039,7 +2039,8 @@ lay_down_icons_vertical_desktop (Nautilu + } -@@ -1867,7 +1868,7 @@ - /* Check and see if we need to move to a new column */ - if (y != DESKTOP_PAD_VERTICAL && y > height - icon_height_for_bound_check && - /* Make sure we lay out at least one icon per column, to make progress */ -- p != icons) { -+ p != icons && height > 0 && total > 3) { - x += column_width + DESKTOP_PAD_HORIZONTAL; - break; - } + /* Check and see if we need to move to a new column */ +- if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height) ++ if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height && ++ height > 0 && total > 3) + { + break; + } +@@ -2087,7 +2088,7 @@ lay_down_icons_vertical_desktop (Nautilu + /* Check and see if we need to move to a new column */ + if (y != DESKTOP_PAD_VERTICAL && y > height - icon_height_for_bound_check && + /* Make sure we lay out at least one icon per column, to make progress */ +- p != icons) ++ p != icons && height > 0 && total > 3) + { + x += column_width + DESKTOP_PAD_HORIZONTAL; + break; diff --git a/nautilus.changes b/nautilus.changes index 58b3589..2f84023 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Sep 2 19:58:02 UTC 2016 - zaitor@opensuse.org + +- Update to version 3.21.91.1: + + mime-actions: Fix shift+control+down segfault on a folder. + + Use templates for glib-mkenums. + + Fix compiler warning. + + batch-rename-utilities: + - Protect against null error. + - Print warnings if query goes wrong. + + file-undo-operations: Add plural support for strings. + + batch-rename-dialog: Add plural support for strings. + + Updated translations. +- Drop nautilus-fix-compiler-warning.patch: Fixed upstream. + +------------------------------------------------------------------- +Wed Aug 31 08:40:37 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.21.91: + + Implement batch renaming tool. + + Implement compressed files support. + + Rework the view menus. + + Separate desktop handling from Nautilus. + + Add missing cut shortcut. + + Add = as "zoom in" shortcut. +- Add pkgconfig(gnome-autoar-0) BuildRequires: new dependency. +- Rebase nautilus-enable-eject-option-on-selection-menu.patch and + nautilus-fix-desktop-icon-smash.patch. +- Add nautilus-fix-compiler-warning.patch: Fix function potentially + reching the end without returning a value. + ------------------------------------------------------------------- Tue Aug 30 13:30:03 UTC 2016 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 02b00e4..f8e431b 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -17,19 +17,19 @@ Name: nautilus -Version: 3.20.3 +Version: 3.21.91.1 Release: 0 Summary: File Manager for the GNOME Desktop License: GPL-2.0+ Group: Productivity/File utilities -Source: http://download.gnome.org/sources/nautilus/3.20/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/nautilus/3.21/%{name}-%{version}.tar.xz # 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 -Patch2: nautilus-fix-desktop-icon-smash.patch +Patch1: nautilus-fix-desktop-icon-smash.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build # needed for directory ownership @@ -47,6 +47,7 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(exempi-2.0) >= 2.1.0 BuildRequires: pkgconfig(gail-3.0) BuildRequires: pkgconfig(glib-2.0) >= 2.45.7 +BuildRequires: pkgconfig(gnome-autoar-0) >= 0.1 BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.8.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.12 @@ -113,7 +114,7 @@ This package contains development files for nautilus. %prep %setup -q %patch0 -p1 -%patch2 -p1 +%patch1 -p1 translation-update-upstream %build @@ -124,7 +125,7 @@ translation-update-upstream %install %makeinstall -rm $RPM_BUILD_ROOT/%{_libdir}/{*.*a,nautilus/extensions-3.0/*.la} +find %{buildroot} -type f -name '*.la' -print -delete %suse_update_desktop_file org.gnome.Nautilus %suse_update_desktop_file nautilus-autorun-software %suse_update_desktop_file nautilus-autostart @@ -164,10 +165,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/services/org.gnome.Nautilus.service %{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml %dir %{_libdir}/nautilus +%{_libdir}/nautilus/libgd.so %doc %{_mandir}/man1/nautilus*.1.gz %{_sysconfdir}/xdg/autostart/nautilus-autostart.desktop %dir %{_datadir}/appdata/ %{_datadir}/appdata/org.gnome.Nautilus.appdata.xml +%{_datadir}/icons/hicolor/*/apps/org.gnome.Nautilus* %files -n libnautilus-extension1 %defattr(-,root,root)