diff options
Diffstat (limited to 'dev-python/pytqt')
| -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 |
2 files changed, 0 insertions, 84 deletions
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 - |