Accepting request 416846 from home:qzhao:branches:GNOME:Factory

Tweak change log format, remove trailing space.

OBS-URL: https://build.opensuse.org/request/show/416846
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=254
This commit is contained in:
Dominique Leuenberger 2016-08-04 07:05:07 +00:00 committed by Git OBS Bridge
parent d1e04e0ec6
commit 9acfdb995e
3 changed files with 111 additions and 2 deletions

View File

@ -0,0 +1,22 @@
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;
}
@@ -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;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 2 10:03:29 UTC 2016 - qzhao@suse.com
- Add nautilus-fix-desktop-icon-smash.patch: Fix desktop icons
smashed together at the fist start time.(bsc#979072, bgo#765601)
-------------------------------------------------------------------
Fri Jul 29 17:29:21 UTC 2016 - zaitor@opensuse.org
@ -46,6 +52,11 @@ Fri Jun 3 18:02:41 UTC 2016 - qzhao@suse.com
that got added last. Use a higher priority here to avoid this
problem (bsc#982633, bgo#765687).
-------------------------------------------------------------------
Thu May 19 03:55:43 UTC 2016 - tyang@suse.com
- Update to GNOME 3.20.2 Fate#318572
-------------------------------------------------------------------
Thu Apr 28 13:16:42 UTC 2016 - zaitor@opensuse.org
@ -77,6 +88,23 @@ Thu Apr 28 13:16:42 UTC 2016 - zaitor@opensuse.org
of the files
+ Updated translations.
-------------------------------------------------------------------
Thu Apr 14 08:11:33 UTC 2016 - tyang@suse.com
- Update to GNOME 3.20 Fate#318572
- Drop patch:
* 0001-application-add-force-desktop-action.patch
* 0001-dnd-fix-dnd-issues-with-Type-Link-desktop-files.patch
* 0001-NautilusPropertyDialog-Fix-user-list-for-owner-chang.patch
* 0001-window-sync-initial-state-for-start-with-sidebar-act.patch
* nautilus-bgo711115-format-item-for-volumes-disappeared.patch
* nautilus-bgo711583-crash-modify-link-hash-table.patch
* nautilus-bgo722616-check-for-valid-location-entry-widget.patch
* nautilus-bnc872820-gtkheaderbar.patch
* nautilus-desktop-icon-name.patch
* nautilus-rename-background.patch
* nautilus-drives-and-volumes-on-desktop.diff
-------------------------------------------------------------------
Wed Mar 23 10:15:01 UTC 2016 - dimstar@opensuse.org
@ -154,6 +182,13 @@ Thu Feb 25 09:52:45 UTC 2016 - zaitor@opensuse.org
+ Make operations popover keyboard navigable.
+ Limit search to maximum 5 years.
-------------------------------------------------------------------
Fri Jan 29 02:28:32 UTC 2016 - mgorse@suse.com
- Add
0001-NautilusPropertyDialog-Fix-user-list-for-owner-chang.patch:
fix handling of the user list (bsc#963724).
-------------------------------------------------------------------
Wed Jan 27 03:19:02 UTC 2016 - damjanovic.ivo@gmail.com
@ -297,7 +332,7 @@ Thu Jul 23 20:31:20 UTC 2015 - zaitor@opensuse.org
+ Add feedback when the current shown folder is empty.
+ Updated translations.
------------------------------------------------------------------
-------------------------------------------------------------------
Sat May 30 10:38:45 UTC 2015 - zaitor@opensuse.org
- Update to version 3.17.2:
@ -398,6 +433,13 @@ Mon Jan 26 01:16:31 UTC 2015 - badshah400@gmail.com
+ Set max-width for value labels in properties.
+ Increase default window width.
-------------------------------------------------------------------
Fri Jan 9 06:12:44 UTC 2015 - tyang@suse.com
- Added 0001-dnd-fix-dnd-issues-with-Type-Link-desktop-files.patch:
Fix upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=720390
and bnc#896702 about Type-link-desktop-file issue.
-------------------------------------------------------------------
Tue Nov 25 17:02:47 UTC 2014 - zaitor@opensuse.org
@ -440,6 +482,12 @@ Tue Sep 16 20:02:21 UTC 2014 - dimstar@opensuse.org
+ Fix crash when using a screen reader in canvas view.
+ Fix crash when changing icon captions setting.
-------------------------------------------------------------------
Thu Sep 11 04:22:55 UTC 2014 - tyang@suse.com
- Remove the nautilus-crash-sftp-bookmark.patch:
Fix the bug about USB issue. (bnc#892725)
-------------------------------------------------------------------
Wed Sep 3 18:41:04 UTC 2014 - zaitor@opensuse.org
@ -461,6 +509,13 @@ Thu Aug 21 20:26:09 UTC 2014 - dimstar@opensuse.org
+ Fix build glitch with enums file.
+ Updated translations.
-------------------------------------------------------------------
Fri Aug 15 13:17:15 CDT 2014 - federico@suse.com
- Added nautilus-bnc872820-gtkheaderbar.patch for bnc#872820. This is
a backport of the code to make Nautilus use a standard GtkHeaderBar
instead of its own custom code for a toolbar/titlebar.
-------------------------------------------------------------------
Tue Jul 22 08:00:37 UTC 2014 - dimstar@opensuse.org
@ -481,6 +536,19 @@ Sat Jul 12 18:41:21 UTC 2014 - dimstar@opensuse.org
has been renamed to adwaita-icon-theme and is a mandatory
component of GTK+ 3.13.x.
-------------------------------------------------------------------
Thu Jun 26 06:51:31 UTC 2014 - tyang@suse.com
- Add nautilus-crash-sftp-bookmark.patch:
Fix the bug about sftp bookmark crash issue.(bnc#873210)
-------------------------------------------------------------------
Wed May 28 10:51:56 UTC 2014 - tyang@suse.com
- Add nautilus-desktop-icon-name.patch:
Fix upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=659520
desktop icon name translation issue.(bnc#870384)
-------------------------------------------------------------------
Sat May 17 15:23:11 UTC 2014 - zaitor@opensuse.org
@ -509,6 +577,16 @@ Sat May 17 14:55:25 UTC 2014 - zaitor@opensuse.org
+ Do not use legacy emblem names.
+ Sync the GTK+ setting for 'sort-directories-first'.
-------------------------------------------------------------------
Fri Mar 28 01:35:00 UTC 2014 - mgorse@suse.com
- Add nautilus-bgo711115-format-item-for-volumes-disappeared.patch,
0001-window-sync-initial-state-for-start-with-sidebar-act.patch,
nautilus-bgo711583-crash-modify-link-hash-table.patch,
nautilus-bgo722616-check-for-valid-location-entry-widget.patch,
nautilus-rename-background.patch: various bug fixes from
upstream gnome-3-10 branch.
-------------------------------------------------------------------
Tue Mar 25 11:05:50 UTC 2014 - dimstar@opensuse.org
@ -522,6 +600,12 @@ Wed Mar 19 08:59:50 UTC 2014 - dimstar@opensuse.org
+ Only show one button for mixed Video CD/Video DVD media.
+ Add a force-desktop action to NautilusApplication.
-------------------------------------------------------------------
Tue Mar 18 15:57:24 UTC 2014 - fcrozat@suse.com
- Add 0001-application-add-force-desktop-action.patch: ensure
--force-desktop always works [bnc#867309, bgo#726114]
-------------------------------------------------------------------
Tue Feb 18 22:10:45 UTC 2014 - zaitor@opensuse.org

View File

@ -28,6 +28,8 @@ 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
Patch2: nautilus-enable-eject-option-on-selection-menu.patch
# PATCH-FIX-SLE nautilus-fix-desktop-icon-smash.patch bsc#979072 bgo#765601 qzhao@suse.com -- Fix icons smash at first boot.
Patch3: nautilus-fix-desktop-icon-smash.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# needed for directory ownership
@ -111,6 +113,7 @@ This package contains development files for nautilus.
%prep
%setup -q
%patch2 -p1
%patch3 -p1
translation-update-upstream
%build