[neon/kde/bomber/Neon/release] /: update snap

[Jonathan Riddell]

Git commit 2a47e7a91332781dc0c93f799e47bd4136a72360 by Jonathan Riddell.
Committed on 27/04/2021 at 11:31.
Pushed by jriddell into branch 'Neon/release'.

update snap

M  +32   -23   snapcraft.yaml

https://invent.kde.org/neon/kde/bomber/commit/2a47e7a91332781dc0c93f799e47bd4136a72360

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7d322ca..551e364 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -5,18 +5,15 @@ base: core20
 adopt-info: bomber
 apps:
     bomber:
+        extensions:
+        - kde-neon
         common-id: org.kde.bomber.desktop
-        command: kf5-launch bomber
+        command: usr/bin/bomber
         plugs:
-        - kde-frameworks-5-plug
         - home
-        - x11
-        - opengl
         - network
         - network-bind
         - audio-playback
-        - desktop
-        - desktop-legacy
         - removable-media
         - alsa
 slots:
@@ -24,12 +21,6 @@ slots:
         interface: dbus
         name: org.kde.bomber
         bus: session
-plugs:
-    kde-frameworks-5-plug:
-        content: kde-frameworks-5-qt-5-15-core20-all
-        interface: content
-        default-provider: kde-frameworks-5-qt-5-15-core20
-        target: kf5
 package-repositories:
 -   type: apt
     components:
@@ -45,18 +36,40 @@ layout:
     "/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"
     bomber:
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
-        after:
-        - kde-frameworks-5-env
         plugin: cmake
         source: http://download.kde.org/stable/release-service/21.04.0/src/bomber-21.04.0.tar.xz
         build-packages:
         - libkf5doctools-dev
-        build-environment:
-        -   CMAKE_BUILD_PARALLEL_LEVEL: '4'
-        -   VERBOSE: '1'
+        after:
+        - libkdegames
         stage-packages:
         - libasound2-data
         - libasound2-plugins
@@ -84,7 +97,3 @@ parts:
         prime:
         - "$exclusion"
         - "-etc/alsa/conf.d/99-pulse.conf"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git
-version: 21.04.0