[neon/kde/kblocks/Neon/release] /: update snap for new framework snap

[Jonathan Riddell]

Git commit 4c6e05ba765040801cc6df9974a6a3cb6f0966ab by Jonathan Riddell.
Committed on 21/07/2021 at 15:14.
Pushed by jriddell into branch 'Neon/release'.

update snap for new framework snap

M  +42   -89   snapcraft.yaml

https://invent.kde.org/neon/kde/kblocks/commit/4c6e05ba765040801cc6df9974a6a3cb6f0966ab

diff --git a/snapcraft.yaml b/snapcraft.yaml
index dbb59d1..351075a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -5,96 +5,49 @@ grade: stable
 base: core20
 adopt-info: kblocks
 apps:
-    kblocks:
-        extensions:
-        - kde-neon
-        common-id: org.kde.kblocks.desktop
-        command: usr/bin/kblocks
-        plugs:
-        - home
-        - network
-        - network-bind
-        - audio-playback
-        - alsa
+  kblocks:
+    extensions:
+    - kde-neon
+    common-id: org.kde.kblocks.desktop
+    command: usr/bin/kblocks
+    plugs:
+    - audio-playback
+    - alsa
+    - network
+    environment:
+      QT_QPA_PLATFORMTHEME: flatpak
+      QT_QPA_FLATPAK_PLATFORMTHEME: kde
 slots:
-    session-dbus-interface:
-        interface: dbus
-        name: org.kde.kblocks
-        bus: session
+  session-dbus-interface:
+    interface: dbus
+    name: org.kde.kblocks
+    bus: session
 package-repositories:
--   type: apt
-    components:
-    - main
-    suites:
-    - focal
-    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
-    url: http://origin.archive.neon.kde.org/user
-    key-server: keyserver.ubuntu.com
+- type: apt
+  components:
+  - main
+  suites:
+  - focal
+  key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
+  url: http://origin.archive.neon.kde.org/user
+  key-server: keyserver.ubuntu.com
 layout:
-    "/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib":
-        bind: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib"
-    "/usr/share/alsa":
-        bind: "$SNAP/usr/share/alsa"
+  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib:
+    bind: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/alsa-lib
+  /usr/share/alsa:
+    bind: $SNAP/usr/share/alsa
 parts:
-    libkdegames:
-        plugin: cmake
-        source: https://download.kde.org/stable/release-service/21.04.0/src/libkdegames-21.04.0.tar.xz
-        build-packages:
-        - libopenal-dev
-        - libsndfile1-dev
-        cmake-parameters:
-        - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-        - "-DCMAKE_INSTALL_PREFIX=/usr"
-        - "-DCMAKE_BUILD_TYPE=Release"
-        - "-DENABLE_TESTING=OFF"
-        - "-DBUILD_TESTING=OFF"
-        - "-DKDE_SKIP_TEST_SETTINGS=ON"
-        - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-        filesets:
-            exclusion:
-            - "-usr/lib/*/cmake/*"
-            - "-usr/include/*"
-            - "-usr/share/ECM/*"
-            - "-usr/share/doc/*"
-            - "-usr/share/man/*"
-            - "-usr/share/icons/breeze-dark*"
-            - "-usr/bin/X11"
-            - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-            - "-usr/lib/aspell/*"
-        prime:
-        - "$exclusion"
-    kblocks:
-        after:
-        - libkdegames
-        plugin: cmake
-        build-packages:
-        - libkf5doctools-dev
-        stage-packages:
-        - libasound2-data
-        - libasound2-plugins
-        filesets:
-            exclusion:
-            - "-usr/lib/*/cmake/*"
-            - "-usr/include/*"
-            - "-usr/share/ECM/*"
-            - "-usr/share/doc/*"
-            - "-usr/share/man/*"
-            - "-usr/share/icons/breeze-dark*"
-            - "-usr/bin/X11"
-            - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-            - "-usr/lib/aspell/*"
-        prime:
-        - "$exclusion"
-        - "-etc/alsa/conf.d/99-pulse.conf"
-        parse-info:
-        - usr/share/metainfo/org.kde.kblocks.appdata.xml
-        source: http://download.kde.org/stable/release-service/21.04.3/src/kblocks-21.04.3.tar.xz
-        cmake-parameters:
-        - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-        - "-DCMAKE_INSTALL_PREFIX=/usr"
-        - "-DCMAKE_BUILD_TYPE=Release"
-        - "-DENABLE_TESTING=OFF"
-        - "-DBUILD_TESTING=OFF"
-        - "-DKDE_SKIP_TEST_SETTINGS=ON"
-        - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-version: 21.04.3
+  kblocks:
+    plugin: cmake
+    build-packages:
+    - libkf5doctools-dev
+    stage-packages:
+    - libasound2-data
+    - libasound2-plugins
+    prime:
+    - -etc/alsa/conf.d/99-pulse.conf
+    parse-info:
+    - usr/share/metainfo/org.kde.kblocks.appdata.xml
+    source: http://download.kde.org/stable/release-service/21.04.3/src/kblocks-21.04.3.tar.xz
+    cmake-parameters:
+    - "-DCMAKE_INSTALL_PREFIX=/usr"