[gnome-usage] build: Simplify the icon handling



commit 612377a4aa3d9a30e5d227b2cdf7f0e098641c00
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed Dec 20 13:10:54 2017 +0100

    build: Simplify the icon handling
    
    Instead of installing each icon one by one, meson allows installing
    a whole directory which simplifies it's handling.
    
    The icon files also have been moved in a similar way to their final
    destinations.

 .../icons/{16x16 => hicolor/16x16/apps}/org.gnome.Usage.png | Bin
 .../icons/{22x22 => hicolor/22x22/apps}/org.gnome.Usage.png | Bin
 .../icons/{24x24 => hicolor/24x24/apps}/org.gnome.Usage.png | Bin
 .../icons/{32x32 => hicolor/32x32/apps}/org.gnome.Usage.png | Bin
 .../icons/{48x48 => hicolor/48x48/apps}/org.gnome.Usage.png | Bin
 .../{512x512 => hicolor/512x512/apps}/org.gnome.Usage.png   | Bin
 data/meson.build                                            |  12 +++++-------
 7 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/data/icons/16x16/org.gnome.Usage.png b/data/icons/hicolor/16x16/apps/org.gnome.Usage.png
similarity index 100%
rename from data/icons/16x16/org.gnome.Usage.png
rename to data/icons/hicolor/16x16/apps/org.gnome.Usage.png
diff --git a/data/icons/22x22/org.gnome.Usage.png b/data/icons/hicolor/22x22/apps/org.gnome.Usage.png
similarity index 100%
rename from data/icons/22x22/org.gnome.Usage.png
rename to data/icons/hicolor/22x22/apps/org.gnome.Usage.png
diff --git a/data/icons/24x24/org.gnome.Usage.png b/data/icons/hicolor/24x24/apps/org.gnome.Usage.png
similarity index 100%
rename from data/icons/24x24/org.gnome.Usage.png
rename to data/icons/hicolor/24x24/apps/org.gnome.Usage.png
diff --git a/data/icons/32x32/org.gnome.Usage.png b/data/icons/hicolor/32x32/apps/org.gnome.Usage.png
similarity index 100%
rename from data/icons/32x32/org.gnome.Usage.png
rename to data/icons/hicolor/32x32/apps/org.gnome.Usage.png
diff --git a/data/icons/48x48/org.gnome.Usage.png b/data/icons/hicolor/48x48/apps/org.gnome.Usage.png
similarity index 100%
rename from data/icons/48x48/org.gnome.Usage.png
rename to data/icons/hicolor/48x48/apps/org.gnome.Usage.png
diff --git a/data/icons/512x512/org.gnome.Usage.png b/data/icons/hicolor/512x512/apps/org.gnome.Usage.png
similarity index 100%
rename from data/icons/512x512/org.gnome.Usage.png
rename to data/icons/hicolor/512x512/apps/org.gnome.Usage.png
diff --git a/data/meson.build b/data/meson.build
index 8f10ae8..a5ca9bb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,13 +17,6 @@ i18n.merge_file(
   install_dir: join_paths(get_option('datadir'), 'applications')
 )
 
-install_data('icons/16x16/org.gnome.Usage.png', install_dir: join_paths([get_option('datadir'), 
'icons/hicolor/16x16/apps']))
-install_data('icons/22x22/org.gnome.Usage.png', install_dir: join_paths([get_option('datadir'), 
'icons/hicolor/22x22/apps']))
-install_data('icons/24x24/org.gnome.Usage.png', install_dir: join_paths([get_option('datadir'), 
'icons/hicolor/24x24/apps']))
-install_data('icons/32x32/org.gnome.Usage.png', install_dir: join_paths([get_option('datadir'), 
'icons/hicolor/32x32/apps']))
-install_data('icons/48x48/org.gnome.Usage.png', install_dir: join_paths([get_option('datadir'), 
'icons/hicolor/48x48/apps']))
-install_data('icons/512x512/org.gnome.Usage.png', install_dir: join_paths([get_option('datadir'), 
'icons/hicolor/512x512/apps']))
-
 i18n.merge_file(
   'appdata-file',
   input: 'org.gnome.Usage.appdata.xml.in',
@@ -32,3 +25,8 @@ i18n.merge_file(
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
+
+install_subdir(
+  'icons/hicolor',
+  install_dir: join_paths(get_option('datadir'), 'icons')
+)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]