diff options
Diffstat (limited to 'dev-python/pytqt')
| -rw-r--r-- | dev-python/pytqt/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch | 44 | ||||
| -rw-r--r-- | dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch | 40 | ||||
| -rw-r--r-- | dev-python/pytqt/pytqt-14.1.5.ebuild (renamed from dev-python/pytqt/pytqt-14.1.2-r1.ebuild) | 7 |
4 files changed, 2 insertions, 91 deletions
diff --git a/dev-python/pytqt/Manifest b/dev-python/pytqt/Manifest index d7422d64..7b7c0170 100644 --- a/dev-python/pytqt/Manifest +++ b/dev-python/pytqt/Manifest @@ -1,2 +1,2 @@ -DIST pytqt-trinity-14.1.2.tar.xz 460424 BLAKE2B 914865d589656a69dd7886dff71f207fe44dc6f94f5729cfdf42d9c82afca6fb298e682f44a98fc416f6bb20f6213db8985b825e44df8067d6f8a78478885fa6 SHA512 3204aebe83c983d213e8ef1eeb033661bd50a381b75505991fe6d346430cb72d10085f789153d46ac2886e4d34a789ecac9abb1ed93e2134f671f47d1a3b024d DIST pytqt-trinity-14.1.4.tar.xz 460500 BLAKE2B a9a71819cec892b6281a11492191df8e51d0a14886497682ed2d29717f17df87a48d7e4b676fc0609c5096ca9fdd71d407b36734268fed3294888667317ad790 SHA512 7730e4405da3f2875182fc8e573f05e6bfce649b7ca222dd5ca98885513d56a6c45d967e1f9e951b9ae777bfc99a14238c2059b87ba1441ab360610b29650175 +DIST pytqt-trinity-14.1.5.tar.xz 460440 BLAKE2B de563a0fbd57d8db58fbaddfaad4a146c5e21233aa30630564abffd18c3ba87cf1a5ec533542387e766d004fb647923d2c3bd49e3a865e307021a9767a166391 SHA512 73dc9eea9c19c5cae7ba62b2af6b42b9ff713d27564f9201b46b1a95980dbf049eebfddd738ce96faa0f95ed4c2d1367b18c944e3c45a7d0a0f36ccdfa91eef1 diff --git a/dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch b/dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch deleted file mode 100644 index 09119cd2..00000000 --- a/dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/pytquic3/form.cpp b/pytquic3/form.cpp -index b0de614..323161e 100644 ---- a/pytquic3/form.cpp -+++ b/pytquic3/form.cpp -@@ -340,12 +340,12 @@ void Uic::createFormImpl( const TQDomElement &e ) - images += img; - out << indent << img << "_data = \\" << endl; - ++indent; -- out << indent << "\""; -+ out << indent << "b\""; - int a ; - for ( a = 0; a < (int) (data.length()/2)-1; a++ ) { - out << "\\x" << TQString(data[2*a]) << TQString(data[2*a+1]); - if ( a % 12 == 11 ) -- out << "\" \\" << endl << indent << "\""; -+ out << "\" \\" << endl << indent << "b\""; - } - out << "\\x" << TQString(data[2*a]) << TQString(data[2*a+1]) << "\"" << endl; - --indent; -@@ -391,7 +391,7 @@ void Uic::createFormImpl( const TQDomElement &e ) - TQStringList::Iterator it; - for ( it = images.begin(); it != images.end(); ++it ) { - out << indent << "self." << (*it) << " = TQPixmap()" << endl; -- out << indent << "self." << (*it) << ".loadFromData(" << (*it) << "_data,\"PNG\")" << endl; -+ out << indent << "self." << (*it) << ".loadFromData(" << (*it) << "_data,b\"PNG\")" << endl; - } - } - // create pixmaps for all images -diff --git a/pytquic3/uic.cpp b/pytquic3/uic.cpp -index d5d89dc..e4a5ad0 100644 ---- a/pytquic3/uic.cpp -+++ b/pytquic3/uic.cpp -@@ -387,9 +387,9 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent ) - for ( TQDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { - TQString objName = registerObject( getObjectName( ae ) ); - if ( ae.tagName() == "action" ) -- out << indent << "self." << objName << " = TQAction(" << parent << ",\"" << objName << "\")" << endl; -+ out << indent << "self." << objName << " = TQAction(" << parent << ",b\"" << objName << "\")" << endl; - else if ( ae.tagName() == "actiongroup" ) -- out << indent << "self." << objName << " = TQActionGroup(" << parent << ",\"" << objName << "\")" << endl; -+ out << indent << "self." << objName << " = TQActionGroup(" << parent << ",b\"" << objName << "\")" << endl; - else - continue; - bool subActionsDone = FALSE; diff --git a/dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch b/dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch deleted file mode 100644 index f23b1b5d..00000000 --- a/dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5afb6e8ec49253cda4285b4a0ca76a37f0d30689 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr> -Date: Wed, 25 Sep 2024 21:01:39 +0200 -Subject: [PATCH 1/3] Fix FTBFS with Python 3.13. This solves issue #32. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: François Andriot <albator78@libertysurf.fr> -(cherry picked from commit d0ab12dc39963aa28698943bf4ad88d3fd3d4c51) ---- - sip/tqt/tqstring.sip | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/sip/tqt/tqstring.sip b/sip/tqt/tqstring.sip -index 8ef101f..6e09d0f 100644 ---- a/sip/tqt/tqstring.sip -+++ b/sip/tqt/tqstring.sip -@@ -890,9 +890,16 @@ const char *PyTQt_tqt_encode(PyObject **s, TQApplication::Encoding encoding) - es = PyBytes_AS_STRING(obj); - Py_INCREF(obj); - } -- else if (PyObject_AsCharBuffer(obj, &es, &sz) >= 0) -+ else - { -- Py_INCREF(obj); -+ Py_buffer view; -+ -+ if (PyObject_GetBuffer(obj, &view, PyBUF_SIMPLE) == 0) { -+ es = (const char*)view.buf; -+ sz = view.len; -+ PyBuffer_Release(&view); -+ Py_INCREF(obj); -+ } - } - - if (es) --- -2.49.1 - diff --git a/dev-python/pytqt/pytqt-14.1.2-r1.ebuild b/dev-python/pytqt/pytqt-14.1.5.ebuild index 9ca4fab1..1531b85b 100644 --- a/dev-python/pytqt/pytqt-14.1.2-r1.ebuild +++ b/dev-python/pytqt/pytqt-14.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2025 The Trinity Desktop Project +# Copyright 2022-2026 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -28,11 +28,6 @@ RDEPEND="${DEPEND}" TQBASE="/usr/tqt3" BUILD_DIR="${S}" -PATCHES=( - "${FILESDIR}/${P}-Changing-string-types-to-bytes-for-pytquic.patch" - "${FILESDIR}/${P}-Fix-FTBFS-with-Python-3.13.patch" -) - src_prepare() { default } |