[gimp] icons: (meson) gimp-frame and gimp-texture were not installed.



commit d6fa772f22520cd54d02dbbbcc177c79b14297f9
Author: Jehan <jehan girinstud io>
Date:   Sat Oct 12 12:23:44 2019 +0200

    icons: (meson) gimp-frame and gimp-texture were not installed.
    
    This is a quick and dirty fix to just deal with this specific issue, but
    looking at meson rules for icons, it looks like I will need to do a
    proper and very detailed review of this part of the build system.

 icons/Color/meson.build    | 4 ++--
 icons/Symbolic/meson.build | 3 ++-
 icons/meson.build          | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/icons/Color/meson.build b/icons/Color/meson.build
index bd96ec5f15..36cac04d24 100644
--- a/icons/Color/meson.build
+++ b/icons/Color/meson.build
@@ -3,7 +3,7 @@ if have_vector_icons
   all_icons = [
     [ 'scalable', color_vector_scalable ],
     [ '24x24',    color_vector_24 ],
-    [ '64x64',    bitmap_64system ],
+    [ '64x64',    bitmap_64_always + bitmap_64system ],
   ]
 else
   all_icons = [
@@ -15,7 +15,7 @@ else
     [ '24x24',    bitmap_24 ],
     [ '32x32',    bitmap_32 ],
     [ '48x48',    bitmap_48 ],
-    [ '64x64',    bitmap_64 + bitmap_64system ],
+    [ '64x64',    bitmap_64 + bitmap_64_always + bitmap_64system ],
     [ '96x96',    bitmap_96 ],
     [ '128x128',  bitmap_128 ],
     [ '192x192',  bitmap_192 ],
diff --git a/icons/Symbolic/meson.build b/icons/Symbolic/meson.build
index 697756ec8a..c6df06fafe 100644
--- a/icons/Symbolic/meson.build
+++ b/icons/Symbolic/meson.build
@@ -4,6 +4,7 @@ if have_vector_icons
     [ 'scalable', symbolic_vector_scalable ],
     [ '24x24',    symbolic_vector_24 ],
     # [ '64x64',    bitmap_64system ],
+    [ '64x64',    bitmap_64_always ],
   ]
 else
   all_icons = [
@@ -15,7 +16,7 @@ else
     [ '24x24',    bitmap_24 ],
     [ '32x32',    bitmap_32 ],
     [ '48x48',    bitmap_48 ],
-    [ '64x64',    bitmap_64 + bitmap_64system ],
+    [ '64x64',    bitmap_64 + bitmap_64_always + bitmap_64system ],
     [ '96x96',    bitmap_96 ],
     [ '128x128',  bitmap_128 ],
     [ '192x192',  bitmap_192 ],
diff --git a/icons/meson.build b/icons/meson.build
index 5e93e94f43..176cfab32f 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -1564,8 +1564,11 @@ bitmap_48 = [
   '48/gimp-text-layer.png',
   '48/gimp-wilber.png',
 ]
+bitmap_64_always = [
+  '64/gimp-frame.png',
+  '64/gimp-texture.png',
+]
 bitmap_64 = [
-  '64/dialog-information.png',
   '64/gimp-user-manual.png',
   '64/gimp-wilber-eek.png',
   '64/gimp-wilber-outline.png',


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