[neon/qt6/qt6-base/Neon/unstable] debian: drop all the croos-build stuff as neon doesn't need it and it causes havoc with cmake - QTBUG-97658 - QTBUG-95099 - QTBUG-99683

[Carlos De Maine]

Git commit 2b56830715af8ae3b07804992b994e755796bf87 by Carlos De Maine.
Committed on 25/11/2023 at 14:24.
Pushed by carlosdem into branch 'Neon/unstable'.

drop all the croos-build stuff as neon doesn't need it and it causes havoc with cmake - QTBUG-97658 - QTBUG-95099 - QTBUG-99683

M  +1    -1    debian/patches/series
M  +14   -14   debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/2b56830715af8ae3b07804992b994e755796bf87

diff --git a/debian/patches/series b/debian/patches/series
index c703ebd..ac8f47b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,7 @@ Add-SH-detection.patch
 
 # Debian specific
 remove_privacy_breaches.diff
-#build_path_embedded_qtbuildinternalsextra_cmake.patch
+build_path_embedded_qtbuildinternalsextra_cmake.patch
 cross.patch
 force_shared_libzstd.patch
 #no_htmlinfo_example.patch #### no longer required
diff --git a/debian/rules b/debian/rules
index be90207..649b7be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,13 @@ else
         extra_cmake_args += -DFEATURE_sctp=OFF
 endif
 
-# cross-builds
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	extra_cmake_args += \
-		-DQT_HOST_PATH=/usr \
-		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
-		-DQT_FORCE_BUILD_TOOLS=ON
-endif
+## cross-builds
+#ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+#	extra_cmake_args += \
+#		-DQT_HOST_PATH=/usr \
+#		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+#		-DQT_FORCE_BUILD_TOOLS=ON
+#endif
 
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
@@ -46,7 +46,7 @@ override_dh_auto_configure:
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		-DCMAKE_LIBRARY_PATH=lib/$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
 		-DFEATURE_accessibility=ON \
 		-DFEATURE_cups=ON \
@@ -111,12 +111,12 @@ 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
-	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
+#	# Inject cross-wrapper for qmake6
+#	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
 
 	# Fix cmake config file's installed into /usr/lib/qt6/libexec
 	mv -v debian/tmp/usr/lib/qt6/libexec/*.cmake debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6/