[neon/qt6/qt6-declarative/Neon/unstable] debian: full nodoc build withou the circular deps

Carlos De Maine null at kde.org
Sun Dec 8 04:33:26 GMT 2024


Git commit 25a3f8158e4b351c4e75ad22b392c21b5af99566 by Carlos De Maine.
Committed on 08/12/2024 at 04:33.
Pushed by carlosdem into branch 'Neon/unstable'.

full nodoc build withou the circular deps

M  +5    -5    debian/control
M  +1    -1    debian/qt6-declarative-doc.install
M  +3    -3    debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/25a3f8158e4b351c4e75ad22b392c21b5af99566

diff --git a/debian/control b/debian/control
index 98fb824..8b1a071 100644
--- a/debian/control
+++ b/debian/control
@@ -17,14 +17,14 @@ Build-Depends: cmake,
                qt6-base-dev (>=6.8.0~),
 #               qt6-declarative-dev:native <cross>,
                qt6-languageserver-private-dev (>=6.8.0~),
-               qt6-location-dev,
-               qt6-positioning-dev,
+#               qt6-location-dev,
+#               qt6-positioning-dev,
                qt6-shadertools-dev (>=6.8.0~),
                qt6-svg-dev,
                qt6-tools-dev,
-Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
-                     qt6-base-doc (>=6.8~) <!nodoc>,
-                     qt6-documentation-tools (>=6.8~) <!nodoc>,
+#Build-Depends-Indep: qt6-base-dev (>=6.8~) <!nodoc>,
+#                     qt6-base-doc (>=6.8~) <!nodoc>,
+#                     qt6-documentation-tools (>=6.8~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-declarative.git
diff --git a/debian/qt6-declarative-doc.install b/debian/qt6-declarative-doc.install
index 8536ff4..36c01e0 100644
--- a/debian/qt6-declarative-doc.install
+++ b/debian/qt6-declarative-doc.install
@@ -1 +1 @@
-usr/share/qt6/doc/
+#usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 6046f27..9952c7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,12 @@ 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
+DEB_BUILD_PROFILES="nodoc"
+export DEB_BUILD_PROFILES
 
 # 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)),)
+ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	extra_build_args +=
 	extra_install_args +=
 	build_docs += false


More information about the Neon-commits mailing list