[neon/snap-packaging/kf5-core-sdk] /: Fix breeze, phonon-vlc cmake parameters

Scarlett Moore null at kde.org
Thu Oct 17 17:20:28 BST 2024


Git commit 0584f527310ea87fa1cbbea7def4da0349b6277d by Scarlett Moore.
Committed on 17/10/2024 at 16:19.
Pushed by scarlettmoore into branch 'master'.

Fix breeze, phonon-vlc cmake parameters

M  +23   -3    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf5-core-sdk/-/commit/0584f527310ea87fa1cbbea7def4da0349b6277d

diff --git a/snapcraft.yaml b/snapcraft.yaml
index b13f141..6387863 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -940,8 +940,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
@@ -1973,7 +1973,27 @@ parts:
         - libx11-dev
         - libfftw3-dev
         cmake-generator: Ninja
-        cmake-parameters: *cmakeparameters
+        cmake-parameters:
+            - -DCMAKE_INSTALL_PREFIX=/usr
+            - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+            - -DQT_MAJOR_VERSION=5
+            - -DBUILD_QT5=ON
+            - -DBUILD_QT6=OFF
+            - -DBUILD_TESTING=OFF
+            - -DCMAKE_INSTALL_SYSCONFDIR=/etc
+            - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+            - -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+            - -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF
+            - -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON
+            - -DCMAKE_INSTALL_RUNSTATEDIR=/run
+            - -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON
+            - -DCMAKE_VERBOSE_MAKEFILE=ON
+            - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+            - --log-level=STATUS
+            - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+            - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt5-core22-sdk/current\\;/usr"
+            - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt5-core22-sdk/current\\;/usr"
+        build-environment: *buildenvironment
         build-environment: *buildenvironment
     oxygen:
         after:


More information about the Neon-commits mailing list