diff --git a/nautilus-icons.patch b/nautilus-icons.patch new file mode 100644 index 0000000..e2479c4 --- /dev/null +++ b/nautilus-icons.patch @@ -0,0 +1,52 @@ +--- nautilus-3.28.1/data/meson.build 2018-04-09 22:02:06.000000000 +0200 ++++ nautilus-3.28.1/data/meson.build 2018-07-17 12:15:08.186902804 +0200 +@@ -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 + +@@ -118,6 +130,11 @@ + output: '@0@.search-provider.ini'.format(application_id) + ) + ++gnome.compile_schemas( ++ build_by_default: true, ++ depend_files: 'org.gnome.nautilus.gschema.xml' ++) ++ + install_data( + 'org.gnome.nautilus.gschema.xml', + install_dir: join_paths(datadir, 'glib-2.0', 'schemas') diff --git a/nautilus.changes b/nautilus.changes index fcda7fd..9b8e7f3 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 17 10:21:46 UTC 2018 - fstrba@suse.com + +- Added patch: nautilus-icons.patch + + Upstream fix for distribution of 512x512 icons instead of the + 16x16, 22x22, 24x24, 32x32 and 48x48 ones + ------------------------------------------------------------------- Mon Apr 9 22:12:09 UTC 2018 - bjorn.lie@gmail.com diff --git a/nautilus.spec b/nautilus.spec index c22199d..0d7cfa9 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -27,6 +27,7 @@ Source: http://download.gnome.org/sources/nautilus/3.28/%{name}-%{versio # fate#308344 bgo#602147 Source1: mount-archive.desktop Source99: baselibs.conf +Patch0: nautilus-icons.patch # needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -107,6 +108,7 @@ This package contains development files for nautilus. %prep %setup -q +%patch0 -p1 translation-update-upstream %build