[neon/qt6/qt6-base/Neon/release] debian: sync to debian

[Carlos De Maine]

Git commit 104aa58538fb1be999754c73dee26aeac84f2e9e by Carlos De Maine.
Committed on 20/04/2025 at 13:55.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +1    -23   debian/qmake-cross-wrapper.in
M  +13   -18   debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/104aa58538fb1be999754c73dee26aeac84f2e9e

diff --git a/debian/qmake-cross-wrapper.in b/debian/qmake-cross-wrapper.in
index 79fcc5c..db29f0f 100644
--- a/debian/qmake-cross-wrapper.in
+++ b/debian/qmake-cross-wrapper.in
@@ -1,27 +1,5 @@
 #!/bin/sh
 
-if [ "x$1" = x-qt6 ] || [ "x$1" = "x-qt=6" ] || [ "x$1" = "x-qt=qt6" ]; then
-	shift
-fi
-
-QMAKE_MODE=
-
-if [ "x$1" = x-query ]; then
-	exec /usr/lib/qt6/bin/qmake "$@" -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf
-elif [ "x$1" = x-makefile ] || [ "x$1" = x-project ]; then
-	QMAKE_MODE="$1"
-	shift
-fi
-
-exec /usr/lib/qt6/bin/qmake6 \
-	$QMAKE_MODE \
+exec /usr/lib/qt6/bin/qtpaths6 \
 	-qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf \
-	-early \
-	QMAKE_CC=${CC:- at DEB_HOST_GNU_TYPE@-gcc} \
-	QMAKE_CXX=${CXX:- at DEB_HOST_GNU_TYPE@-g++} \
-	QMAKE_LINK=${CXX:- at DEB_HOST_GNU_TYPE@-g++} \
-	QMAKE_STRIP=${STRIP:- at DEB_HOST_GNU_TYPE@-strip} \
-	QMAKE_QMAKE=/usr/bin/@DEB_HOST_GNU_TYPE at -qmake6 \
-	PKG_CONFIG=@DEB_HOST_GNU_TYPE at -pkg-config \
-	-before \
 	"$@"
diff --git a/debian/rules b/debian/rules
index bb4a551..3b34694 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,13 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
+# uncomment if a bootstrap bic build
+export NEON_QT6_BOOTSTRAP = 1
 
 # Use already defined DEB_HOST_* variables.
 include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
-
-#### uncomment when bootstrapping a new qt release ####
-export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
-export DEB_BUILD_OPTIONS := ${DEB_BUILD_OPTIONS} nodoc
-
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
-	extra_build_args +=
-	extra_install_args +=
-	build_docs += false
-else
-extra_build_args += docs
-	extra_install_args += install_docs
-	build_docs += true
-endif
+sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
 ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages)))
         extra_cmake_args += -DFEATURE_sql_ibase=ON
@@ -103,7 +92,6 @@ override_dh_auto_configure:
 		-DINSTALL_TRANSLATIONDIR=share/qt6/translations \
 		-DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=/usr/$(DEB_HOST_MULTIARCH) \
 		-DQT_BUILD_EXAMPLES=ON \
-		-DQT_BUILD_STANDALONE_TESTS=OFF \
 		-DQT_INSTALL_EXAMPLES_SOURCES=ON \
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
@@ -131,16 +119,23 @@ execute_after_dh_auto_install-arch:
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/qt.conf.in \
 		> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/qt6.conf
 
-	# Inject cross-wrapper for qmake6
+	# Inject cross-wrapper for qmake6 and qtpaths
 	mkdir -p debian/tmp/usr/bin
 	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
 		-e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
 		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
-	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+		< debian/qtpaths-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qtpaths6
+	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6 debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qtpaths6
 
 	# Fix Qt6::qmake IMPORTED_LOCATION, see https://bugs.debian.org/1030980
 	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-relwithdebinfo.cmake
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake
+
+	# Fix Qt6::qtpaths IMPORTED_LOCATION
+	sed -i 's,lib/qt6/bin/qtpaths,bin/$(DEB_HOST_GNU_TYPE)-qtpaths6,' \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake
+
 
 ### no longer needed??
 override_dh_makeshlibs: