[neon/extras/gcompris-qt/Neon/release] /: switch to extension

[Jonathan Riddell]

Git commit 4d9cc10194b544390e30b36ebda9be93f0725ab2 by Jonathan Riddell.
Committed on 15/04/2021 at 11:32.
Pushed by jriddell into branch 'Neon/release'.

switch to extension

M  +10   -27   snapcraft.yaml

https://invent.kde.org/neon/extras/gcompris-qt/commit/4d9cc10194b544390e30b36ebda9be93f0725ab2

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 61147b1..89961ca 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,27 +6,17 @@ base: core20
 adopt-info: gcompris
 apps:
     gcompris:
+        extensions:
+        - kde-neon
         common-id: org.kde.gcompris.desktop
-        command: kf5-launch gcompris-qt
-        environment:
-            GST_PLUGIN_SCANNER: "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/gstreamer1.0/gstreamer-1.0/"
+        command: usr/bin/gcompris-qt
         plugs:
-        - kde-frameworks-5-plug
-        - home
-        - x11
-        - opengl
-        - network
-        - network-bind
-        - audio-playback
-        - desktop
-        - desktop-legacy
-        - removable-media
-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
+            - kde-frameworks-5-plug
+            - home
+            - network
+            - network-bind
+            - audio-playback
+            - removable-media
 package-repositories:
 -   type: apt
     components:
@@ -40,10 +30,6 @@ parts:
     gcompris:
         parse-info:
         - usr/share/metainfo/org.kde.gcompris.appdata.xml
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
-        after:
-        - kde-frameworks-5-env
         plugin: cmake
         build-environment:
         - CMAKE_BUILD_PARALLEL_LEVEL: "4"
@@ -81,7 +67,7 @@ parts:
         - "-DENABLE_TESTING=OFF"
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
-        - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/usr\\;/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+        - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
         filesets:
             exclusion:
             - "-usr/lib/*/cmake/*"
@@ -95,6 +81,3 @@ parts:
             - "-usr/lib/aspell/*"
         prime:
         - "$exclusion"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git