[neon/kde/okular/Neon/release] /: use snap extension

[Jonathan Riddell]

Git commit c296cabdba4b8c847e287bcdae81c6e4d9cf6882 by Jonathan Riddell.
Committed on 08/04/2021 at 14:28.
Pushed by jriddell into branch 'Neon/release'.

use snap extension

M  +15   -15   snapcraft.yaml

https://invent.kde.org/neon/kde/okular/commit/c296cabdba4b8c847e287bcdae81c6e4d9cf6882

diff --git a/snapcraft.yaml b/snapcraft.yaml
index ce89946..cbb6121 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,19 +6,17 @@ base: core20
 adopt-info: okular
 apps:
     okular:
+        extensions:
+        - kde-neon
         common-id: org.kde.okular.desktop
-        command: kf5-launch okular
+        command: usr/bin/okular
         plugs:
         - kde-frameworks-5-plug
         - home
-        - x11
-        - opengl
         - network
         - network-bind
         - audio-playback
         - cups-control
-        - desktop
-        - desktop-legacy
         - removable-media
 slots:
     session-dbus-interface:
@@ -42,8 +40,6 @@ package-repositories:
     key-server: keyserver.ubuntu.com
 parts:
     poppler:
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         plugin: cmake
         source: https://poppler.freedesktop.org/poppler-21.03.0.tar.xz
         build-environment:
@@ -106,20 +102,27 @@ parts:
         - "-DCMAKE_BUILD_TYPE=Release"
         - "-DENABLE_QT5=ON"
         - "-DENABLE_LIBOPENJPEG=unmaintained"
+        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:
-        - "-usr/include"
+        - "$exclusion"
     okular:
         parse-info:
         - usr/share/metainfo/org.kde.okular.appdata.xml
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
-        - kde-frameworks-5-env
         - poppler
         plugin: cmake
         build-environment:
         - CMAKE_BUILD_PARALLEL_LEVEL: "4"
-        - VERBOSE: "1"
         build-packages:
         - libchm-dev
         - libdjvulibre-dev
@@ -201,6 +204,3 @@ parts:
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
         - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/x86_64-linux-gnu/qt5/plugins/"
         - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git