From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id ED8411582EF for ; Wed, 26 Feb 2025 14:40:39 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D5D13343274 for ; Wed, 26 Feb 2025 14:40:39 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id AFF5B1103AC; Wed, 26 Feb 2025 14:40:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id A1FD31103AC for ; Wed, 26 Feb 2025 14:40:38 +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 4FC5C343222 for ; Wed, 26 Feb 2025 14:40:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABBCF27FE for ; Wed, 26 Feb 2025 14:40:36 +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: <1740580809.ce166ae08848bc2d89d4dce262e4be853714e1bb.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyqt6/, dev-python/pyqt6/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch dev-python/pyqt6/pyqt6-6.8.1.ebuild X-VCS-Directories: dev-python/pyqt6/ dev-python/pyqt6/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ce166ae08848bc2d89d4dce262e4be853714e1bb X-VCS-Branch: master Date: Wed, 26 Feb 2025 14:40:36 +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: 524b6605-d11b-4c02-86d4-c3ba274e6c65 X-Archives-Hash: 327a6ea2954b0d7582912ce5be2bd103 commit: ce166ae08848bc2d89d4dce262e4be853714e1bb Author: Ionen Wolkens gentoo org> AuthorDate: Wed Feb 26 14:34:08 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Feb 26 14:40:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce166ae0 dev-python/pyqt6: fix build with Qt 6.9 Signed-off-by: Ionen Wolkens gentoo.org> dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch | 43 ++++++++++++++++++++++++++ dev-python/pyqt6/pyqt6-6.8.1.ebuild | 4 +++ 2 files changed, 47 insertions(+) diff --git a/dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch b/dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch new file mode 100644 index 000000000000..898bda7810a5 --- /dev/null +++ b/dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch @@ -0,0 +1,43 @@ +Quick fix to build against (still unreleased) Qt 6.9. +--- a/qpy/QtCore/qpycore_enums_flags_metatype.cpp ++++ b/qpy/QtCore/qpycore_enums_flags_metatype.cpp +@@ -46,5 +46,9 @@ + mti->alignment = alignof(unsigned); + mti->size = sizeof(unsigned); ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++ mti->flags = QtPrivate::QMetaTypeForType::flags() | QMetaType::IsEnumeration | QMetaType::IsUnsignedEnumeration; ++#else + mti->flags = QtPrivate::QMetaTypeForType::Flags | QMetaType::IsEnumeration | QMetaType::IsUnsignedEnumeration; ++#endif + mti->defaultCtr = QtPrivate::QMetaTypeForType::getDefaultCtr(); + mti->copyCtr = QtPrivate::QMetaTypeForType::getCopyCtr(); +@@ -62,5 +66,9 @@ + mti->alignment = alignof(int); + mti->size = sizeof(int); ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++ mti->flags = QtPrivate::QMetaTypeForType::flags() | QMetaType::IsEnumeration; ++#else + mti->flags = QtPrivate::QMetaTypeForType::Flags | QMetaType::IsEnumeration; ++#endif + mti->defaultCtr = QtPrivate::QMetaTypeForType::getDefaultCtr(); + mti->copyCtr = QtPrivate::QMetaTypeForType::getCopyCtr(); +--- a/sip/QtCore/QtCoremod.sip ++++ b/sip/QtCore/QtCoremod.sip +@@ -23,5 +23,5 @@ + %Module(name=PyQt6.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt6, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True) + +-%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0 Qt_6_7_0 Qt_6_8_0} ++%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0 Qt_6_7_0 Qt_6_8_0 Qt_6_9_0} + + %Platforms {Android iOS Linux macOS WebAssembly Windows} +--- a/sip/QtXml/qdom.sip ++++ b/sip/QtXml/qdom.sip +@@ -159,6 +159,8 @@ + QDomNodeList(const QDomNodeList &); + ~QDomNodeList(); ++%If (- Qt_6_9_0) + bool operator==(const QDomNodeList &) const; + bool operator!=(const QDomNodeList &) const; ++%End + QDomNode item(int index) const; + QDomNode at(int index) const; diff --git a/dev-python/pyqt6/pyqt6-6.8.1.ebuild b/dev-python/pyqt6/pyqt6-6.8.1.ebuild index 2e3ee5c6dc7a..dd05b34a7311 100644 --- a/dev-python/pyqt6/pyqt6-6.8.1.ebuild +++ b/dev-python/pyqt6/pyqt6-6.8.1.ebuild @@ -97,6 +97,10 @@ BDEPEND=" dbus? ( virtual/pkgconfig ) " +PATCHES=( + "${FILESDIR}"/${PN}-6.8.1-qt690.patch +) + src_prepare() { default