diff --git a/nautilus-icons.patch b/nautilus-icons.patch index e2479c4..741763e 100644 --- a/nautilus-icons.patch +++ b/nautilus-icons.patch @@ -1,5 +1,25 @@ ---- 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 +From 24b737f2813a2c7d0f9d7d888473e6cbaa6b1f95 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +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 @@ -38,15 +58,7 @@ ) 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') +-- +2.17.1 + +