gentoo auto-resync : 13:12:2024 - 02:01:50

3 files changed, 91 insertions, 0 deletions

diff --git a/dev-python/pyqt6-webengine/Manifest b/dev-python/pyqt6-webengine/Manifest
index 749818b800fe..40916cca4b92 100644
--- a/dev-python/pyqt6-webengine/Manifest
+++ b/dev-python/pyqt6-webengine/Manifest
@@ -1,5 +1,8 @@
+AUX pyqt6-webengine-6.8.0-qvariant.patch 409 BLAKE2B 8af54b536514c4315c13451ee8965d5f270d8d8c4b3e7caa6946f4cc53a1b12bc4a4ada1910025ecdb397e986432e49c882f422646b6f254c2da79485e451164 SHA512 6da7ae74ce8c62b2966f18a38d45b096844c3ec087b7323438ace2df4bd35100f07b98fbfb860d4ab1438aeb00db8f948531351747c594112341c063fcc6d1cd
 DIST PyQt6_WebEngine-6.7.0.tar.gz 32593 BLAKE2B 6c14323b440a83f6fed9f1f77f20b350f00255dfedfbc328a5ee638760d20958d8864eb3c590248acd5c69152c537993a95e66d1f76b28349561c8223dfc2a85 SHA512 8298aecc43e420c4fa912802fd66ee95fd71156d9a6d1f1a499ffcc2d0d45a8c3e3c170f911acfc8f094d2e434567b5143b145ce40413ee75c9a9e4420341c0c
 DIST PyQt6_WebEngine-6.8.0.dev2411020930.tar.gz 34309 BLAKE2B e881ea3b91b1ebccf7b93df3c0dc645e2505223948478b2e4a6399fc380e08460d8ce3cd42857adaa68a8323439257891028b43a6334f0ef2cf4e3b6e13064dc SHA512 5acd6f8712bf1964cd15ee3696bccf37aca00a3c6428df03500a678e1f7f88b1c02015fb1f7b698c4bb9db24868b99df878cf3187a14addb7b7f66354a1960c5
+DIST PyQt6_WebEngine-6.8.0.tar.gz 34203 BLAKE2B eeec38d0804039fa4d80d9c621457e18c4ae7831f351401b552191f3db8899102a4396164a1df89597460a9d6591a5d885b1bd813f226094c853aedb0918e3c4 SHA512 f48575829ccf9350ec6e743f2185975706c149dd37b8fbdf5c76bb65f606084b3d3c732ce39bfd35317d1e65659d5ec6e77b489a83c43971b5b3b3ce278bd8dc
 EBUILD pyqt6-webengine-6.7.0.ebuild 1971 BLAKE2B a8b8f61a7faa3ce0fe350c6d011128db2530b6f2148b9e25e6d880202028046be6a46312a8d9ebca23dcac746b8ea3ea0a0d31c03f5d98a88d979ac015915869 SHA512 04434b7819888c4f3ee4f81e5a83509d13b22d8101b50be7a099b893a2e8e406b4dbc86c660c6af2a910981a3ea1178986bf78232bce6a4d19d40fd4210dcc85
+EBUILD pyqt6-webengine-6.8.0.ebuild 1948 BLAKE2B 2366c069bf51209a236ae28c933f5d6fc8f91e5c92c08083ea45a0e3c881715e74c412c8b2f601542eb341fcf7c11b45cda34854d8a0b5c0e3079511312384aa SHA512 744cd0f20eb368a1c02052f1fc29e5133f15e4800503e23fd43a8be2a48b9d811374652699131bc721f429a5c983c930a6b7485351c29a823a029ad8121ee200
 EBUILD pyqt6-webengine-6.8.0_pre2411020930.ebuild 2190 BLAKE2B 75b5fcddd511d682e4964e01320cf3be3fda9b1eaebc3847e23d303a377c285531677e890fe52a3d2e4c82ca32d8eb10652308ccf88c30d36ce5cd996ab46bfb SHA512 eb05cb1f519e990976d1500b60852b88c454b4a197fbde63d7e69babc56f9fe1f50d5dfcd5d7c603c8714b996a21b42beb548d9766deb3540a6afb310372cf06
 MISC metadata.xml 574 BLAKE2B 1cc3bbf5d25e8aac390530005c225bfc618fbb1bdef3a3d075f445eee2cf68d86feb6ac8841d7e0efd1679b19fc14b33b33accdd7e4932e742f46907a8f98601 SHA512 1af94b1a66be1dd38feb818ba973852912bacacc715e0bd893f8b3de56d17f8902b7486cc487137defad749773a6f728c470cbb9c62d15f91a63d80b16296604
diff --git a/dev-python/pyqt6-webengine/files/pyqt6-webengine-6.8.0-qvariant.patch b/dev-python/pyqt6-webengine/files/pyqt6-webengine-6.8.0-qvariant.patch
new file mode 100644
index 000000000000..bdb7d4c2a202
--- /dev/null
+++ b/dev-python/pyqt6-webengine/files/pyqt6-webengine-6.8.0-qvariant.patch
@@ -0,0 +1,15 @@
+This was removed between 6.8.0.dev2411020930 and 6.8.0 final, but
+results in a build failure if missing (or at least with Qt6.8.1).
+
+qwebengineframe.sip:52:64: error: invalid use of incomplete type 'class QVariant'
+--- a/sip/QtWebEngineCore/qwebengineframe.sip
++++ b/sip/QtWebEngineCore/qwebengineframe.sip
+@@ -29,4 +29,8 @@
+ %End
+ 
++%TypeCode
++#include <QVariant>
++%End
++
+ public:
+     bool isValid() const;
diff --git a/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0.ebuild b/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0.ebuild
new file mode 100644
index 000000000000..82c8f1a91a87
--- /dev/null
+++ b/dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=sip
+PYPI_NO_NORMALIZE=1
+PYPI_PN=PyQt6_WebEngine
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
+
+QT_PV=$(ver_cut 1-2):6
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug quick +widgets"
+
+RDEPEND="
+	>=dev-python/pyqt6-${QT_PV%:*}[gui,ssl,${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}[gui,widgets?]
+	>=dev-qt/qtwebengine-${QT_PV}[widgets]
+	quick? (
+		dev-python/pyqt6[qml]
+		>=dev-qt/qtwebengine-${QT_PV}[qml]
+	)
+	widgets? ( dev-python/pyqt6[network,printsupport,webchannel,widgets] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-python/pyqt-builder-1.17[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.9[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qvariant.patch
+)
+
+src_prepare() {
+	default
+
+	# hack: PyQt-builder runs qmake without our arguments and calls g++
+	# or clang++ depending on what qtbase was built with, not used for
+	# building but fails with -native-symlinks
+	mkdir "${T}"/cxx || die
+	local cxx
+	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
+	! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die
+	PATH=${T}/cxx:${PATH}
+}
+
+python_configure_all() {
+	append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug #892331)
+	append-cxxflags ${CPPFLAGS} # respect CPPFLAGS notably for DISTUTILS_EXT=1
+
+	DISTUTILS_ARGS=(
+		--jobs="$(makeopts_jobs)"
+		--qmake="$(qt6_get_bindir)"/qmake
+		--qmake-setting="$(qt6_get_qmake_args)"
+		--verbose
+
+		--enable=QtWebEngineCore
+		$(usex quick --{enable,disable}=QtWebEngineQuick)
+		$(usex widgets --{enable,disable}=QtWebEngineWidgets)
+
+		$(usev debug '--debug --qml-debug --tracing')
+	)
+}