[neon/snap-packaging/kf5-core-sdk] /: kstatusnotifieritem is qt6 only. Fix more parts with qt6 options.
Scarlett Moore
null at kde.org
Wed Oct 16 16:13:14 BST 2024
Git commit a9187be71375c5a0a4ab7e926b75539f41ebf0c4 by Scarlett Moore.
Committed on 16/10/2024 at 15:12.
Pushed by scarlettmoore into branch 'master'.
kstatusnotifieritem is qt6 only. Fix more parts with qt6 options.
M +4 -16 snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/kf5-core-sdk/-/commit/a9187be71375c5a0a4ab7e926b75539f41ebf0c4
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 326c461..5485f34 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -829,7 +829,7 @@ parts:
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DQT_MAJOR_VERSION=5
- - -DUSE_QT6=ON
+ - -DUSE_QT6=OFF
- -DCMAKE_INSTALL_SYSCONFDIR=/etc
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var
- -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
@@ -897,8 +897,8 @@ parts:
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DQT_MAJOR_VERSION=5
- - -DPHONON_BUILD_QT5=OFF
- - -DPHONON_BUILD_QT6=ON
+ - -DPHONON_BUILD_QT5=ON
+ - -DPHONON_BUILD_QT6=OFF
- -DBUILD_TESTING=OFF
- -DCMAKE_INSTALL_SYSCONFDIR=/etc
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var
@@ -1615,18 +1615,6 @@ parts:
cmake-generator: Ninja
cmake-parameters: *cmakeparameters
build-environment: *buildenvironment
- kstatusnotifieritem:
- after:
- - kwindowsystem
- source: https://invent.kde.org/frameworks/kstatusnotifieritem.git
- source-tag: *kf5-version
- source-depth: 1
- build-snaps:
- - kde-qt5-core22-sdk
- plugin: cmake
- cmake-generator: Ninja
- cmake-parameters: *cmakeparameters
- build-environment: *buildenvironment
krunner:
after:
- extra-cmake-modules
@@ -1865,7 +1853,7 @@ parts:
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DQT_MAJOR_VERSION=5
- -DBUILD_WITH_QT6=OFF
- - -DKDSoap_QT6=True
+ - -DKDSoap_QT6=False
- -DBUILD_TESTING=OFF
- -DCMAKE_INSTALL_SYSCONFDIR=/etc
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var
More information about the Neon-commits
mailing list