[neon/extras/labplot/Neon/release] /: simplify

Jonathan Riddell null at kde.org
Tue Mar 9 13:37:22 GMT 2021


Git commit 2aa8167e7b5dafd38b13ad76e0ebd2453fbcecda by Jonathan Riddell.
Committed on 09/03/2021 at 13:37.
Pushed by jriddell into branch 'Neon/release'.

simplify

M  +4    -23   snapcraft.yaml

https://invent.kde.org/neon/extras/labplot/commit/2aa8167e7b5dafd38b13ad76e0ebd2453fbcecda

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 1a5c4c3..d90c07b 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -30,15 +30,6 @@ plugs:
         default-provider: kde-frameworks-5-qt-5-15-core20
         target: kf5
 package-repositories:
--   type: apt
-    components:
-    - main
-    suites:
-    - focal
-    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
-    url: http://origin.archive.neon.kde.org/user
-    key-server: keyserver.ubuntu.com
-package-repositories:
 -   type: apt
     components:
     - main
@@ -62,6 +53,9 @@ parts:
         - kde-frameworks-5-env
         - patches
         plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
+        - VERBOSE: "1"
         override-build: |-
             cd $SNAPCRAFT_PART_SRC
             patch -p1 < $SNAPCRAFT_STAGE/std-isnan.diff
@@ -143,17 +137,4 @@ parts:
         - "-DCMAKE_FIND_ROOT_PATH=/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
     kde-frameworks-5-env:
         plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
-        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"
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git


More information about the Neon-commits mailing list