[neon/snap-packaging/kf6-snap] /: Add oxygen

Benjamin Port null at kde.org
Mon Apr 22 21:01:59 BST 2024


Git commit 54603fed8fd3ddf9d709ee78c354e77943341610 by Benjamin Port.
Committed on 22/04/2024 at 15:22.
Pushed by bport into branch 'master'.

Add oxygen

A  +19   -0    patches/oxygen/01_disable_lnf.diff
A  +1    -0    patches/oxygen/series
M  +36   -0    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-snap/-/commit/54603fed8fd3ddf9d709ee78c354e77943341610

diff --git a/patches/oxygen/01_disable_lnf.diff b/patches/oxygen/01_disable_lnf.diff
new file mode 100644
index 0000000..bd8765c
--- /dev/null
+++ b/patches/oxygen/01_disable_lnf.diff
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 0000000..eb2a25d
--- /dev/null
+++ b/patches/oxygen/series
@@ -0,0 +1 @@
+01_disable_lnf.diff
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 95a208a..1436cfa 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -2109,6 +2109,42 @@ parts:
         - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
         - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
         build-environment: *buildenvironment
+    oxygen:
+        after:
+        - extra-cmake-modules
+        - kconfig
+        - kcoreaddons
+        - kguiaddons
+        - ki18n
+        - kiconthemes
+        - kirigami
+        - kwindowsystem
+        - kcolorscheme
+        - kdecoration2
+        - frameworkintegration
+        - kcmutils
+        - kcodecs
+        - kcompletion
+        - kconfigwidgets
+        - kservice
+        - kwidgetsaddons
+        source: https://invent.kde.org/plasma/oxygen.git
+        source-branch: master
+        source-depth: 1
+        plugin: cmake
+        build-snaps:
+        - kde-qt6-core22-sdk
+        build-packages:
+        - libx11-dev
+        - libfftw3-dev
+        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



More information about the Neon-commits mailing list