diff options
Diffstat (limited to 'dev-python/pyqt6')
| -rw-r--r-- | dev-python/pyqt6/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch | 43 | ||||
| -rw-r--r-- | dev-python/pyqt6/pyqt6-6.8.1.ebuild | 4 |
3 files changed, 49 insertions, 1 deletions
diff --git a/dev-python/pyqt6/Manifest b/dev-python/pyqt6/Manifest index c6c4c055a756..845a652ff96e 100644 --- a/dev-python/pyqt6/Manifest +++ b/dev-python/pyqt6/Manifest @@ -1,6 +1,7 @@ AUX pyqt6-6.8.0-qt682.patch 286 BLAKE2B 382975396a5e1ea4ba6250300f596486378bcae136af923fdef96f14a15412a68d1f6d54ba62e706fdc13e3f142b09c472006f7fe4965385b4d9ae3e417667de SHA512 0433171b27d66e220858871e64d4e89020b1f13bc5d33df745a670bb3c06da1b4fbdd712880a83551f767f11152bf464c46b71ed163107d42b8ca3965e562198 +AUX pyqt6-6.8.1-qt690.patch 2050 BLAKE2B d2c35f0e84435ca5933643fd30eb426605e4805456757ee62a52427b62bff7023a76a279f03416592dbad8b7f0f437eccd346e8b73b37500dccfe95c5e5ae0e1 SHA512 95da6470f59dbd326155b76340df018d614d8d2df47abfc863a7b9d4ca82b2bee203a0fb96fb75d624efa29aa505d80844eef1d2daa3d519f4c86f365afbf596 DIST PyQt6-6.8.0.tar.gz 1061357 BLAKE2B da944a8ec6c5632cb24d56b5a268521cbf3ae17d307ec5aba292bf5f25e33cb2e92fef28c1bcc506c4e5ea60c9e2f714bfd2a95aefe2cc40726b4ec9fccb36cb SHA512 da57be66ede5fe1355ab1fd95e436c139e0d1dffc75f23f3933c20623d62fc9b9fad573d876e90d066588d2dc2f01e83771a0f05fe3b668fbb69a889ddfbcc15 DIST pyqt6-6.8.1.tar.gz 1064723 BLAKE2B 99ac44fe250b6ff7a1762df5d668b69ad424dc1b563147be7ba94ce7f00729c29ce17be4cd7c39b276549199b66d877dec69e9eeb6b394ed42f944f9155825fa SHA512 87727369168fde6e3edc488f96dd13d537f026e207e4b4ab1c95d09bf85859512a117dfc801249e0891425a6b5579830724e4145f370e2ef9909788f56eb4df6 EBUILD pyqt6-6.8.0.ebuild 5966 BLAKE2B 268bb16327be36ed5f8e9f8f01fdb5071845348ac8960d1410180c8025bd2ef176abf9468afab01563c4257011934605196f45cd92b36b55460339a6de06bb4b SHA512 cd5c43cebde064a78bb3c552a116a99666c85a744141a748af62ae6bc07cfd23091ca2d3b7463e7c5f89a38b79bc106347036a7b72daa098482a5a95c7d1ec69 -EBUILD pyqt6-6.8.1.ebuild 5984 BLAKE2B 3d08f8458db96b46b807af7485dc0e726796a6703d5bd76d9518eb8f1d413b17c98770391c43200d81e7dc7d2bcb0816897de2ef99746ed913e07efe4451c148 SHA512 3c33adfaa4899547ccad8a987657a0510bd0829d293697b8f366377017e4c785f2282863c3dd89bc91f0773e3cc760824c21c2e9b823e1301312f954509355a4 +EBUILD pyqt6-6.8.1.ebuild 6036 BLAKE2B b9163da6e46a9e0c551f9d059f3f85c8664bd1d675248853c1a93c98d439f2aac2ec851cc47258392f8d4148a7ec2d957ac2c385f6a9e003b7554b445985f776 SHA512 f0cd69e6dd96f0b5278d609ee62e436af441ebfb519af3d5a0c3df0a6e498d1c8643e2f39b0e2674791769da9b5c41d51b55000dcfa015ec1cded8985d0db130 MISC metadata.xml 2539 BLAKE2B 3a9f0274ffd41a0debd982cfe5bf5eb68350521947840c80c1064354cd7d219f30f2b1b56e25855bcc7f415d8d0260c52833f450cc663df6f6226092b7ff456d SHA512 5cb15c64ffbccd347a5ca5211f48587bb491cd51f29cf6bb6173f697b73014e1d0e3975daec488cc82231fe663a262bd8462230d8fbab8a4d330e5829173c360 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<unsigned>::flags() | QMetaType::IsEnumeration | QMetaType::IsUnsignedEnumeration; ++#else + mti->flags = QtPrivate::QMetaTypeForType<unsigned>::Flags | QMetaType::IsEnumeration | QMetaType::IsUnsignedEnumeration; ++#endif + mti->defaultCtr = QtPrivate::QMetaTypeForType<unsigned>::getDefaultCtr(); + mti->copyCtr = QtPrivate::QMetaTypeForType<unsigned>::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<int>::flags() | QMetaType::IsEnumeration; ++#else + mti->flags = QtPrivate::QMetaTypeForType<int>::Flags | QMetaType::IsEnumeration; ++#endif + mti->defaultCtr = QtPrivate::QMetaTypeForType<int>::getDefaultCtr(); + mti->copyCtr = QtPrivate::QMetaTypeForType<int>::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 |