[neon/qt/qtwebengine/Neon/release_jammy] debian: Pass QMAKE_PYTHON2=python3 to qmake, to get the docs built.

Dmitry Shachnev null at kde.org
Wed Aug 21 09:44:48 BST 2024


Git commit 92dd81543e2fc1df7fe7bb28f04d3c9903fb77bb by Dmitry Shachnev.
Committed on 02/07/2024 at 06:27.
Pushed by jriddell into branch 'Neon/release_jammy'.

Pass QMAKE_PYTHON2=python3 to qmake, to get the docs built.

The build system now supports any Python version, but the variable was
not renamed because QMAKE_PYTHON already exists somewhere else.

M  +1    -1    debian/changelog
M  +1    -1    debian/rules

https://invent.kde.org/neon/qt/qtwebengine/-/commit/92dd81543e2fc1df7fe7bb28f04d3c9903fb77bb

diff --git a/debian/changelog b/debian/changelog
index f05bda1..3d67cf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,9 @@ qtwebengine-opensource-src (5.15.17+dfsg-1) UNRELEASED; urgency=medium
     - icu74.patch
   * Also drop part of python3.12-imp.patch which was applied upstream.
   * Refresh debian/patches/system-openjpeg2.patch.
-  * Stop passing QMAKE_PYTHON3=python3 to qmake, no longer needed.
   * Update debian/libqt5webenginecore5.symbols from buildds’ logs.
   * Bump ABI version to qtwebengine-abi-5-15-17.
+  * Pass QMAKE_PYTHON2=python3 to qmake, to get the docs built.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Jun 2024 15:40:06 +0300
 
diff --git a/debian/rules b/debian/rules
index c1c7ac2..8c23562 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ override_dh_auto_clean:
 	done
 
 override_dh_auto_configure:
-	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" $(qmake_args)
+	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON2=python3 $(qmake_args)
 
 	# Create js files, that are needed for building step for arch and indep builds
 	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \



More information about the Neon-commits mailing list