[neon/kde/kate/Neon/release] /: remove launcher script

Jonathan Riddell null at kde.org
Thu Apr 29 15:19:11 BST 2021


Git commit dd71df63f0a0624fa9635d9bddc90b53bf13363e by Jonathan Riddell, on behalf of Sergio Schvezov.
Committed on 29/04/2021 at 14:19.
Pushed by jriddell into branch 'Neon/release'.

remove launcher script

As this is a classic snap, and it is an editor with plugins,
shelling out with lot's of environment set can affect
subprocessed commands.

The only remaining clash here is the export of the QT_PLUGIN_PATH,
which is correctly set to find kate's plugins.

LD_LIBRARY_PATH and others are not needed as that is handled by use
of RPATH.

Signed-off-by: Sergio Schvezov <sergio.schvezov at canonical.com>

M  +3    -7    snapcraft.yaml

https://invent.kde.org/neon/kde/kate/commit/dd71df63f0a0624fa9635d9bddc90b53bf13363e

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9ae219f..f4c7d79 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,7 +7,9 @@ adopt-info: kate
 apps:
     kate:
         common-id: org.kde.kate.desktop
-        command: kf5-launch kate
+        command: usr/bin/kate
+        environment:
+            QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins:$SNAPCRAFT_ARCH_TRIPLET/usr/lib/x86_64-linux-gnu
 package-repositories:
 -   type: apt
     components:
@@ -24,8 +26,6 @@ parts:
         plugin: cmake
         build-snaps:
         - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
-        after:
-        - kde-frameworks-5-env
         build-packages:
         - libgit2-dev
         - libkf5doctools-dev
@@ -64,7 +64,3 @@ parts:
             - "-usr/lib/aspell/*"
         prime:
         - "$exclusion"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git
-        source-branch: standalone


More information about the Neon-commits mailing list