[neon/snap-packaging/kf6-core/work.core24] /: Revert "disable gtk icon cache for now. gtk dependencies are piling up."

[Scarlett Moore]

Git commit 8ad197ded9cf5c58cb8ee0400b95f3b9b3d70224 by Scarlett Moore.
Committed on 14/05/2025 at 01:21.
Pushed by scarlettmoore into branch 'work.core24'.

Revert "disable gtk icon cache for now. gtk dependencies are piling up."

This reverts commit 78ebcdf39a6a381070db6a125647e1d0e62fcc7c.

M  +26   -25   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core/-/commit/8ad197ded9cf5c58cb8ee0400b95f3b9b3d70224

diff --git a/snapcraft.yaml b/snapcraft.yaml
index ceb578d..5c65deb 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -658,7 +658,6 @@ parts:
       - applications-menu
     plugin: nil
     build-packages:
-      - gtk-update-icon-cache
       - shared-mime-info
     stage-packages:
       - shared-mime-info
@@ -697,6 +696,8 @@ parts:
       - python3-pip
       - zip
       - python3-apt
+    stage-packages:
+      - libgdk-pixbuf-2.0-0
     stage:
       - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxml2.so.2.9.14
     build-environment: *buildenvironment
@@ -704,30 +705,30 @@ parts:
       craftctl default
       set -eux
 
-      # cd /snap/gtk-common-themes/current
-      # find . -type f,l ! -name index.theme -exec rm -f $CRAFT_PRIME/usr/{} \;
-      # cd $CRAFT_PRIME
-      # for dir in usr/share/icons/*; do
-      #   if [ -f "$dir/index.theme" ]; then
-      #     $CRAFT_STAGE/usr/bin/gtk-update-icon-cache --force "$dir"
-      #   fi
-      # done
-      # cd /snap/gtk-theme-breeze/current
-      # find . -type f,l ! -name index.theme -exec rm -f $CRAFT_PRIME/usr/{} \;
-      # cd $CRAFT_PRIME
-      # for dir in usr/share/icons/*; do
-      #   if [ -f "$dir/index.theme" ]; then
-      #     $CRAFT_STAGE/usr/bin/gtk-update-icon-cache --force "$dir"
-      #   fi
-      # done
-      # cd /snap/icon-theme-breeze/current
-      # find . -type f,l ! -name index.theme -exec rm -f $CRAFT_PRIME/usr/{} \;
-      # cd $CRAFT_PRIME
-      # for dir in usr/share/icons/*; do
-      #   if [ -f "$dir/index.theme" ]; then
-      #     $CRAFT_STAGE/usr/bin/gtk-update-icon-cache --force "$dir"
-      #   fi
-      # done
+      cd /snap/gtk-common-themes/current
+      find . -type f,l ! -name index.theme -exec rm -f $CRAFT_PRIME/usr/{} \;
+      cd $CRAFT_PRIME
+      for dir in usr/share/icons/*; do
+        if [ -f "$dir/index.theme" ]; then
+          $CRAFT_STAGE/usr/bin/gtk-update-icon-cache --force "$dir"
+        fi
+      done
+      cd /snap/gtk-theme-breeze/current
+      find . -type f,l ! -name index.theme -exec rm -f $CRAFT_PRIME/usr/{} \;
+      cd $CRAFT_PRIME
+      for dir in usr/share/icons/*; do
+        if [ -f "$dir/index.theme" ]; then
+          $CRAFT_STAGE/usr/bin/gtk-update-icon-cache --force "$dir"
+        fi
+      done
+      cd /snap/icon-theme-breeze/current
+      find . -type f,l ! -name index.theme -exec rm -f $CRAFT_PRIME/usr/{} \;
+      cd $CRAFT_PRIME
+      for dir in usr/share/icons/*; do
+        if [ -f "$dir/index.theme" ]; then
+          $CRAFT_STAGE/usr/bin/gtk-update-icon-cache --force "$dir"
+        fi
+      done
       $CRAFT_STAGE/usr/bin/kbuildsycoca6 --noincremental
       rm -rf usr/share/doc
       rm -rf usr/share/man