[gimp] icons: clean the icon list a bit.



commit 8f136abb014d2c3d223c72137b75091753c398b1
Author: Jehan <jehan girinstud io>
Date:   Mon Jan 31 18:45:21 2022 +0100

    icons: clean the icon list a bit.
    
    - Remove some forgotten lines related to 24x24 vector icons which were
      removed a few days ago already.
    - Don't install the 64x64 icons anymore as PNG when in the vector icon
      case. Not sure why we ever did this, but it doesn't look useful.
    - This should also fix the CI which was not looking for the tool
      gtk-encode-symbolic-svg in vector icon install.

 icons/Color/Makefile.am           | 4 ----
 icons/Color/icon-list.mk          | 2 --
 icons/Color/meson.build           | 2 +-
 icons/Symbolic/Makefile.am        | 4 ----
 icons/Symbolic/icon-list.mk       | 2 --
 icons/Symbolic/meson.build        | 1 -
 icons/icon-lists/icon-list.mk.eof | 2 --
 7 files changed, 1 insertion(+), 16 deletions(-)
---
diff --git a/icons/Color/Makefile.am b/icons/Color/Makefile.am
index 191eeb7270..420de4eadf 100644
--- a/icons/Color/Makefile.am
+++ b/icons/Color/Makefile.am
@@ -8,9 +8,6 @@ icons_DATA = \
 include $(top_srcdir)/icons/Color/icon-list.mk
 
 if ENABLE_VECTOR_ICONS
-icons24_DATA = \
-       $(vector24_images)
-
 scalable_DATA = \
        $(scalable_images)
 endif
@@ -91,7 +88,6 @@ EXTRA_DIST = \
        $(icons192_images)              \
        $(icons256_images)              \
        $(scalable_images)      \
-       $(vector24_images)      \
        color-scalable.svg
 
 noinst_DATA = \
diff --git a/icons/Color/icon-list.mk b/icons/Color/icon-list.mk
index c9d0355287..2ab8120d05 100644
--- a/icons/Color/icon-list.mk
+++ b/icons/Color/icon-list.mk
@@ -981,12 +981,10 @@ icons256_images = \
        256/gimp-wilber-outline.png
 
 if ENABLE_VECTOR_ICONS
-icons24dir  = $(iconsdir)/24x24/apps
 icons64dir  = $(iconsdir)/64x64/apps
 scalabledir = $(iconsdir)/scalable/apps
 
 icons64_DATA = \
-       $(icons64_system_images)                                \
        64/gimp-frame.png                                       \
        64/gimp-texture.png
 
diff --git a/icons/Color/meson.build b/icons/Color/meson.build
index 6a0bc7659d..51db0c9168 100644
--- a/icons/Color/meson.build
+++ b/icons/Color/meson.build
@@ -13,7 +13,7 @@ if have_vector_icons
       'outdir': '64x64',
       'indir':  '64',
       'suffix': '.png',
-      'files':  [ 'bitmap_64-always', 'bitmap_64-system', ],
+      'files':  [ 'bitmap_64-always', ],
     },
   ]
 else
diff --git a/icons/Symbolic/Makefile.am b/icons/Symbolic/Makefile.am
index 9abd83cbe6..ecb8045d39 100644
--- a/icons/Symbolic/Makefile.am
+++ b/icons/Symbolic/Makefile.am
@@ -10,9 +10,6 @@ icons_DATA = \
 include $(top_srcdir)/icons/Symbolic/icon-list.mk
 
 if ENABLE_VECTOR_ICONS
-icons24_DATA = \
-       $(vector24_images)
-
 scalable_DATA = \
        $(scalable_images)
 endif
@@ -88,5 +85,4 @@ EXTRA_DIST = \
        $(icons192_images)              \
        $(icons256_images)              \
        $(scalable_images)      \
-       $(vector24_images)      \
        symbolic-scalable.svg
diff --git a/icons/Symbolic/icon-list.mk b/icons/Symbolic/icon-list.mk
index 7cde4103e2..6bb45ef941 100644
--- a/icons/Symbolic/icon-list.mk
+++ b/icons/Symbolic/icon-list.mk
@@ -981,12 +981,10 @@ icons256_images = \
        256/gimp-wilber-outline-symbolic.symbolic.png
 
 if ENABLE_VECTOR_ICONS
-icons24dir  = $(iconsdir)/24x24/apps
 icons64dir  = $(iconsdir)/64x64/apps
 scalabledir = $(iconsdir)/scalable/apps
 
 icons64_DATA = \
-       $(icons64_system_images)                                \
        64/gimp-frame.png                                       \
        64/gimp-texture.png
 
diff --git a/icons/Symbolic/meson.build b/icons/Symbolic/meson.build
index 518d719a89..60359d0911 100644
--- a/icons/Symbolic/meson.build
+++ b/icons/Symbolic/meson.build
@@ -14,7 +14,6 @@ if have_vector_icons
       'indir':  '64',
       'suffix': '.png',
       'files':  [ 'bitmap_64-always', ],
-      #'files':  [ 'bitmap_64-always', 'bitmap_64-system', ],
     },
   ]
 else
diff --git a/icons/icon-lists/icon-list.mk.eof b/icons/icon-lists/icon-list.mk.eof
index 2c04561c84..51856ff487 100644
--- a/icons/icon-lists/icon-list.mk.eof
+++ b/icons/icon-lists/icon-list.mk.eof
@@ -1,10 +1,8 @@
 if ENABLE_VECTOR_ICONS
-icons24dir  = $(iconsdir)/24x24/apps
 icons64dir  = $(iconsdir)/64x64/apps
 scalabledir = $(iconsdir)/scalable/apps
 
 icons64_DATA = \
-       $(icons64_system_images)                                \
        64/gimp-frame.png                                       \
        64/gimp-texture.png
 


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