dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jehan 2019-10-12 12:23:44 +02:00
parent 9dcdf37ab3
commit d6fa772f22
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icons/Color/meson.build
View File

@ -3,7 +3,7 @@ if have_vector_icons
all_icons = [ all_icons = [
[ 'scalable', color_vector_scalable ], [ 'scalable', color_vector_scalable ],
[ '24x24', color_vector_24 ], [ '24x24', color_vector_24 ],
[ '64x64', bitmap_64system ], [ '64x64', bitmap_64_always + bitmap_64system ],
] ]
else else
all_icons = [ all_icons = [
@ -15,7 +15,7 @@ else
[ '24x24', bitmap_24 ], [ '24x24', bitmap_24 ],
[ '32x32', bitmap_32 ], [ '32x32', bitmap_32 ],
[ '48x48', bitmap_48 ], [ '48x48', bitmap_48 ],
[ '64x64', bitmap_64 + bitmap_64system ], [ '64x64', bitmap_64 + bitmap_64_always + bitmap_64system ],
[ '96x96', bitmap_96 ], [ '96x96', bitmap_96 ],
[ '128x128', bitmap_128 ], [ '128x128', bitmap_128 ],
[ '192x192', bitmap_192 ], [ '192x192', bitmap_192 ],

3
icons/Symbolic/meson.build
View File

@ -4,6 +4,7 @@ if have_vector_icons
[ 'scalable', symbolic_vector_scalable ], [ 'scalable', symbolic_vector_scalable ],
[ '24x24', symbolic_vector_24 ], [ '24x24', symbolic_vector_24 ],
# [ '64x64', bitmap_64system ], # [ '64x64', bitmap_64system ],
[ '64x64', bitmap_64_always ],
] ]
else else
all_icons = [ all_icons = [
@ -15,7 +16,7 @@ else
[ '24x24', bitmap_24 ], [ '24x24', bitmap_24 ],
[ '32x32', bitmap_32 ], [ '32x32', bitmap_32 ],
[ '48x48', bitmap_48 ], [ '48x48', bitmap_48 ],
[ '64x64', bitmap_64 + bitmap_64system ], [ '64x64', bitmap_64 + bitmap_64_always + bitmap_64system ],
[ '96x96', bitmap_96 ], [ '96x96', bitmap_96 ],
[ '128x128', bitmap_128 ], [ '128x128', bitmap_128 ],
[ '192x192', bitmap_192 ], [ '192x192', bitmap_192 ],

5
icons/meson.build
View File

@ -1564,8 +1564,11 @@ bitmap_48 = [
'48/gimp-text-layer.png', '48/gimp-text-layer.png',
'48/gimp-wilber.png', '48/gimp-wilber.png',
] ]
bitmap_64_always = [
'64/gimp-frame.png',
'64/gimp-texture.png',
]
bitmap_64 = [ bitmap_64 = [
'64/dialog-information.png',
'64/gimp-user-manual.png', '64/gimp-user-manual.png',
'64/gimp-wilber-eek.png', '64/gimp-wilber-eek.png',
'64/gimp-wilber-outline.png', '64/gimp-wilber-outline.png',