[neon/qt6/qt6-svg/Neon/release] debian: nod docs prep

Carlos De Maine null at kde.org
Mon Oct 28 00:19:24 GMT 2024


Git commit 6451de40c7e8d76a1ddb1b989df86c67254cc5af by Carlos De Maine.
Committed on 28/10/2024 at 00:18.
Pushed by carlosdem into branch 'Neon/release'.

nod docs prep

M  +0    -1    debian/control
M  +8    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-svg/-/commit/6451de40c7e8d76a1ddb1b989df86c67254cc5af

diff --git a/debian/control b/debian/control
index 296c37d..75edd63 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,6 @@ Description: Qt 6 SVG - development files
 
 Package: qt6-svg-doc
 Architecture: all
-Build-Profile: <!nodoc>
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/rules b/debian/rules
index 5e58695..4b8de4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,17 @@
 
 include /usr/share/dpkg/architecture.mk
 
-export PANGEA_ARCH_BIN_ONLY=FALSE
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
 
+#### uncomment when bootstrapping a new qt release ####
+#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
+
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	extra_cmake_args += -DQT_HOST_PATH=/usr
+	extra_cmake_args += \
+		-DQT_HOST_PATH=/usr \
+		-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \
+		-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
 endif
 
 %:
@@ -22,7 +26,7 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 


More information about the Neon-commits mailing list