[neon/extras/kstars/Neon/release] /: update to core20 snap

Jonathan Riddell null at kde.org
Wed Mar 3 17:05:46 GMT 2021


Git commit 61094df722744a4346a55e454c87df2c7b8a7592 by Jonathan Riddell.
Committed on 03/03/2021 at 17:05.
Pushed by jriddell into branch 'Neon/release'.

update to core20 snap

M  +147  -158  snapcraft.yaml

https://invent.kde.org/neon/extras/kstars/commit/61094df722744a4346a55e454c87df2c7b8a7592

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9974458..5dce79d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -3,7 +3,7 @@ name: kstars
 version: 3.5.2
 confinement: strict
 grade: devel
-base: core18
+base: core20
 adopt-info: kstars
 apps:
     kstars:
@@ -40,154 +40,24 @@ plugs:
         content: kde-frameworks-5-core18-all
         default-provider: kde-frameworks-5-core18
         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
+-   type: apt
+    components:
+    - main
+    suites:
+    - focal
+    key-id: 7DA5C2D272B4C6F8E7CEA9C6487CEC2B3F33A288
+    url: http://ppa.launchpad.net/mutlaqja/ppa/ubuntu
+    key-server: keyserver.ubuntu.com
 parts:
-    indi1:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/asi-common_0.8.0+r4969~201907042019~ubuntu18.04.1_all.deb
-    indi2:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/gsc_1.3~ubuntu18.04.1_amd64.deb
-    indi3:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-aagcloudwatcher_1.4~201909052012~ubuntu18.04.1_amd64.deb
-    indi5:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-apogee_1.9~201909051730~ubuntu18.04.1_amd64.deb
-    indi6:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-armadillo-platypus_1.0~201909051952~ubuntu18.04.1_amd64.deb
-    indi7:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-asi_1.3~201909051842~ubuntu18.04.1_amd64.deb
-    indi8:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-astromechfoc_0.1~201909052012~ubuntu18.04.1_amd64.deb
-    indi9:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-atik_2.4~201909051842~ubuntu18.04.1_amd64.deb
-    indi10:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-avalon_1.5~201909051749~ubuntu18.04.1_amd64.deb
-    indi11:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-dreamfocuser_2.1~201909052012~ubuntu18.04.1_amd64.deb
-    indi12:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-dsi_0.2~201909051952~ubuntu18.04.1_amd64.deb
-    indi13:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-duino_0.3~201909052011~ubuntu18.04.1_amd64.deb
-    indi14:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-eqmod_0.8~201909051842~ubuntu18.04.1_amd64.deb
-    indi15:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-ffmv_0.2~201909051750~ubuntu18.04.1_amd64.deb
-    indi16:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-fishcamp_1.1~201909051909~ubuntu18.04.1_amd64.deb
-    indi17:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-fli_1.3~201909051925~ubuntu18.04.1_amd64.deb
-    indi18:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-full_1.8.0~201908010640~ubuntu18.04.1_amd64.deb
-    indi19:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-gphoto_2.8~201909051730~ubuntu18.04.1_amd64.deb
-    indi20:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-gpsd_0.5~201909051842~ubuntu18.04.1_amd64.deb
-    indi21:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-gpsnmea_0.2~201909051909~ubuntu18.04.1_amd64.deb
-    indi22:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-inovaplx_1.4~201909051909~ubuntu18.04.1_amd64.deb
-    indi23:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-maxdomeii_1.3~201909051952~ubuntu18.04.1_amd64.deb
-    indi24:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-mgen_0.1~201909051730~ubuntu18.04.1_amd64.deb
-    indi25:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-mi_1.5~201909051750~ubuntu18.04.1_amd64.deb
-    indi26:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-nexdome_1.1~201909051925~ubuntu18.04.1_amd64.deb
-    indi27:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-nexstarevo_0.4~201908010827~ubuntu18.04.1_amd64.deb
-    indi28:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-nightscape_1.0~201909052124~ubuntu18.04.1_amd64.deb
-    indi29:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-qhy_2.5~201909241702~ubuntu18.04.1_amd64.deb
-    indi30:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-qsi_0.9~201909051750~ubuntu18.04.1_amd64.deb
-    indi31:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-sbig_2.1~201909051925~ubuntu18.04.1_amd64.deb
-    indi32:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-shelyak_1.0~201909052124~ubuntu18.04.1_amd64.deb
-    indi33:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-ssag_1.0~201909051925~ubuntu18.04.1_amd64.deb
-    indi34:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-starbook_0.8~201909051750~ubuntu18.04.1_amd64.deb
-    indi35:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-sx_1.13~201909051953~ubuntu18.04.1_amd64.deb
-    indi36:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-toupbase_0.2~201909051730~ubuntu18.04.1_amd64.deb
-    indi38:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indi-webcam_1.0~201909052124~ubuntu18.04.1_amd64.deb
-    indi39:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/indiwebmanagerapp_1.5+201909100039~ubuntu18.04.1_amd64.deb
-    indi40:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libapogee3_3.2+~201905111342~ubuntu18.04.1_amd64.deb
-    indi41:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libatik_2.2.6~201907021949~ubuntu18.04.1_amd64.deb
-    indi42:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libfishcamp_1.1+r4949~201906222245~ubuntu18.04.1_amd64.deb
-    indi43:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libfli2_2.0~201907021949~ubuntu18.04.1_amd64.deb
-    indi44:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libinovasdk_1.3.2~201903091346~ubuntu18.04.1_amd64.deb
-    indi45:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libnncam_1.38.1~201909051510~ubuntu18.04.1_amd64.deb
-    indi46:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libqhy_6.0.1+stable~201910011631~ubuntu18.04.1_amd64.deb
-    indi47:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libqsi7_7.6.1~201907021948~ubuntu18.04.1_amd64.deb
-    indi48:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libaltaircam_1.0.1~201908010725~ubuntu18.04.1_amd64.deb
-    indi49:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libsbig_2.1.3~201907021949~ubuntu18.04.1_amd64.deb
-    indi50:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libstarshootg_1.38.1~201909051509~ubuntu18.04.1_amd64.deb
-    indi51:
-        plugin: dump
-        source: https://launchpad.net/~mutlaqja/+archive/ubuntu/ppa/+files/libtoupcam_1.39.0~201909051722~ubuntu18.04.1_amd64.deb
     kstars:
         plugin: cmake
         build-packages:
@@ -200,16 +70,58 @@ parts:
         - libindi-dev
         - qt5keychain-dev
         - wcslib-dev
+        - asi-common
+        - gsc
+        - indi-aagcloudwatcher
+        - indi-apogee
+        - indi-armadillo-platypus
+        - indi-asi
+        - indi-astromechfoc
+        - indi-atik
+        - indi-avalon
+        - indi-dreamfocuser
+        - indi-dsi
+        - indi-duino
+        - indi-eqmod
+        - indi-ffmv
+        - indi-fishcamp
+        - indi-fli
+        - indi-full
+        - indi-gphoto
+        - indi-gpsd
+        - indi-gpsnmea
+        - indi-inovaplx
+        - indi-maxdomeii
+        - indi-mgen
+        - indi-mi
+        - indi-nexdome
+        - indi-nexstarevo
+        - indi-nightscape
+        - indi-qhy
+        - indi-qsi
+        - indi-sbig
+        - indi-shelyak
+        - indi-ssag
+        - indi-starbook
+        - indi-sx
+        - indi-toupbase
+        - indi-webcam
+        - indiwebmanagerapp
+        - libapogee3
+        - libatik
+        - libfishcamp
+        - libfli2
+        - libinovasdk
+        - libnncam
+        - libqhy
+        - libqsi7
+        - libaltaircam
+        - libsbig
+        - libstarshootg
+        - libtoupcam
+        - indi-altaircam
         build-snaps:
-        - kde-frameworks-5-core18-sdk
-        override-build: |
-            echo 'deb http://ppa.launchpad.net/mutlaqja/ppa/ubuntu bionic main' >> /etc/apt/sources.list
-            wget 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x487cec2b3f33a288' -O ppa-key
-            apt-key add ppa-key
-            rm -f /etc/apt/apt.conf.d/proxy
-            apt update
-            apt-get -y install indi-altaircam
-            snapcraftctl build
+        - kde-frameworks-5-qt-5-15-core20-sdk
         stage-packages:
         - astrometry.net
         - indi-bin
@@ -225,15 +137,92 @@ parts:
         - libsecret-1-dev
         - libglvnd0
         - libgomp1
+        - asi-common
+        - asi-common
+        - gsc
+        - indi-aagcloudwatcher
+        - indi-apogee
+        - indi-armadillo-platypus
+        - indi-asi
+        - indi-astromechfoc
+        - indi-atik
+        - indi-avalon
+        - indi-dreamfocuser
+        - indi-dsi
+        - indi-duino
+        - indi-eqmod
+        - indi-ffmv
+        - indi-fishcamp
+        - indi-fli
+        - indi-full
+        - indi-gphoto
+        - indi-gpsd
+        - indi-gpsnmea
+        - indi-inovaplx
+        - indi-maxdomeii
+        - indi-mgen
+        - indi-mi
+        - indi-nexdome
+        - indi-nexstarevo
+        - indi-nightscape
+        - indi-qhy
+        - indi-qsi
+        - indi-sbig
+        - indi-shelyak
+        - indi-ssag
+        - indi-starbook
+        - indi-sx
+        - indi-toupbase
+        - indi-webcam
+        - indiwebmanagerapp
+        - libapogee3
+        - libatik
+        - libfishcamp
+        - libfli2
+        - libinovasdk
+        - libnncam
+        - libqhy
+        - libqsi7
+        - libaltaircam
+        - libsbig
+        - libstarshootg
+        - libtoupcam
         parse-info:
         - usr/share/metainfo/org.kde.kstars.appdata.xml
         source: http://download.kde.org/stable/kstars/kstars-3.5.2.tar.xz
-        configflags:
+        cmake-parameters:
         - "-DCMAKE_INSTALL_PREFIX=/usr"
         - "-DCMAKE_BUILD_TYPE=Release"
         - "-DENABLE_TESTING=OFF"
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
+        - "-DCMAKE_FIND_ROOT_PATH=/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"
     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"


More information about the Neon-commits mailing list