[neon/qt6/qt6-lottie/Neon/unstable] debian: need gcc 12.1 for mold to be able to process --gdb-index && clean installs

Carlos De Maine null at kde.org
Sat Oct 28 14:22:59 BST 2023


Git commit 7da80a090f856e421291f087b1953a9a8556a8e0 by Carlos De Maine.
Committed on 28/10/2023 at 15:22.
Pushed by carlosdem into branch 'Neon/unstable'.

need gcc 12.1 for mold to be able to process --gdb-index && clean installs

M  +3    -0    debian/control
M  +0    -2    debian/not-installed
M  +7    -22   debian/qt6-lottie-dev.install
M  +1    -3    debian/qt6-lottie.install
M  +7    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-lottie/-/commit/7da80a090f856e421291f087b1953a9a8556a8e0

diff --git a/debian/control b/debian/control
index 7b6605f..ec71530 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,13 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               g++-12,
+               gcc-12,
                libgl-dev,
                libssl-dev,
                libvulkan-dev [linux-any],
                libxkbcommon-dev,
+               mold,
                ninja-build,
                pkg-config,
                pkg-kde-tools,
diff --git a/debian/not-installed b/debian/not-installed
index 31855f8..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBodymovin/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_bodymovin_private.pri
diff --git a/debian/qt6-lottie-dev.install b/debian/qt6-lottie-dev.install
index d8c6ebe..8855db0 100644
--- a/debian/qt6-lottie-dev.install
+++ b/debian/qt6-lottie-dev.install
@@ -1,24 +1,9 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBodymovin/QtBodymovin
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBodymovin/QtBodymovinDepends
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBodymovin/QtBodymovinVersion
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBodymovin/bmglobal.h
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtBodymovin/qtbodymovinversion.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateDependencies.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/Qt6BodymovinPrivateVersionlessTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtLottieTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginTargets-*.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtpluginTargets.cmake
+usr/include/${DEB_HOST_MULTIARCH}/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BodymovinPrivate/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Bodymovin.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Bodymovin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6bodymovinprivate_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/BodymovinPrivate.json
+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/qt6-lottie.install b/debian/qt6-lottie.install
index 69247be..cc2e35d 100644
--- a/debian/qt6-lottie.install
+++ b/debian/qt6-lottie.install
@@ -1,4 +1,2 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Bodymovin.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/labs/lottieqt/liblottieqtplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/labs/lottieqt/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/labs/lottieqt/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/labs/
diff --git a/debian/rules b/debian/rules
index dc8ca3d..cf9e70d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,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))
 	extra_cmake_args += -DQT_HOST_PATH=/usr
@@ -13,8 +17,10 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--log-level=STATUS \
+		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
 execute_after_dh_auto_install:


More information about the Neon-commits mailing list