[neon/qt6/qt6-quick3dphysics/Neon/unstable] debian: usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/

[Carlos De Maine]

Git commit 6c0c5a078af4826cb856e220d0041044ace0f5e2 by Carlos De Maine.
Committed on 28/10/2023 at 15:35.
Pushed by carlosdem into branch 'Neon/unstable'.

usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/

M  +3    -0    debian/control
M  +0    -5    debian/not-installed
M  +2    -0    debian/qt6-quick3dphysics-dev.install
M  +8    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-quick3dphysics/-/commit/6c0c5a078af4826cb856e220d0041044ace0f5e2

diff --git a/debian/control b/debian/control
index 1859026..8a70f00 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,9 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>,
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               g++-12,
+               gcc-12,
+               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/not-installed b/debian/not-installed
index e8fc764..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuick3DPhysics/6.*/
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuick3DPhysicsHelpers/6.*/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_quick3dphysicshelpers_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_quick3dphysics_private.pri
diff --git a/debian/qt6-quick3dphysics-dev.install b/debian/qt6-quick3dphysics-dev.install
index 59d6e89..699e0de 100644
--- a/debian/qt6-quick3dphysics-dev.install
+++ b/debian/qt6-quick3dphysics-dev.install
@@ -4,6 +4,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuick3DPhysicsHelpers/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BundledPhysX/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Quick3DPhysics/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Quick3DPhysicsHelpers/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6BundledPhysX.a
@@ -15,3 +16,4 @@ usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
+
diff --git a/debian/rules b/debian/rules
index a37b981..ee67a4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+# need gcc 12.1 for mold to be able to process --gdb-index
+export CC=gcc-12
+export CXX=g++-12
+
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	cmake_extra_args += \
@@ -19,9 +23,11 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
-		$(cmake_extra_args)
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+		-DQT_UNITY_BUILD=ON \
+		$(extra_cmake_args)
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs