Accepting request 636049 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/636049
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=298
This commit is contained in:
Dominique Leuenberger 2018-09-24 07:22:24 +00:00 committed by Git OBS Bridge
parent 8c7bbe3a26
commit fd8fb4335d
5 changed files with 70 additions and 72 deletions

View File

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

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

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

View File

@ -1,64 +0,0 @@
From 24b737f2813a2c7d0f9d7d888473e6cbaa6b1f95 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ernestask@gnome.org>
Date: Sat, 14 Apr 2018 12:30:36 +0300
Subject: [PATCH] build: Fix icon renaming
Currently, when looping over icon sizes, each icon is copied to
$MESON_BUILD_ROOT/@appid@.png, meaning that the file is overwritten on
every iteration. This commit fixes that by copying to a subdirectory
under the build root and installing from there.
Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/364
(cherry picked from commit 5633b13f92ad736f5e8f6311253d31e68d40d057)
---
data/meson.build | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index ab9b853a9..ff83bdb12 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,16 +7,28 @@
#
# https://gitlab.gnome.org/GNOME/nautilus/merge_requests/144
##########
+
+cp = find_program('cp')
+mkdir = find_program('mkdir')
+
foreach icon_size: ['16x16', '22x22', '24x24', '32x32', '48x48', '512x512']
- configure_file(
- command: [
- 'cp', '@INPUT@', '@OUTPUT@'
- ],
- input: files(
- join_paths('icons', 'hicolor', icon_size, 'apps', 'org.gnome.Nautilus.png')
- ),
- install_dir: join_paths(datadir, 'icons', 'hicolor', icon_size, 'apps'),
- output: '@0@.png'.format(application_id)
+ icon_path = join_paths('icons', 'hicolor', icon_size, 'apps')
+ output_icon_path = join_paths(meson.build_root(), 'data', icon_path)
+
+ run_command(
+ mkdir, [
+ '-p', output_icon_path
+ ]
+ )
+ run_command(
+ cp,
+ join_paths(icon_path, 'org.gnome.Nautilus.png'),
+ join_paths(output_icon_path, '@0@.png'.format(application_id))
+ )
+
+ install_subdir(
+ join_paths(meson.build_root(), 'data', 'icons'),
+ install_dir: datadir
)
endforeach
--
2.17.1

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Sep 16 14:33:02 UTC 2018 - badshah400@gmail.com
- Update to version 3.30.0:
+ No new changes.
- Changes from version 3.29.92:
+ Revert showing search filter popover on ctrl-f.
+ Add more tests.
+ Replace ambiguous slash with trash icon in path bar.
+ Fix path bar buttons not working with keyboard.
+ Fix crash when opening broken bookmarks from other locations.
+ Add warning about exceeded file name limit when renaming, etc.
+ Add plumbing for desktop extension (clipboard, undo/redo,
etc.)
+ Tweak path bar styling.
-------------------------------------------------------------------
Mon Aug 27 07:41:30 UTC 2018 - xwang@suse.com
@ -5,6 +21,53 @@ Mon Aug 27 07:41:30 UTC 2018 - xwang@suse.com
function, the script can set files in $HOME/Desktop as trusted
automatically when user login (bsc#1103523).
-------------------------------------------------------------------
Thu Jul 26 21:01:15 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.90.1:
+ Flatpak improvements. Improved user facing experience and
developer experience.
+ CI & CD set up. Increases stability, buildability and feedback
cycle.
+ Distribute icons horizontally in the icon view.
+ Implement new pathbar/search design.
+ Implement new toolbar menus design.
+ Add background actions to the path bar.
+ Get background work ready for gtk4 port.
+ Add recent search engine.
+ Implement tests for Nautilus most critical operations.
+ Show Recency column in recent view.
+ Avoid recursivity in symbolic links.
+ Add a button in properties dialog to open GNOME Disks.
+ Add touch support for menus in views.
+ Fix error when accesing a file with x-nautilus-search.
+ Allow right clickin expanders.
+ Allow trashing/deleting Desktop dir.
+ Improve about dialog visuals.
+ Fix path bar changing size when navigating.
+ Fix MB/MiB confusion in preferences dialog.
+ Fix openning files failing from other applications in some
cases due to DBus race.
+ Implement devel style to differentiate development builds.
+ Improve handling for impaired.
+ Fix wrong labels and file count in operations progress.
+ Remove special treatment for desktop files.
+ Remove special treatment for computer:///.
+ Fix triggering maximum file name when renaming.
+ Open search filters with popover open when using <ctrl>f.
+ Expose active windows for Ubuntu dash support.
+ Show "Open With" for files in trash.
+ Provide more information in prperties dialog for files in
trash.
+ Implement showing properties of current view from path bar.
+ Avoid fuzzy icons in small sizes.
+ Warn if the renamed file will be hidden once renamed.
+ Improve and fix visuals in the new views.
+ Add show sidebar setting to the preferences dialog.
+ Remove experimental views UI setting in preferences dialog.
- Drop nautilus-icons.patch: Fixed upstream.
- Add pkgconfig(libseccomp) BuildRequires: New dependency.
-------------------------------------------------------------------
Tue Jul 17 10:21:46 UTC 2018 - fstrba@suse.com

View File

@ -17,20 +17,19 @@
Name: nautilus
Version: 3.28.1
Version: 3.30.0
Release: 0
Summary: File Manager for the GNOME Desktop
License: GPL-3.0-or-later AND LGPL-2.1-or-later
Group: Productivity/File utilities
URL: https://wiki.gnome.org/Apps/Nautilus
Source: http://download.gnome.org/sources/nautilus/3.28/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/nautilus/3.30/%{name}-%{version}.tar.xz
# fate#308344 bgo#602147
Source1: mount-archive.desktop
Source2: set_trusted.desktop
Source3: set_trusted.sh
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM nautilus-icons.patch fstrba@suse.com glgo#GNOME/nautilus#144 -- build: Fix icon renaming
Patch0: nautilus-icons.patch
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: fdupes
@ -53,6 +52,7 @@ BuildRequires: pkgconfig(gnome-autoar-0) >= 0.2.1
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.0.0
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.8.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.6
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
BuildRequires: pkgconfig(pango) >= 1.28.3
@ -111,7 +111,6 @@ This package contains development files for nautilus.
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build