fix for comment https://gitlab.com/inkscape/inkscape/commit/a12d0aecffa31fa7b82f8416503b41200fbb15b7#note_97146816

17 files changed, 23 insertions, 20 deletions

diff --git a/share/icons/Tango/16x16/apps/inkscape.png b/share/icons/Tango/16x16/apps/inkscape.png
deleted file mode 100644
index e4aed9222..000000000
--- a/share/icons/Tango/16x16/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/Tango/22x22/apps/inkscape.png b/share/icons/Tango/22x22/apps/inkscape.png
deleted file mode 100644
index b1adda08c..000000000
--- a/share/icons/Tango/22x22/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/Tango/24x24/apps/inkscape.png b/share/icons/Tango/24x24/apps/inkscape.png
deleted file mode 100644
index 4c2cded2c..000000000
--- a/share/icons/Tango/24x24/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/Tango/256x256/apps/inkscape.png b/share/icons/Tango/256x256/apps/inkscape.png
deleted file mode 100644
index 76e07fb3d..000000000
--- a/share/icons/Tango/256x256/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/Tango/32x32/apps/inkscape.png b/share/icons/Tango/32x32/apps/inkscape.png
deleted file mode 100644
index aa445e4bc..000000000
--- a/share/icons/Tango/32x32/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/Tango/48x48/apps/inkscape.png b/share/icons/Tango/48x48/apps/inkscape.png
deleted file mode 100644
index 668acfdef..000000000
--- a/share/icons/Tango/48x48/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/Tango/CMakeLists.txt b/share/icons/Tango/CMakeLists.txt
index 9c14451a9..5c1796efe 100644
--- a/share/icons/Tango/CMakeLists.txt
+++ b/share/icons/Tango/CMakeLists.txt
@@ -11,16 +11,6 @@ foreach(pixmap_size ${PIXMAP_SIZES})
   endforeach(content)
 endforeach(pixmap_size)
 
-set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable")
-set(CONTENT "apps")
-
-foreach(pixmap_size ${PIXMAP_SIZES})
-  foreach(content ${CONTENT})
-    FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.svg)
-    install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content})
-  endforeach(content)
-endforeach(pixmap_size)
-
 if(WIN32)
     install(CODE "execute_process(COMMAND gtk-update-icon-cache \${CMAKE_INSTALL_PREFIX}/${INKSCAPE_SHARE_INSTALL}/icons/${THEME})")
 endif()
diff --git a/share/icons/application/CMakeLists.txt b/share/icons/application/CMakeLists.txt
index c9913b2bc..3a01264b4 100644
--- a/share/icons/application/CMakeLists.txt
+++ b/share/icons/application/CMakeLists.txt
@@ -4,3 +4,26 @@ foreach(pixmap_size ${PIXMAP_SIZES})
   FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.svg)
   install(FILES ${PIXMAP_FILES} DESTINATION ${SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/apps)
 endforeach(pixmap_size)
+
+set(PIXMAP_SIZES "scalable" "symbolic")
+set(THEME hicolor)
+set(CONTENT "apps")
+
+foreach(pixmap_size ${PIXMAP_SIZES})
+  foreach(content ${CONTENT})
+    FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.svg)
+    install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content})
+  endforeach(content)
+endforeach(pixmap_size)
+
+
+set(PIXMAP_SIZES "scalable")
+set(THEME Tango)
+set(CONTENT "apps")
+
+foreach(pixmap_size ${PIXMAP_SIZES})
+  foreach(content ${CONTENT})
+    FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.svg)
+    install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content})
+  endforeach(content)
+endforeach(pixmap_size)
diff --git a/share/icons/hicolor/scalable/apps/inkscape.svg b/share/icons/application/scalable/apps/inkscape.svg
index bdf6ec72f..bdf6ec72f 100644
--- a/share/icons/hicolor/scalable/apps/inkscape.svg
+++ b/share/icons/application/scalable/apps/inkscape.svg
diff --git a/share/icons/hicolor/symbolic/apps/inkscape-symbolic.svg b/share/icons/application/symbolic/apps/inkscape-symbolic.svg
index 9832949dd..9832949dd 100644
--- a/share/icons/hicolor/symbolic/apps/inkscape-symbolic.svg
+++ b/share/icons/application/symbolic/apps/inkscape-symbolic.svg
diff --git a/share/icons/hicolor/16x16/apps/inkscape.png b/share/icons/hicolor/16x16/apps/inkscape.png
deleted file mode 100644
index e4aed9222..000000000
--- a/share/icons/hicolor/16x16/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/hicolor/22x22/apps/inkscape.png b/share/icons/hicolor/22x22/apps/inkscape.png
deleted file mode 100644
index b1adda08c..000000000
--- a/share/icons/hicolor/22x22/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/hicolor/24x24/apps/inkscape.png b/share/icons/hicolor/24x24/apps/inkscape.png
deleted file mode 100644
index 4c2cded2c..000000000
--- a/share/icons/hicolor/24x24/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/hicolor/256x256/apps/inkscape.png b/share/icons/hicolor/256x256/apps/inkscape.png
deleted file mode 100644
index 76e07fb3d..000000000
--- a/share/icons/hicolor/256x256/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/hicolor/32x32/apps/inkscape.png b/share/icons/hicolor/32x32/apps/inkscape.png
deleted file mode 100644
index aa445e4bc..000000000
--- a/share/icons/hicolor/32x32/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/hicolor/48x48/apps/inkscape.png b/share/icons/hicolor/48x48/apps/inkscape.png
deleted file mode 100644
index 668acfdef..000000000
--- a/share/icons/hicolor/48x48/apps/inkscape.png
+++ /dev/null
diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt
index d557fac6a..7f3d00f3e 100644
--- a/share/icons/hicolor/CMakeLists.txt
+++ b/share/icons/hicolor/CMakeLists.txt
@@ -11,16 +11,6 @@ foreach(pixmap_size ${PIXMAP_SIZES})
   endforeach(content)
 endforeach(pixmap_size)
 
-set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable" "symbolic")
-set(CONTENT "apps")
-
-foreach(pixmap_size ${PIXMAP_SIZES})
-  foreach(content ${CONTENT})
-    FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.svg)
-    install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content})
-  endforeach(content)
-endforeach(pixmap_size)
-
 if(WIN32)
     install(CODE "execute_process(COMMAND gtk-update-icon-cache \${CMAKE_INSTALL_PREFIX}/${INKSCAPE_SHARE_INSTALL}/icons/${THEME})")
 endif()