[neon/qt6/qt6-base/Neon/release] debian: clean ups and hopefully linty goodness

[Carlos De Maine]

Git commit a542c417924a77d62f689dcd7a81bfe5ed46fd6d by Carlos De Maine.
Committed on 16/02/2024 at 13:56.
Pushed by carlosdem into branch 'Neon/release'.

clean ups and hopefully linty goodness

M  +9    -9    debian/rules

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

diff --git a/debian/rules b/debian/rules
index 15178c6..301de28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,13 +28,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
@@ -64,7 +64,7 @@ override_dh_auto_configure:
 		-DFEATURE_glib=ON \
 		-DFEATURE_harfbuzz=ON \
 		-DFEATURE_icu=ON \
-		-DFEATURE_jpeg=ON \
+		-DFEATURE_jpeg=ON -DFEATURE_system_jpeg=ON \
 		-DFEATURE_journald=ON \
 		-DFEATURE_libproxy=ON \
 		-DFEATURE_ltcg=ON \
@@ -79,7 +79,6 @@ override_dh_auto_configure:
 		-DFEATURE_sql_psql=ON \
 		-DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=ON \
 		-DFEATURE_ssl=ON \
-		-DFEATURE_system_jpeg=ON \
 		-DFEATURE_system_libb2=ON \
 		-DFEATURE_system_proxies=ON \
 		-DFEATURE_system_xcb_xinput=ON \
@@ -99,6 +98,7 @@ override_dh_auto_configure:
 		-DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/plugins \
 		-DINSTALL_SYSCONFDIR=/etc/xdg \
 		-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 \