[neon/forks/kdenlive/Neon/release] /: update snap to use extension

Jonathan Riddell null at kde.org
Wed Apr 14 17:09:29 BST 2021


Git commit b14fb8bec35b43ea9048ee70910526788cb4b24b by Jonathan Riddell.
Committed on 14/04/2021 at 16:09.
Pushed by jriddell into branch 'Neon/release'.

update snap to use extension

D  +0    -1    purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5
D  +-    --    purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5.68.0
D  +0    -1    purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5
D  +-    --    purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5.68.0
M  +8    -20   snapcraft.yaml

https://invent.kde.org/neon/forks/kdenlive/commit/b14fb8bec35b43ea9048ee70910526788cb4b24b

diff --git a/purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5 b/purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5
deleted file mode 120000
index 627561a..0000000
--- a/purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5
+++ /dev/null
@@ -1 +0,0 @@
-libKF5Purpose.so.5.68.0
\ No newline at end of file
diff --git a/purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5.68.0 b/purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5.68.0
deleted file mode 100644
index 5e69ff1..0000000
Binary files a/purpose/usr/lib/x86_64-linux-gnu/libKF5Purpose.so.5.68.0 and /dev/null differ
diff --git a/purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5 b/purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5
deleted file mode 120000
index 98b18fc..0000000
--- a/purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5
+++ /dev/null
@@ -1 +0,0 @@
-libKF5PurposeWidgets.so.5.68.0
\ No newline at end of file
diff --git a/purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5.68.0 b/purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5.68.0
deleted file mode 100644
index bec202b..0000000
Binary files a/purpose/usr/lib/x86_64-linux-gnu/libKF5PurposeWidgets.so.5.68.0 and /dev/null differ
diff --git a/snapcraft.yaml b/snapcraft.yaml
index bec3d87..b802a47 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,24 +1,23 @@
 ---
 name: kdenlive
-version: 20.12.3
 confinement: strict
 grade: stable
 base: core20
 adopt-info: kdenlive
 apps:
     kdenlive:
+        extensions:
+        - kde-neon
         common-id: org.kde.kdenlive.desktop
-        command: kf5-launch $SNAP/kdenlive-launch kdenlive
+        command: usr/bin/kdenlive
+        command-chain:
+        - kdenlive-launch
         plugs:
         - kde-frameworks-5-plug
         - home
-        - x11
-        - opengl
         - network
         - network-bind
         - audio-playback
-        - desktop
-        - desktop-legacy
         - removable-media
 slots:
     session-dbus-interface:
@@ -44,23 +43,15 @@ parts:
     kdenlive:
         parse-info:
         - usr/share/metainfo/org.kde.kdenlive.appdata.xml
-        build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
-        after:
-        - kde-frameworks-5-env
         plugin: cmake
         build-environment:
         - CMAKE_BUILD_PARALLEL_LEVEL: "4"
         build-packages:
-        - build-essential
-        - qt5-default
-        - kdoctools5
-        - kdoctools-dev
+        - libkf5doctools-dev
         - libkf5purpose-dev
         - libmlt++-dev
         - librttr-dev
         - libmlt-dev
-        - pkg-config
         stage-packages:
         - ffmpeg
         - frei0r-plugins
@@ -85,7 +76,7 @@ parts:
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
         - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/x86_64-linux-gnu/qt5/plugins/"
-        - "-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"
         filesets:
             exclusion:
             - "-usr/lib/*/cmake/*"
@@ -99,11 +90,8 @@ parts:
             - "-usr/lib/aspell/*"
         prime:
         - "$exclusion"
-    kde-frameworks-5-env:
-        plugin: dump
-        source: https://invent.kde.org/packaging/snap-kf5-launcher.git
     kdenlive-launch:
-        source: http://download.kde.org/stable/release-service/20.12.3/src/kdenlive-20.12.3.tar.xz
+        source: kdenlive-launch
         plugin: dump
         prime:
         - kdenlive-launch


More information about the Neon-commits mailing list