[neon/neon-packaging/neochat/Neon/unstable] /: Update snapcraft.yaml

Sergio Schvezov null at kde.org
Mon Jun 7 18:20:42 BST 2021


Git commit ac455be79df08458413a021fcf8302c207213434 by Sergio Schvezov.
Committed on 06/06/2021 at 02:43.
Pushed by jriddell into branch 'Neon/unstable'.

Update snapcraft.yaml

I compiled this locally and got neochat working (what was on candidate was not for me,
skew with Kirigami and friends which is stage-packages in the prior version and the sdk snap)

M  +96   -93   snapcraft.yaml

https://invent.kde.org/neon/neon-packaging/neochat/commit/ac455be79df08458413a021fcf8302c207213434

diff --git a/snapcraft.yaml b/snapcraft.yaml
index db20d43..2c36c47 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,100 +1,103 @@
 ---
 name: neochat
-confinement: strict
-grade: stable
 base: core20
+version: "1.2"
+
 adopt-info: neochat
+
+grade: stable
+confinement: strict
+
 apps:
-    neochat:
-        extensions:
-        - kde-neon
-        common-id: org.kde.neochat
-        command: usr/bin/neochat
-        plugs:
-        - home
-        - network
-        - network-bind
-        - audio-playback
+  neochat:
+    command: usr/bin/neochat
+    common-id: org.kde.neochat
+    plugs:
+    - audio-playback
+    - network
+    - network-manager-observe
+    - password-manager-service
+    environment:
+      QML2_IMPORT_PATH: $SNAP/usr/lib/x86_64-linux-gnu/qml
+    extensions:
+    - kde-neon
+
 slots:
-    session-dbus-interface:
-        interface: dbus
-        name: org.kde.neochat
-        bus: session
-package-repositories:
--   type: apt
-    components:
-    - main
-    suites:
-    - focal
-    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
-    url: http://origin.archive.neon.kde.org/user
-    key-server: keyserver.ubuntu.com
+  session-dbus-interface:
+    interface: dbus
+    name: org.kde.neochat
+    bus: session
+
 parts:
-    libquotient:
-        plugin: cmake
-        source: https://github.com/quotient-im/libQuotient/archive/refs/tags/0.6.6.tar.gz
-        build-packages:
-          - qt5keychain-dev
-          - libkf5qqc2desktopstyle-dev
-        cmake-parameters:
-          - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-          - "-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"
-    neochat:
-        after:
-          - libquotient
-        plugin: cmake
-        build-packages:
-          - kquickimageeditor-dev
-          - kirigami2-dev
-          - libcmark-dev
-        stage-packages:
-          - qml-module-org-kde-kirigami2
-          - qml-module-org-kde-kitemmodels
-          - qml-module-org-kde-kquickimageeditor
-          - qml-module-org-kde-qqc2desktopstyle
-          - qml-module-qt-labs-platform
-          - qml-module-qt-labs-qmlmodels
-          - libqt5keychain1
-          - libcmark0.29.0
-        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"
-        parse-info:
-          - usr/share/metainfo/org.kde.neochat.appdata.xml
-        source: https://download.kde.org/stable/neochat/1.2.0/neochat-1.2.0.tar.xz
-        cmake-parameters:
-          - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
-          - "-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"
+  qtkeychain:
+    source: https://github.com/frankosterfeld/qtkeychain.git
+    source-tag: "v0.10.0"
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
+    - -DCMAKE_BUILD_TYPE=Release
+    - -DBUILD_TRANSLATIONS=NO
+  libmatrixclient:
+    source: https://github.com/quotient-im/libQuotient.git
+    source-tag: "0.6.5"
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
+    - -DCMAKE_BUILD_TYPE=Release
+    - -DBUILD_TESTING=OFF
+  # SDK snap is missing kirigami development assets.
+  kirigami:
+    source: https://invent.kde.org/frameworks/kirigami.git
+    source-tag: "v5.79.0"
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
+    - -DCMAKE_BUILD_TYPE=Release
+    - -DBUILD_TESTING=OFF
+    prime:
+    - -*
+  qqc2desktopstyle:
+    after:
+    - kirigami
+    source: https://invent.kde.org/frameworks/qqc2-desktop-style.git
+    source-tag: "v5.79.0"
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
+    - -DCMAKE_BUILD_TYPE=Release
+    - -DBUILD_TESTING=OFF
+    - -DCMAKE_PREFIX_PATH=$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/cmake/KF5Kirigami2
+  kquickimageeditor:
+    source: https://download.kde.org/stable/kquickimageeditor/0.1/kquickimageeditor-0.1.2.tar.xz
+    source-checksum: sha256/37d54981a1c7dbb48ca45a7df37b8871bf1751e4c0484eeaddc548804ee18a04
+    plugin: cmake
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
+    - -DCMAKE_BUILD_TYPE=Release
+    - -DBUILD_TESTING=OFF
+    build-packages:
+    - libglu1-mesa-dev
+  neochat:
+    after:
+    - qtkeychain
+    - libmatrixclient
+    - qqc2desktopstyle
+    - kquickimageeditor
+    source: https://invent.kde.org/network/neochat.git
+    source-tag: "v$SNAPCRAFT_PROJECT_VERSION"
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+    - -DCMAKE_INSTALL_PREFIX=/usr
+    - -DCMAKE_BUILD_TYPE=Release
+    stage-packages:
+    - libcmark0.29.0
+    build-packages:
+    - libcmark-dev
+    parse-info:
+    - usr/share/metainfo/org.kde.neochat.appdata.xml
+


More information about the Neon-commits mailing list