[neon/snap-packaging/kf6-core-sdk/work.core24] /: add libplasma, remove oxygen patch

[Scarlett Moore]

Git commit e1d4a212d071daec9b8a7c6d173a65193208ae00 by Scarlett Moore.
Committed on 20/06/2026 at 10:33.
Pushed by scarlettmoore into branch 'work.core24'.

add libplasma, remove oxygen patch

D  +0    -19   patches/oxygen/01_disable_lnf.diff
D  +0    -1    patches/oxygen/series
M  +52   -20   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/e1d4a212d071daec9b8a7c6d173a65193208ae00

diff --git a/patches/oxygen/01_disable_lnf.diff b/patches/oxygen/01_disable_lnf.diff
deleted file mode 100644
index bd8765c..0000000
--- a/patches/oxygen/01_disable_lnf.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,7 +103,6 @@ block(SCOPE_FOR VARIABLES)
-     Completion
-     FrameworkIntegration
-     WindowSystem)
--    find_package(Plasma ${PROJECT_DEP_VERSION} REQUIRED)
-
-     # https://bugreports.qt.io/browse/QTBUG-114706
-     add_library(Qt::Core ALIAS Qt6::Core)
-@@ -121,8 +120,6 @@ block(SCOPE_FOR VARIABLES)
-     add_subdirectory(cursors)
-     add_subdirectory(kdecoration)
-
--    plasma_install_package(lookandfeel org.kde.oxygen look-and-feel lookandfeel)
--
-     ki18n_install(po)
- endblock()
- endif()
diff --git a/patches/oxygen/series b/patches/oxygen/series
deleted file mode 100644
index eb2a25d..0000000
--- a/patches/oxygen/series
+++ /dev/null
@@ -1 +0,0 @@
-01_disable_lnf.diff
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3c4cccf..4a4fb28 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -2326,6 +2326,7 @@ parts:
       - kconfigwidgets
       - kservice
       - kwidgetsaddons
+      - libplasma
     source: https://invent.kde.org/plasma/oxygen.git
     source-tag: *plasma-version
     source-depth: 1
@@ -2338,11 +2339,6 @@ parts:
     cmake-generator: Ninja
     cmake-parameters: *cmakeparameters-withoutqt5
     build-environment: *buildenvironment
-    override-pull: |
-        craftctl default
-        while read -r PATCHFILE ; do
-            patch -p1 < "$CRAFT_PROJECT_DIR/patches/oxygen/$PATCHFILE"
-        done < $CRAFT_PROJECT_DIR/patches/oxygen/series
   plasma-integration:
     after:
       - extra-cmake-modules
@@ -2413,28 +2409,64 @@ parts:
       - -usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.xml
       - -usr/share/glib-2.0/schemas/org.gnome.system.proxy.gschema.xml
       - -usr/share/icons/*
-  qqc2-breeze-style:
+  wayland:
+    source: https://gitlab.freedesktop.org/wayland/wayland.git
+    source-branch: 1.23
+    plugin: meson
+    meson-parameters:
+      - --prefix=/usr
+    build-snaps:
+      - kde-qt6-core24-sdk/latest/beta
+      - kf6-core24-sdk/latest/beta
+    build-packages:
+      - meson
+      - pkgconf
+      - xsltproc
+      - xmlto
+      - libexpat1-dev
+      - libffi-dev
+      - libxml2-dev
+      - doxygen
+      - graphviz
+    build-environment:
+      - PKG_CONFIG_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:/snap/kde-qt6-core24-sdk/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:/snap/kf6-core24-sdk/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig"
+  wayland-protocols:
     after:
-      - extra-cmake-modules
-      - kcodecs
-      - kcolorscheme
-      - kconfig
-      - kcoreaddons
-      - kguiaddons
-      - kirigami
-      - kquickcharts
-      - kiconthemes
-    source: https://invent.kde.org/plasma/qqc2-breeze-style.git
+      - wayland
+    source: https://gitlab.freedesktop.org/wayland/wayland-protocols.git
+    source-tag: 1.47
+    plugin: meson
+    meson-parameters:
+      - --prefix=/usr
+    build-snaps:
+      - kde-qt6-core24-sdk/latest/beta
+      - kf6-core24-sdk/latest/beta
+    build-packages:
+      - meson
+      - pkgconf
+    build-environment:
+      - PKG_CONFIG_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:/snap/kde-qt6-core24-sdk/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:/snap/kf6-core24-sdk/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig"
+      - LD_LIBRARY_PATH: "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
+  libplasma:
+    after: [wayland-protocols]
+    source: https://invent.kde.org/plasma/libplasma.git
     source-tag: *plasma-version
-    source-depth: 1
+    plugin: cmake
     build-packages:
-      - cmake
+      - libpulse0
+      - rsync
+    stage-packages:
+      - libpulse0
     build-snaps:
       - kde-qt6-core24-sdk/latest/beta
-    plugin: cmake
+      - kf6-core24-sdk/latest/beta
     cmake-generator: Ninja
-    cmake-parameters: *cmakeparameters
     build-environment: *buildenvironment
+    override-build: |
+      craftctl default
+      rsync -a --ignore-existing $CRAFT_PART_INSTALL/ /
+    prime:
+      - -usr/bin/rsync
   libkdegames:
     after:
       - extra-cmake-modules