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

Jonathan Riddell null at kde.org
Tue Apr 27 13:34:54 BST 2021


Git commit 433221243bc8517bf21b8df4e184ad3f4a7202b9 by Jonathan Riddell.
Committed on 27/04/2021 at 12:31.
Pushed by jriddell into branch 'Neon/release'.

update snap

M  +32   -32   snapcraft.yaml

https://invent.kde.org/neon/kde/ksudoku/commit/433221243bc8517bf21b8df4e184ad3f4a7202b9

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 49f57a9..357bc68 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,30 +6,21 @@ base: core20
 adopt-info: ksudoku
 apps:
     ksudoku:
+        extensions:
+        - kde-neon
         common-id: org.kde.ksudoku.desktop
-        command: kf5-launch ksudoku
+        command: usr/bin/ksudoku
         plugs:
-        - kde-frameworks-5-plug
         - home
-        - x11
-        - opengl
         - network
         - network-bind
         - audio-playback
-        - desktop
-        - desktop-legacy
         - removable-media
 slots:
     session-dbus-interface:
         interface: dbus
         name: org.kde.ksudoku
         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:
@@ -40,26 +31,39 @@ package-repositories:
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
-    patches:
-        source: patches/
-        plugin: dump
-        stage:
-        - qtglobal.diff
+    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"
     ksudoku:
+        after:
+        - libkdegames
         parse-info:
         - usr/share/metainfo/org.kde.ksudoku.appdata.xml
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
-        after:
-        - kde-frameworks-5-env
-        - patches
-        build-environment:
-        -   VERBOSE: '1'
         plugin: cmake
-        override-build: |-
-            cd $SNAPCRAFT_PART_SRC
-            patch -p1 < $SNAPCRAFT_STAGE/qtglobal.diff
-            snapcraftctl build
         build-packages:
         - libkf5doctools-dev
         source: http://download.kde.org/stable/release-service/21.04.0/src/ksudoku-21.04.0.tar.xz
@@ -84,7 +88,3 @@ parts:
             - "-usr/lib/aspell/*"
         prime:
         - "$exclusion"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git
-version: 21.04.0


More information about the Neon-commits mailing list