From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F22C61581F0 for ; Thu, 12 Dec 2024 22:36:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A347E0977; Thu, 12 Dec 2024 22:36:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A91E1E0977 for ; Thu, 12 Dec 2024 22:36:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B08E335DC7 for ; Thu, 12 Dec 2024 22:36:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 002B31F0B for ; Thu, 12 Dec 2024 22:36:45 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1734042897.4fea1dcf05c5db029b96bb6a99379f42e7c18d09.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyqt6-webengine/, dev-python/pyqt6-webengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyqt6-webengine/Manifest dev-python/pyqt6-webengine/files/pyqt6-webengine-6.8.0-qvariant.patch dev-python/pyqt6-webengine/pyqt6-webengine-6.8.0.ebuild X-VCS-Directories: dev-python/pyqt6-webengine/ dev-python/pyqt6-webengine/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 4fea1dcf05c5db029b96bb6a99379f42e7c18d09 X-VCS-Branch: master Date: Thu, 12 Dec 2024 22:36:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56fd4f8d-3382-4178-9810-75fea503f4fc X-Archives-Hash: c006c9872020da55da0c6e1100383c61 commit: 4fea1dcf05c5db029b96bb6a99379f42e7c18d09 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Dec 12 21:19:18 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Dec 12 22:34:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fea1dcf dev-python/pyqt6-webengine: add 6.8.0 Almost identical to previous snapshot except for the removal of the QVariant include which appears to be a mistake, quick restore it with a patch for now. No sip-6.9.1 PEP 625 names yet due to this being a "old" release that was just pending being published on pypi, cleaning up will be for the next one. Signed-off-by: Ionen Wolkens gentoo.org> dev-python/pyqt6-webengine/Manifest | 1 + .../files/pyqt6-webengine-6.8.0-qvariant.patch | 15 +++++ .../pyqt6-webengine/pyqt6-webengine-6.8.0.ebuild | 73 ++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dev-python/pyqt6-webengine/Manifest b/dev-python/pyqt6-webengine/Manifest index 83fb1172e5b3..fb608b3a764a 100644 --- a/dev-python/pyqt6-webengine/Manifest +++ b/dev-python/pyqt6-webengine/Manifest @@ -1,2 +1,3 @@ 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 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 ++%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') + ) +}