[neon/snap-packaging/qt-common-themes] /: Add kvantum and qt6gtk2

[Scarlett Moore]

Git commit ad7dc170a0e128f7fb970ff987aa47a79e954761 by Scarlett Moore.
Committed on 28/06/2024 at 12:11.
Pushed by scarlettmoore into branch 'master'.

Add kvantum and qt6gtk2

M  +43   -15   snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index cbc935c..02d1a15 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,16 +14,23 @@ grade: stable
 confinement: strict
 
 slots:
-  qt-6-themes:
+  gtk-2-themes:
     interface: content
     source:
       read:
-        - $SNAP/usr/share/themes/Breeze
-        - $SNAP/usr/share/themes/Breeze-Dark
         - $SNAP/usr/share/gtk2/Breeze
         - $SNAP/usr/share/gtk2/Breeze-Dark
-        - $SNAP/usr/share/kstyle/themes
-  qt-icon-themes:
+  gtk-3-themes:
+    interface: content
+    source:
+      read:
+        - $SNAP/usr/share/themes/Breeze
+        - $SNAP/usr/share/themes/Breeze-Dark
+  qt-6-themes:
+    interface: content
+      read:
+        - "."
+  icon-themes:
     interface: content
     source:
       read:
@@ -38,12 +45,23 @@ slots:
         - $SNAP/usr/share/icons/oxygen
         - $SNAP/usr/share/icons/breeze
         - $SNAP/usr/share/icons/breeze-dark
-  qt-sound-themes:
+  sound-themes:
     interface: content
     source:
       read:
         - $SNAP/share/sounds/oxygen
         - $SNAP/share/sounds/ocean
+  kf6-core22:
+    content: kf6-core22-all
+    interface: content
+    default-provider: kf6-core22
+    target: $SNAP/kf6
+
+environment:
+    LD_LIBRARY_PATH: /snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core22-sdk/current/usr/lib:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/usr/lib:/lib
+    QT_PLUGIN_PATH: /snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
+    SNAP_DESKTOP_RUNTIME: $SNAP/kf6
+
 
 parts:
   version-script:
@@ -134,6 +152,25 @@ parts:
       craftctl default
       $CRAFT_STAGE/update-icon-cache.sh $CRAFT_PART_INSTALL/share/icons
 
+  kvantum:
+    after: [utils]
+    plugin: nil
+    build-snaps:
+    - qt-common-themes-sdk
+    stage:
+    - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
+    - usr/share/color-schemes
+    - usr/share/icons
+    - usr/share/Kvantum
+
+  qt6gtk2:
+    after: [utils]
+    plugin: nil
+    build-snaps:
+    - qt-common-themes-sdk
+    stage:
+    - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt6/plugins
+
   #KDE GTK themes
   breeze-gtk:
     after: [utils]
@@ -168,15 +205,6 @@ parts:
       # Make assets available to both GTK 3 and GTK 2 themes after split
       cp -a $CRAFT_STAGE/usr/share/themes/oxygen-gtk/assets $CRAFT_STAGE/usr/share/gtk2/oxygen-gtk/
 
-  qt6gtk2:
-    after: [utils]
-    source: https://github.com/trialuser02/qt6gtk2.git
-    plugin: qmake
-    qmake_project_file: qt6gtk2.pro
-    qmake_major_version: 6
-    build-snaps:
-    - kde-qt6-core22-sdk
-
   utils:
     plugin: dump
     source: utils