[neon/snap-packaging/okular-snap] /: Fix the theme plugs. Give access to kdeglobals.

Scarlett Moore null at kde.org
Fri Jul 5 10:20:11 BST 2024


Git commit efc1b7f43a114d04cc4d380b2288ed638e5333f1 by Scarlett Moore.
Committed on 05/07/2024 at 09:19.
Pushed by scarlettmoore into branch 'master'.

Fix the theme plugs. Give access to kdeglobals.

M  +54   -4    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/okular-snap/-/commit/efc1b7f43a114d04cc4d380b2288ed638e5333f1

diff --git a/snapcraft.yaml b/snapcraft.yaml
index f49ccbe..945c815 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -23,6 +23,51 @@ apps:
         command-chain:
         #- bin/speechd
         - snap/command-chain/desktop-launch6
+environment:
+  LD_LIBRARY_PATH: "/snap/kf6-core22/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf6-core22/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/ffmpeg-2204/current/usr/lib:$SNAP/usr/lib:$SNAP/lib/:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:/usr/lib:/lib"
+plugs:
+    gtk-3-themes:
+        interface: content
+        target: $SNAP/data-dir/themes
+        default-provider: gtk-common-themes
+    kde-gtk3-themes:
+        interface: content
+        target: $SNAP/data-dir/themes
+        default-provider: qt-common-themes
+    gtk-2-themes:
+        interface: content
+        target: $SNAP/data-dir/themes
+        default-provider: gtk-common-themes
+    kde-gtk2-themes:
+        interface: content
+        target: $SNAP/data-dir/themes
+        default-provider: qt-common-themes
+    qt-icon-themes:
+        interface: content
+        target: $SNAP/data-dir/icons
+        default-provider: qt-common-themes
+    gtk-icon-themes:
+        interface: content
+        target: $SNAP/data-dir/icons
+        default-provider: gtk-common-themes
+    qt-sound-themes:
+        interface: content
+        target: $SNAP/data-dir/sounds
+        default-provider: qt-common-themes
+    gtk-sound-themes:
+        interface: content
+        target: $SNAP/data-dir/sounds
+        default-provider: gtk-common-themes
+    qt-6-themes:
+        interface: content
+        target: $SNAP/kf6
+        default-provider: qt-common-themes
+    dot-config-kde-globals:
+        interface: personal-files
+        read:
+            - $HOME/.config/kdeglobals
+
+
 slots:
     session-dbus-interface:
         interface: dbus
@@ -168,7 +213,8 @@ parts:
         - --log-level=STATUS
         - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         prime:
-        - -usr/lib/*/cmake/*
+        - -usr/lib/*/cmake
+        - -usr/lib/cmake
         - -usr/include/*
         - -usr/share/ECM/*
         - -usr/share/man/*
@@ -177,6 +223,7 @@ parts:
         - -usr/lib/gcc/$SNAPCRAFT_ARCH_TRIPLET/6.0.0
         - -usr/lib/aspell/*
         - -usr/share/lintian
+        - -usr/lib/*/dri
     okular:
         after:
         - mobipocket
@@ -216,6 +263,7 @@ parts:
         - libspeechd2
         - speech-dispatcher
         - espeak
+        - libaudio2
         source: https://invent.kde.org/graphics/okular.git
         source-branch: release/24.05
         cmake-parameters:
@@ -240,11 +288,13 @@ parts:
         - -usr/include/*
         - -usr/share/ECM/*
         - -usr/share/man/*
-        - -usr/share/icons/breeze-dark*
         - -usr/bin/X11
-        - -usr/lib/gcc/$SNAPCRAFT_ARCH_TRIPLET/6.0.0
+        - -usr/lib/gcc/$CRAFT_ARCH_TRIPLET_BUILD_FOR/6.0.0
         - -usr/lib/aspell/*
         - -usr/share/lintian
+        - -usr/lib/libchm.so.1.0.0
+        - -usr/lib/libqgpgmeqt6.so.15.5.1
+        - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgssapi.so.3.0.0
     cleanup:
         after:
         - okular
@@ -254,7 +304,7 @@ parts:
         - kf6-core22
         override-prime: |
             set -eux
-            for snap in "core22" "kf6-core22"; do
+            for snap in "core22" "kf6-core22" "qt-common-themes"; do
                 cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "${CRAFT_PRIME}/{}" \;
             done
 


More information about the Neon-commits mailing list