[neon/snap-packaging/qt-common-themes] /: More fixes.

[Scarlett Moore]

Git commit d9aed75a1e9419955282bf257ab54e424f751183 by Scarlett Moore.
Committed on 03/07/2024 at 08:56.
Pushed by scarlettmoore into branch 'master'.

More fixes.

M  +12   -14   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/qt-common-themes/-/commit/d9aed75a1e9419955282bf257ab54e424f751183

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 58012a3..cd79635 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -90,6 +90,9 @@ parts:
     - qt-common-themes-sdk
     stage:
       - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+    override-build: |
+      cp -rfv /snap/qt-common-themes-sdk/current/usr $CRAFT_PART_INSTALL
+      craftctl default
 
   breeze:
     after: [utils]
@@ -117,7 +120,7 @@ parts:
       - usr/share/plasma/desktoptheme/oxygen
       - usr/share/plasma/look-and-feel/org.kde.oxygen
     override-build: |
-      cp -rfv /snap/qt-common-themes-sdk/current/usr/share/plasma/desktoptheme/oxygen $CRAFT_PART_INSTALL
+      cp -rfv /snap/qt-common-themes-sdk/current/usr $CRAFT_PART_INSTALL
       craftctl default
 
   oxygen-icons:
@@ -128,7 +131,7 @@ parts:
     stage:
       - usr/share/icons/oxygen
     override-build: |
-      cp -rfv /snap/kf6-core22/current/usr/share/icons/oxygen $CRAFT_PART_INSTALL
+      cp -rfv /snap/kf6-core22/current/usr $CRAFT_PART_INSTALL
       craftctl default
       $CRAFT_STAGE/update-icon-cache.sh $CRAFT_PART_INSTALL/share/icons
 
@@ -142,8 +145,9 @@ parts:
       - usr/share/icons/breeze
       - usr/share/icons/breeze-dark
     override-build: |
-      cp -rfv /snap/kf6-core22/current/usr/share/icons/breeze $CRAFT_PART_INSTALL
-      cp -rfv /snap/kf6-core22/current/usr/share/icons/breeze-dark $CRAFT_PART_INSTALL
+      mkdir -p $CRAFT_PART_INSTALL/usr/share/icons/
+      cp -rfv /snap/kf6-core22/current/usr/share/icons/breeze $CRAFT_PART_INSTALL/usr/share/icons/
+      cp -rfv /snap/kf6-core22/current/usr/share/icons/breeze-dark $CRAFT_PART_INSTALL/usr/share/icons/
       craftctl default
       $CRAFT_STAGE/update-icon-cache.sh $CRAFT_PART_INSTALL/share/icons
 
@@ -161,8 +165,7 @@ parts:
       'cursors/Breeze/Breeze_Light/cursors' : 'share/icons/Breeze_Light/cursors'
       'cursors/Breeze/Breeze_Light/index.theme' : 'share/icons/Breeze_Light/index.theme'
     override-build: |
-      cp -rfv /snap/qt-common-themes-sdk/current/usr/share/icons/Breeze_Light $CRAFT_PART_INSTALL
-      cp -rfv /snap/qt-common-themes-sdk/current/usr/share/icons/breeze_cursors $CRAFT_PART_INSTALL
+      cp -rfv /snap/qt-common-themes-sdk/current/usr $CRAFT_PART_INSTALL
       craftctl default
       $CRAFT_STAGE/update-icon-cache.sh $CRAFT_PART_INSTALL/share/icons
 
@@ -189,7 +192,7 @@ parts:
       'cursors/Oxygen/Oxygen_Zion/cursors' : 'share/icons/Oxygen_Zion/cursors'
       'cursors/Oxygen/Oxygen_Zion/index.theme' : 'share/icons/Oxygen_Zion/index.theme'
     override-build: |
-      cp -rfv /snap/kf6-core22/current/usr/share/icons $CRAFT_PART_INSTALL
+      cp -rfv /snap/kf6-core22/current/usr $CRAFT_PART_INSTALL
       craftctl default
       $CRAFT_STAGE/update-icon-cache.sh $CRAFT_PART_INSTALL/share/icons
 
@@ -214,13 +217,8 @@ parts:
     build-snaps:
     - qt-common-themes-sdk
     stage:
-    - share/themes/Breeze/assets
-    - share/themes/Breeze/gtk-2.0/
-    - share/themes/Breeze/gtk-3.0/
-    - share/themes/Breeze/settings.ini
-    - share/themes/Breeze-Dark/assets/
-    - share/themes/Breeze-Dark/gtk-2.0/
-    - share/themes/Breeze-Dark/gtk-3.0/
+    - share/themes/Breeze
+    - share/themes/Breeze-Dark
     override-build: |
       cp -rfv /snap/qt-common-themes-sdk/current/share $CRAFT_PART_INSTALL
       craftctl default