[neon/qt6/qt6-base/Neon/release] debian: try nodoc build

[Carlos De Maine]

Git commit 8734fbcd03cb7092fe9420a7fe0c1a04818d9f7f by Carlos De Maine.
Committed on 20/04/2025 at 11:59.
Pushed by carlosdem into branch 'Neon/release'.

try nodoc build

M  +3    -3    debian/control
M  +20   -24   debian/rules

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

diff --git a/debian/control b/debian/control
index 6e46b4d..cda2b05 100644
--- a/debian/control
+++ b/debian/control
@@ -101,9 +101,9 @@ Build-Depends: cmake,
                shared-mime-info,
                unixodbc-dev,
                zlib1g-dev,
-#Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
-#                    qt6-documentation-tools (>=6.8~) <!nodoc>,
-#                    qt6-base-doc (>=6.8~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
+                     qt6-documentation-tools (>=6.8~) <!nodoc>,
+                     qt6-base-doc (>=6.8~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index afaba8e..bb4a551 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,22 +7,18 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### uncomment when bootstrapping a new qt release ####
-#DEB_BUILD_PROFILES="nodoc"
-#export DEB_BUILD_PROFILES
-
-sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
-
-# the next statement obviously has to have inverted logic (ifneq instad of ifeq) to work
-# for a nodoc build as nodoc is not being added to DEB_BUILD_PROFILES for some reason
-#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
+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
 
 ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages)))
         extra_cmake_args += -DFEATURE_sql_ibase=ON
@@ -115,16 +111,16 @@ override_dh_auto_configure:
 override_dh_auto_build-indep:
 	dh_auto_build -- $(extra_build_args)
 
-#ifeq ($(build_docs),true)
-#override_dh_auto_install-indep:
-#	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
-#	# Remove build path from index files if we are a doc build.
-#	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
-#		sed -i 's@$(CURDIR)/@@g' {} \;
-#else
+ifeq ($(build_docs),true)
 override_dh_auto_install-indep:
 	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
-#endif
+	# Remove build path from index files if we are a doc build.
+	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+		sed -i 's@$(CURDIR)/@@g' {} \;
+else
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
+endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files