[neon/snap-packaging/qt-common-themes] /: Match the slot names.

Scarlett Moore null at kde.org
Fri Jul 5 10:44:05 BST 2024


Git commit 14a5c606e97f86199ae2bffc8f83677d717676a2 by Scarlett Moore.
Committed on 05/07/2024 at 09:43.
Pushed by scarlettmoore into branch 'master'.

Match the slot names.

M  +17   -19   snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3e20629..ef99ba0 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -10,13 +10,13 @@ confinement: strict
 version: 1.0
 
 slots:
-  gtk-2-themes:
+  kde-gtk2-themes:
     interface: content
     source:
       read:
         - $SNAP/share/gtk2/Breeze
         - $SNAP/share/gtk2/Breeze-Dark
-  gtk-3-themes:
+  kde-gtk3-themes:
     interface: content
     source:
       read:
@@ -36,7 +36,7 @@ slots:
         - $SNAP/usr/share/color-schemes
         - $SNAP/usr/share/kstyle
         - $SNAP/usr/share/Kvantum
-  icon-themes:
+  qt-icon-themes:
     interface: content
     source:
       read:
@@ -51,7 +51,7 @@ slots:
         - $SNAP/usr/share/icons/oxygen
         - $SNAP/usr/share/icons/breeze
         - $SNAP/usr/share/icons/breeze-dark
-  sound-themes:
+  qt-sound-themes:
     interface: content
     source:
       read:
@@ -72,25 +72,20 @@ environment:
 
 
 parts:
-  # version-script:
-  #   plugin: nil
-  #   source: .
-  #   build-packages:
-  #     - git
-  #   override-build: |
-  #     craftctl set-version $(git -C $CRAFT_PROJECT_DIR describe --tags 2>/dev/null || echo 0.1)
-  # Breeze: KDE's default theme
   base:
     after: [utils]
     plugin: nil
-    build-snaps:
-    - qt-common-themes-sdk
+    stage-snaps:
+    - qt-commom-themes-sdk/latest/stable
     stage:
-      - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-    override-build: |
-      cp -rfv /snap/qt-common-themes-sdk/current/usr $CRAFT_PART_INSTALL
-      craftctl default
-
+    - -usr/lib/*/libdrm*
+    - -usr/share/doc/libdrm*
+    override-prime: |
+        set -eux
+        craftctl default
+        cd $CRAFT_PRIME
+        find . -type f,l -name "*.h" -exec bash -c "rm -f {}*" \;
+  # Breeze: KDE's default theme
   breeze:
     after: [utils]
     plugin: nil
@@ -229,9 +224,12 @@ parts:
     plugin: nil
     build-snaps:
     - qt-common-themes-sdk
+    stage-packages:
+    - libgtk2.0-0
     stage:
     - share/themes/oxygen-gtk
     - lib/gtk-2.0/2.10.0/engines/liboxygen-gtk.so
+    - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
     override-build: |
       cp -rfv /snap/qt-common-themes-sdk/current/* $CRAFT_PART_INSTALL
       craftctl default


More information about the Neon-commits mailing list