Merge pull request #418 from serpent-os/kf6

boulder/macros: Add kf6 macros
AerynOS · Feb 10, 2025 · 3081d11 · 3081d11
2 parents ae73ee2 + ffb6b97
commit 3081d11
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/boulder/data/macros/actions/qt-kde.yaml b/boulder/data/macros/actions/qt-kde.yaml
@@ -25,6 +25,16 @@ actions:
         dependencies:
             - binary(cmake)
 
+    - cmake_kf6:
+        description: Perform cmake with the default options for KF6/Qt6 builds. This includes KDE Frameworks, Plasma, and KDE Gear
+        example: |
+            %cmake_kf6 -DSO_AND_SO=ON
+        command: |
+            cmake %(options_cmake_kf6)
+        dependencies:
+            - binary(cmake)
+            - cmake(ECM)
+
     - qt_user_facing_links:
         description: Setup user-facing binaries
         example: |
@@ -101,3 +111,12 @@ definitions:
         -DINSTALL_PUBLICBINDIR=usr/bin \
         -DQT_BUILD_EXAMPLES=ON \
         -DQT_FEATURE_rpath=OFF
+
+    # Default options for KF6/Qt6 builds
+    - options_cmake_kf6: |
+        %(options_cmake) \
+        -DCMAKE_INSTALL_LIBEXECDIR_kf6:PATH=%(libdir)/kf6 \
+        -DKDE_INSTALL_LIBEXECDIR:PATH=%(libdir)/kf6 \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON \
+        -DBUILD_QCH=ON \
+        -DBUILD_TESTING=OFF
diff --git a/boulder/data/macros/arch/base.yaml b/boulder/data/macros/arch/base.yaml
@@ -666,6 +666,12 @@ packages          :
             - /usr/lib/qt*/mkspecs
             - /usr/lib/qt*/modules/*.json
             - /usr/lib/qt*/sbom
+            - /usr/lib/qt*/plugins/designer/*.so
+            # KF5/KF6
+            - /usr/share/doc/qt5/*.qch
+            - /usr/share/doc/qt5/*.tags
+            - /usr/share/doc/qt6/*.qch
+            - /usr/share/doc/qt6/*.tags
         rundeps:
             - "%(name)"