* [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6/, dev-python/PyQt6/files/
@ 2023-12-13 2:53 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2023-12-13 2:53 UTC (permalink / raw
To: gentoo-commits
commit: db7dd9f234f68a89e1b9da5e973d2e038b1c5131
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 21:57:45 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 02:52:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7dd9f2
dev-python/PyQt6: fix build with upcoming qtbase-6.7.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-python/PyQt6/PyQt6-6.6.1.ebuild | 4 ++
dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch | 77 ++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
index 4dee14aeda33..b5abeb38b190 100644
--- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
@@ -84,6 +84,10 @@ BDEPEND="
dbus? ( virtual/pkgconfig )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.6.1-qt670.patch
+)
+
src_prepare() {
default
diff --git a/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch b/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch
new file mode 100644
index 000000000000..64c4aa303836
--- /dev/null
+++ b/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch
@@ -0,0 +1,77 @@
+Early workarounds to fix build with upcoming Qt6.7.0 not to have
+to wait for the matching PyQt6-6.7.0. Not fully correct fixes,
+but should be better than failing. May need revision given 6.7
+apis are not finalized as of the writing of this.
+
+Caused by the following commits:
+https://github.com/qt/qtbase/commit/fd48ce0b73c (qdatastream+pyqtpyboject)
+> qsizetype is ssize_t and ends up more correct (e.g. for Py_ssize_t)
+https://github.com/qt/qtbase/commit/7a3fed3f209 (qtimezone)
+> removed, can just drop these if 6.7 and ignore the replacement
+https://github.com/qt/qtbase/commit/19bc5de296a (qfont)
+https://github.com/qt/qtbase/commit/bde443801fe (qfont)
+> these tag features are new'ish (and changing) and only available if
+> >=6.6 as-is, let's just drop them if 6.7 as no revdeps should need yet
+--- a/qpy/QtCore/qpycore_pyqtpyobject.cpp
++++ b/qpy/QtCore/qpycore_pyqtpyobject.cpp
+@@ -173,9 +173,13 @@
+ {
+ char *ser;
++#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
++ qsizetype len;
++#else
+ uint len;
++#endif
+
+ in.readBytes(ser, len);
+
+- if (len)
++ if (len > 0)
+ {
+ static PyObject *loads = 0;
+--- 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}
++%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}
+
+ %Platforms {Android iOS Linux macOS WebAssembly Windows}
+--- a/sip/QtCore/qdatastream.sip
++++ b/sip/QtCore/qdatastream.sip
+@@ -123,5 +123,9 @@
+ %MethodCode
+ char *s;
++#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
++ qsizetype l;
++#else
+ uint l;
++#endif
+
+ Py_BEGIN_ALLOW_THREADS
+--- a/sip/QtCore/qtimezone.sip
++++ b/sip/QtCore/qtimezone.sip
+@@ -72,6 +72,8 @@
+ ~QTimeZone();
+ void swap(QTimeZone &other /Constrained/);
++%If (- Qt_6_7_0)
+ bool operator==(const QTimeZone &other) const;
+ bool operator!=(const QTimeZone &other) const;
++%End
+ bool isValid() const;
+ QByteArray id() const;
+--- a/sip/QtGui/qfont.sip
++++ b/sip/QtGui/qfont.sip
+@@ -209,4 +209,5 @@
+ QStringList families() const;
+ void setFamilies(const QStringList &);
++%If (- Qt_6_7_0)
+ %If (Qt_6_6_0 -)
+ void setFeature(quint32 tag, quint32 value);
+@@ -239,4 +240,5 @@
+ static quint32 stringToTag(const char *tagString /Encoding="None"/);
+ %End
++%End
+ };
+
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6/, dev-python/PyQt6/files/
@ 2024-06-28 14:45 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2024-06-28 14:45 UTC (permalink / raw
To: gentoo-commits
commit: da2a48069d263e7b6fe01d196d91a8a452316dfc
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 11:04:32 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 14:44:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2a4806
dev-python/PyQt6: drop 6.6.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-python/PyQt6/Manifest | 1 -
dev-python/PyQt6/PyQt6-6.6.1.ebuild | 182 -------------------------
dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch | 77 -----------
3 files changed, 260 deletions(-)
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index de48659232eb..a05196bcef53 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,2 +1 @@
-DIST PyQt6-6.6.1.tar.gz 1043203 BLAKE2B dd2b6988ebeabaae47fe57c5c0d17fbe4b62c377262b4bb360adb7fd6724ccb6a67ba5c2bd7498df98db3ce6b00978f936b11a43b464c3c7af169f25b30ee1a6 SHA512 c2ff8c47c9b0e43c009d0c90f565a54344e6f384c67dd30c2d422465d0702c07713acc0095c8b67827d1146675611c07d548ba282a26e41bb60a0a21977a7a64
DIST PyQt6-6.7.0.tar.gz 1050408 BLAKE2B 30dc8a2762cb5a149c401d497af714bb9209bc46847c0699522ee60080c46f0b1d4da854e70151a508c90820a2aa32da422bfd20c4320bcc9b5d5f92fd9e8677 SHA512 619210d2de3e149b55e2d45cbd8ec2113b3effcaccd25eef6067ea99b82e250f1ce288b38136604536053690071f8c843339b934b5ce5e539a5dfdecc26f44d2
diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
deleted file mode 100644
index 804dd5543081..000000000000
--- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-
-# 'can' work with older Qt depending on features, but keeping it simple
-QT_PV=$(ver_cut 1-2):6
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-# defaults match what is provided with qtbase by default (except testlib),
-# reduces the need to set flags but does increase build time a fair amount
-IUSE="
- bluetooth +dbus debug designer examples gles2-only +gui help
- multimedia +network nfc opengl pdfium positioning +printsupport
- qml quick quick3d serialport sensors spatialaudio speech +sql
- +ssl svg testlib webchannel websockets +widgets +xml
-"
-# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
-REQUIRED_USE="
- designer? ( gui widgets )
- help? ( gui widgets )
- multimedia? ( gui network )
- opengl? ( gui )
- pdfium? ( gui )
- printsupport? ( gui widgets )
- qml? ( network )
- quick3d? ( gui qml )
- quick? ( gui qml )
- spatialaudio? ( multimedia )
- sql? ( widgets )
- svg? ( gui )
- testlib? ( gui widgets )
- webchannel? ( network )
- websockets? ( network )
- widgets? ( gui )
-"
-
-# may use qt private symbols wrt qtbase's :=
-DEPEND="
- >=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?]
- bluetooth? ( >=dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- sys-apps/dbus
- )
- designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
- help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
- nfc? ( >=dev-qt/qtconnectivity-${QT_PV}[nfc] )
- opengl? (
- gles2-only? ( media-libs/libglvnd )
- )
- pdfium? ( >=dev-qt/qtwebengine-${QT_PV}[pdfium,widgets?] )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
- qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
- quick? ( >=dev-qt/qtdeclarative-${QT_PV}[opengl] )
- sensors? ( >=dev-qt/qtsensors-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- speech? (
- >=dev-qt/qtdeclarative-${QT_PV}
- >=dev-qt/qtspeech-${QT_PV}
- )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-"
-RDEPEND="
- ${DEPEND}
- >=dev-python/PyQt6-sip-13.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}]
- >=dev-python/sip-6.7.12[${PYTHON_USEDEP}]
- >=dev-qt/qtbase-${QT_PV}
- dbus? ( virtual/pkgconfig )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.6.1-qt670.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
-
- pyqt_use_enable() {
- local state=$(usex ${1} --enable= --disable=)
- shift
- echo ${*/#/${state}}
- }
-
- DISTUTILS_ARGS=(
- --jobs="$(makeopts_jobs)"
- --qmake="$(qt6_get_bindir)"/qmake
- --qmake-setting="$(qt6_get_qmake_args)"
- --verbose
- --confirm-license
-
- --enable=QtCore
-
- $(pyqt_use_enable bluetooth QtBluetooth)
- $(pyqt_use_enable dbus QtDBus)
- $(pyqt_use_enable designer QtDesigner)
- $(pyqt_use_enable help QtHelp)
- $(pyqt_use_enable gui QtGui)
- #--disable=QtLocation # force-disabled in project.py
- $(pyqt_use_enable multimedia QtMultimedia \
- $(usev widgets QtMultimediaWidgets))
- $(pyqt_use_enable network QtNetwork)
- $(pyqt_use_enable nfc QtNfc)
- $(pyqt_use_enable opengl QtOpenGL \
- $(usev widgets QtOpenGLWidgets))
- $(pyqt_use_enable pdfium QtPdf \
- $(usev widgets QtPdfWidgets))
- $(pyqt_use_enable positioning QtPositioning)
- $(pyqt_use_enable printsupport QtPrintSupport)
- $(pyqt_use_enable qml QtQml)
- $(pyqt_use_enable quick QtQuick \
- $(usev widgets QtQuickWidgets))
- $(pyqt_use_enable quick3d QtQuick3D)
- --disable=QtRemoteObjects # not packaged
- $(pyqt_use_enable sensors QtSensors)
- $(pyqt_use_enable serialport QtSerialPort)
- $(pyqt_use_enable spatialaudio QtSpatialAudio)
- $(pyqt_use_enable sql QtSql)
- $(pyqt_use_enable svg QtSvg \
- $(usev widgets QtSvgWidgets))
- $(pyqt_use_enable testlib QtTest)
- $(pyqt_use_enable speech QtTextToSpeech)
- $(pyqt_use_enable webchannel QtWebChannel)
- $(pyqt_use_enable websockets QtWebSockets)
- $(pyqt_use_enable widgets QtWidgets)
- $(pyqt_use_enable xml QtXml)
-
- $(usev debug '--debug --qml-debug --tracing')
-
- $(usev !dbus --no-dbus-python)
- # note: upstream currently intentionally skips installing these two
- # plugins when using wheels w/ pep517 so, *if* something does need
- # them, it will need to be handled manually
- $(usev !designer --no-designer-plugin)
- $(usev !qml --no-qml-plugin)
-
- $(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
- $(usev !opengl --disabled-feature=PyQt_OpenGL)
- $(usev !ssl --disabled-feature=PyQt_SSL)
-
- # intended for Windows / Android or others
- --disable=QAxContainer
- --disabled-feature=PyQt_Permissions
- )
-}
-
-python_install_all() {
- einstalldocs
- use examples && dodoc -r examples
-}
diff --git a/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch b/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch
deleted file mode 100644
index 64c4aa303836..000000000000
--- a/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Early workarounds to fix build with upcoming Qt6.7.0 not to have
-to wait for the matching PyQt6-6.7.0. Not fully correct fixes,
-but should be better than failing. May need revision given 6.7
-apis are not finalized as of the writing of this.
-
-Caused by the following commits:
-https://github.com/qt/qtbase/commit/fd48ce0b73c (qdatastream+pyqtpyboject)
-> qsizetype is ssize_t and ends up more correct (e.g. for Py_ssize_t)
-https://github.com/qt/qtbase/commit/7a3fed3f209 (qtimezone)
-> removed, can just drop these if 6.7 and ignore the replacement
-https://github.com/qt/qtbase/commit/19bc5de296a (qfont)
-https://github.com/qt/qtbase/commit/bde443801fe (qfont)
-> these tag features are new'ish (and changing) and only available if
-> >=6.6 as-is, let's just drop them if 6.7 as no revdeps should need yet
---- a/qpy/QtCore/qpycore_pyqtpyobject.cpp
-+++ b/qpy/QtCore/qpycore_pyqtpyobject.cpp
-@@ -173,9 +173,13 @@
- {
- char *ser;
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-+ qsizetype len;
-+#else
- uint len;
-+#endif
-
- in.readBytes(ser, len);
-
-- if (len)
-+ if (len > 0)
- {
- static PyObject *loads = 0;
---- 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}
-+%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}
-
- %Platforms {Android iOS Linux macOS WebAssembly Windows}
---- a/sip/QtCore/qdatastream.sip
-+++ b/sip/QtCore/qdatastream.sip
-@@ -123,5 +123,9 @@
- %MethodCode
- char *s;
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-+ qsizetype l;
-+#else
- uint l;
-+#endif
-
- Py_BEGIN_ALLOW_THREADS
---- a/sip/QtCore/qtimezone.sip
-+++ b/sip/QtCore/qtimezone.sip
-@@ -72,6 +72,8 @@
- ~QTimeZone();
- void swap(QTimeZone &other /Constrained/);
-+%If (- Qt_6_7_0)
- bool operator==(const QTimeZone &other) const;
- bool operator!=(const QTimeZone &other) const;
-+%End
- bool isValid() const;
- QByteArray id() const;
---- a/sip/QtGui/qfont.sip
-+++ b/sip/QtGui/qfont.sip
-@@ -209,4 +209,5 @@
- QStringList families() const;
- void setFamilies(const QStringList &);
-+%If (- Qt_6_7_0)
- %If (Qt_6_6_0 -)
- void setFeature(quint32 tag, quint32 value);
-@@ -239,4 +240,5 @@
- static quint32 stringToTag(const char *tagString /Encoding="None"/);
- %End
-+%End
- };
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-28 14:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-13 2:53 [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6/, dev-python/PyQt6/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-06-28 14:45 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox