try again to set track/risk on extension

trya nd oveeride with anchor and alias
no override-pull:
2026-02-13 23:43:43 +10:00 · 2026-01-09 09:05:19 +10:00 · 2026-01-08 21:08:07 +10:00 · 2026-01-08 20:51:26 +10:00 · 2026-01-08 20:47:00 +10:00 · 2026-01-08 18:07:38 +10:00
2 changed files with 54 additions and 84 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,18 +4,18 @@
 include:
  - project: sysadmin/ci-utilities
    file:
-      - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/json-validation.yml
-      - /gitlab-templates/xml-lint.yml
-      - /gitlab-templates/yaml-lint.yml
-      - /gitlab-templates/android-qt6.yml
-      - /gitlab-templates/linux-qt6.yml
-      - /gitlab-templates/linux-qt6-next.yml
-      - /gitlab-templates/windows-qt6.yml
-      - /gitlab-templates/freebsd-qt6.yml
-      - /gitlab-templates/flatpak.yml
+      #- /gitlab-templates/reuse-lint.yml
+      #- /gitlab-templates/json-validation.yml
+      #- /gitlab-templates/xml-lint.yml
+      #- /gitlab-templates/yaml-lint.yml
+      #- /gitlab-templates/android-qt6.yml
+      #- /gitlab-templates/linux-qt6.yml
+      #- /gitlab-templates/linux-qt6-next.yml
+      #- /gitlab-templates/windows-qt6.yml
+      #- /gitlab-templates/freebsd-qt6.yml
+      #- /gitlab-templates/flatpak.yml
      - /gitlab-templates/snap-snapcraft-lxd.yml
-      - /gitlab-templates/craft-android-qt6-apks.yml
-      - /gitlab-templates/craft-appimage-qt6.yml
-      - /gitlab-templates/craft-windows-x86-64-qt6.yml
-      - /gitlab-templates/craft-windows-appx-qt6.yml
+      #- /gitlab-templates/craft-android-qt6-apks.yml
+      #- /gitlab-templates/craft-appimage-qt6.yml
+      #- /gitlab-templates/craft-windows-x86-64-qt6.yml
+      #- /gitlab-templates/craft-windows-appx-qt6.yml
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -10,7 +10,7 @@ confinement: strict
 apps:
  neochat:
    extensions:
-      - kde-neon-6
+      - kde-neon-6@latest/beta
    command: usr/bin/neochat
    common-id: org.kde.neochat
    desktop: usr/share/applications/org.kde.neochat.desktop
@@ -25,7 +25,7 @@ apps:
      - password-manager-service
      - accounts-service
    environment:
-      QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/plugins/snap/kf6-core24/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/plugins"
+      QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/plugins:/snap/kf6-core24/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/plugins"
      QML_IMPORT_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qml:/snap/kf6-core24/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qml"

 compression: lzo
@@ -55,53 +55,11 @@ parts:
      - -usr/lib/*/pkgconfig
      - -usr/lib/*/cmake

-  libsecret:
-    source: https://gitlab.gnome.org/GNOME/libsecret.git
-    source-tag: '0.21.4'
-    source-depth: 1
-    plugin: meson
-    meson-parameters:
-      - --prefix=/usr
-      - -Doptimization=3
-      - -Ddebug=true
-      - -Dmanpage=false
-      - -Dvapi=false
-      - -Dintrospection=false
-      - -Dcrypto=disabled
-      - -Dgtk_doc=false
-    build-packages:
-      - meson
-      - libglib2.0-dev
-      - libgcrypt20-dev
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-
-  qtkeychain:
-    after: [libsecret]
-    source: https://github.com/frankosterfeld/qtkeychain.git
-    source-tag: 0.14.3
-    source-depth: 1
-    plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
-      - PKG_CONFIG_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH"
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_TRANSLATIONS=NO
-      - -DBUILD_WITH_QT6=ON
-    prime:
-      - -usr/include
-      - -usr/lib/*/pkgconfig
-      - -usr/lib/*/cmake
-
  libquotient:
    after:
      - olm
-      - qtkeychain
    source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.9.2
+    source-branch: 0.9.5
    source-depth: 1
    plugin: cmake
    build-environment:
@@ -110,12 +68,16 @@ parts:
      - cmake
    build-packages:
      - libssl-dev
+      - curl
    cmake-parameters:
      - -DCMAKE_INSTALL_PREFIX=/usr
      - -DCMAKE_BUILD_TYPE=Release
      - -DBUILD_TESTING=OFF
      - -DQuotient_ENABLE_E2EE=ON
      - -DBUILD_WITH_QT6=ON
+    override-pull: |
+      craftctl default
+      curl https://github.com/quotient-im/libQuotient/commit/ea83157eed37ff97ab275a5d14c971f0a5a70595.diff | patch -p1
    prime:
      - -usr/include
      - -usr/lib/*/pkgconfig
@@ -123,38 +85,39 @@ parts:

  kquickimageeditor:
    source: https://invent.kde.org/libraries/kquickimageeditor.git
-    source-tag: 'v0.3.0'
+    source-tag: 'v0.6.0'
    source-depth: 1
    plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
+    build-environment: &build-environment
+      - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:/snap/kde-qt6-core24-sdk/current/usr/lib:/snap/kf6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf6-core24-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/lib/:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+      - PATH: /snap/kde-qt6-core24-sdk/current/usr/bin${PATH:+:$PATH}
+      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
-      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
-    cmake-parameters:
+      - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+      - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+    cmake-parameters: &cmake-parameters
      - -DCMAKE_INSTALL_PREFIX=/usr
      - -DCMAKE_BUILD_TYPE=Release
+      - -DQT_MAJOR_VERSION=6
      - -DBUILD_WITH_QT6=ON
      - -DBUILD_TESTING=OFF
-    prime:
+      - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kf6-core24-sdk/current/usr"
+      - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kf6-core24-sdk/current/usr"
+    prime: &prime
      - -usr/include
      - -usr/lib/*/pkgconfig
      - -usr/lib/*/cmake

  kunifiedpush:
    source: https://invent.kde.org/libraries/kunifiedpush.git
+    source-branch: release/24.12
    plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
-      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
-      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_TESTING=OFF
+    build-environment: *build-environment
+    cmake-parameters: *cmake-parameters
+    prime: *prime

  neochat:
    after:
-      - qtkeychain
      - libquotient
      - kquickimageeditor
      - kunifiedpush
@@ -162,24 +125,20 @@ parts:
      - usr/share/metainfo/org.kde.neochat.appdata.xml
    source: .
    plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
-      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
-      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
+    build-environment: *build-environment
    build-packages:
      - cmark
+      - docbook-xml
+      - docbook-xsl
+      - duktape-dev
      - libcmark-dev
      - libsqlite3-dev
      - libvulkan-dev
      - libxkbcommon-dev
      - libicu-dev
      - libpulse0
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DBUILD_TESTING=OFF
-    prime:
-      - -usr/share/man
+    cmake-parameters: *cmake-parameters
+    prime: *prime

  deps:
    after: [neochat]
@@ -198,3 +157,14 @@ parts:
      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
    prime:
      - bin/gpu-2404-wrapper
+    
+  cleanup:
+    after:
+      - neochat
+    plugin: nil
+    override-prime: |
+      set -eux
+      for snap in "core24" "kf6-core24"; do
+      cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "${CRAFT_PRIME}/{}" \;
+      done
+
Author	SHA1	Message	Date
Carlos De Maine	c58ac6769b	try again to set track/risk on extension	2026-02-13 23:43:43 +10:00
Carlos De Maine	1f482000d2	trya nd oveeride with anchor and alias	2026-01-09 09:05:19 +10:00
Carlos De Maine	d0731c9c36	no override-pull:	2026-01-08 21:08:07 +10:00
Carlos De Maine	530fbc212b	formatting	2026-01-08 20:51:26 +10:00
Carlos De Maine	ea467a7901	use the CRAFT_SNAP_CHANNEL instead	2026-01-08 20:47:00 +10:00
Carlos De Maine	78ac2681de	$KDE_SNAP_CHANNEL	2026-01-08 18:07:38 +10:00
Carlos De Maine	0e16518123	docbook-xml & docbook-xsl	2026-01-08 17:51:26 +10:00
Carlos De Maine	62e204207d	patch in qt6.10 support t libquotient	2026-01-08 17:42:36 +10:00
Carlos De Maine	be712a6810	modernise paths, cmake-paths etc	2026-01-08 16:45:45 +10:00
Carlos De Maine	287043ed44	libsecret and qtkeychain are in the kf6-sdk	2026-01-08 16:06:28 +10:00
Carlos De Maine	4675f5f7e7	bump keychain to 0.15.0	2026-01-08 16:01:05 +10:00
Carlos De Maine	305f008796	bump libquotient to 9.5	2026-01-08 15:43:09 +10:00
Carlos De Maine	a4bf3e4da0	duktape-dev	2026-01-08 15:14:35 +10:00
Carlos De Maine	20bd8508e0	after: - neochat	2026-01-08 15:04:32 +10:00
Carlos De Maine	7406fd9884	add cleanup part with overriding build-snaps:	2026-01-08 15:00:14 +10:00
Carlos De Maine	ff62c74cb3	try building with kf6-extension from edge channel	2026-01-08 14:52:18 +10:00