[neon/extras/ktorrent/Neon/release] /: update snap

[Jonathan Riddell]

Git commit 60d2afe76d9d7c62f0d23751f244cbb3ee91121e by Jonathan Riddell.
Committed on 15/04/2021 at 14:49.
Pushed by jriddell into branch 'Neon/release'.

update snap

M  +45   -26   snapcraft.yaml

https://invent.kde.org/neon/extras/ktorrent/commit/60d2afe76d9d7c62f0d23751f244cbb3ee91121e

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 97ab13a..f2477d2 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,17 +6,15 @@ grade: stable
 base: core20
 apps:
     ktorrent:
-        command: kf5-launch ktorrent
+        extensions:
+        - kde-neon
+        command: usr/bin/ktorrent
         plugs:
         - kde-frameworks-5-plug
         - home
-        - x11
-        - opengl
         - network
         - network-bind
         - audio-playback
-        - desktop
-        - desktop-legacy
         - network-observe
         - browser-support
         common-id: org.kde.ktorrent.desktop
@@ -25,12 +23,6 @@ slots:
         interface: dbus
         name: org.kde.ktorrent
         bus: session
-plugs:
-    kde-frameworks-5-plug:
-        content: kde-frameworks-5-46-qt-5-10-ubuntu-1604
-        interface: content
-        default-provider: kde-frameworks-5
-        target: kf5
 package-repositories:
 -   type: apt
     components:
@@ -41,11 +33,44 @@ package-repositories:
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
+    libktorrent:
+        plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
+        build-packages:
+        - libboost-dev
+        - libgcrypt20-dev
+        - libgmp-dev
+        - libqca-qt5-2-dev
+        stage-packages:
+        - libgcrypt20
+        - libgmp10
+        - libgmpxx4ldbl
+        - libqca-qt5-2
+        source: https://download.kde.org/stable/release-service/20.12.0/src/libktorrent-20.12.0.tar.xz
+        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=/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"
     ktorrent:
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
-        - kde-frameworks-5-env
+        - libktorrent
         plugin: cmake
         build-environment:
         - CMAKE_BUILD_PARALLEL_LEVEL: "4"
@@ -53,18 +78,15 @@ parts:
         - kross-dev
         - libboost-dev
         - libgeoip-dev
-        - libkf5syndication-dev
-        - libktorrent-dev
         - libphonon4qt5-dev
         - libphonon4qt5experimental-dev
         - libtag1-dev
+        - libkf5doctools-dev
         stage-packages:
-        - kross-dev
-        - libboost-dev
-        - libgeoip-dev
-        - libkf5syndication-dev
-        - libktorrent-dev
-        - libtag1-dev
+        - kross
+        - libgeoip1
+        - geoip-bin
+        - libtag1v5
         source: http://download.kde.org/stable/release-service/20.12.3/src/ktorrent-20.12.3.tar.xz
         cmake-parameters:
         - "-DCMAKE_INSTALL_PREFIX=/usr"
@@ -72,7 +94,7 @@ parts:
         - "-DENABLE_TESTING=OFF"
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
-        - "-DCMAKE_FIND_ROOT_PATH=/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"
         parse-info:
         - usr/share/metainfo/org.kde.ktorrent.appdata.xml
         filesets:
@@ -88,6 +110,3 @@ parts:
             - "-usr/lib/aspell/*"
         prime:
         - "$exclusion"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git