|
 |
b0d0d0 |
From e8b9d5ca5ebed5f2e076e6e6c975ec37efc21c5b Mon Sep 17 00:00:00 2001
|
|
|
b0d0d0 |
From: Debarshi Ray <debarshir@gnome.org>
|
|
|
b0d0d0 |
Date: Fri, 8 Jun 2018 12:42:49 +0200
|
|
|
b0d0d0 |
Subject: [PATCH] build: Unbreak the icon installation in gnome-3-28
|
|
|
b0d0d0 |
|
|
|
b0d0d0 |
The icons were getting directly copied to $data_dir/icons without
|
|
|
b0d0d0 |
retaining the directory hierarchy inside.
|
|
|
b0d0d0 |
|
|
|
b0d0d0 |
Fallout from d2410d0959094dee8cc3e1276b255e8fb991fe31
|
|
|
b0d0d0 |
|
|
|
b0d0d0 |
It was also broken in master, but was fixed by
|
|
|
b0d0d0 |
c115f5bfb56aa9fe42356c5f4f9ee87f6c87f454 and
|
|
|
b0d0d0 |
578707e9924c32a808e12c2830f18156ccb109f6
|
|
|
b0d0d0 |
|
|
|
b0d0d0 |
https://gitlab.gnome.org/GNOME/gnome-boxes/issues/217
|
|
|
b0d0d0 |
---
|
|
|
b0d0d0 |
data/meson.build | 26 +-------------------------
|
|
|
b0d0d0 |
1 file changed, 1 insertion(+), 25 deletions(-)
|
|
|
b0d0d0 |
|
|
|
b0d0d0 |
diff --git a/data/meson.build b/data/meson.build
|
|
|
b0d0d0 |
index 847734e59715..9f1c4b482356 100644
|
|
|
b0d0d0 |
--- a/data/meson.build
|
|
|
b0d0d0 |
+++ b/data/meson.build
|
|
|
b0d0d0 |
@@ -1,28 +1,4 @@
|
|
|
b0d0d0 |
-icondir = join_paths(data_dir, 'icons')
|
|
|
b0d0d0 |
-
|
|
|
b0d0d0 |
-install_data('icons/hicolor/16x16/apps/org.gnome.Boxes.png',
|
|
|
b0d0d0 |
- install_dir: icondir,
|
|
|
b0d0d0 |
-)
|
|
|
b0d0d0 |
-
|
|
|
b0d0d0 |
-install_data('icons/hicolor/24x24/apps/org.gnome.Boxes.png',
|
|
|
b0d0d0 |
- install_dir: icondir,
|
|
|
b0d0d0 |
-)
|
|
|
b0d0d0 |
-
|
|
|
b0d0d0 |
-install_data('icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg',
|
|
|
b0d0d0 |
- install_dir: icondir,
|
|
|
b0d0d0 |
-)
|
|
|
b0d0d0 |
-install_data('icons/hicolor/32x32/apps/org.gnome.Boxes.png',
|
|
|
b0d0d0 |
- install_dir: icondir,
|
|
|
b0d0d0 |
-)
|
|
|
b0d0d0 |
-
|
|
|
b0d0d0 |
-install_data('icons/hicolor/48x48/apps/org.gnome.Boxes.png',
|
|
|
b0d0d0 |
- install_dir: icondir,
|
|
|
b0d0d0 |
-)
|
|
|
b0d0d0 |
-
|
|
|
b0d0d0 |
-install_data('icons/hicolor/256x256/apps/org.gnome.Boxes.png',
|
|
|
b0d0d0 |
- install_dir: icondir,
|
|
|
b0d0d0 |
-)
|
|
|
b0d0d0 |
-
|
|
|
b0d0d0 |
+install_subdir('icons/hicolor/', install_dir: join_paths (data_dir, 'icons'))
|
|
|
b0d0d0 |
|
|
|
b0d0d0 |
resource_files = files ('gnome-boxes.gresource.xml')
|
|
|
b0d0d0 |
resources = gnome.compile_resources ('org.gnome.Boxes',
|
|
|
b0d0d0 |
--
|
|
|
b0d0d0 |
2.14.4
|
|
|
b0d0d0 |
|