From 3881e851fa1f8baddfe76fee30b7dc5a40c8b7e3 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Fri, 20 Feb 2026 16:46:46 +0300 Subject: */*: tree-clean unused patches Signed-off-by: Alexander Golubev --- ...-FTBFS-caused-by-mkpath-returning-nothing.patch | 91 ---------------- ...hanging-string-types-to-bytes-for-pytquic.patch | 44 -------- .../pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch | 40 ------- ...-14.1.2-Added-prototype-of-yylex-function.patch | 27 ----- ...ip4-tqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch | 116 --------------------- dev-tqt/tqt/files/tqt-buffer.patch | 29 ------ 6 files changed, 347 deletions(-) delete mode 100644 dev-python/pytdeextensions/files/pytdeextensions-14.1.2-Fix-FTBFS-caused-by-mkpath-returning-nothing.patch delete mode 100644 dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch delete mode 100644 dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch delete mode 100644 dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Added-prototype-of-yylex-function.patch delete mode 100644 dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch delete mode 100644 dev-tqt/tqt/files/tqt-buffer.patch diff --git a/dev-python/pytdeextensions/files/pytdeextensions-14.1.2-Fix-FTBFS-caused-by-mkpath-returning-nothing.patch b/dev-python/pytdeextensions/files/pytdeextensions-14.1.2-Fix-FTBFS-caused-by-mkpath-returning-nothing.patch deleted file mode 100644 index 847da6ce..00000000 --- a/dev-python/pytdeextensions/files/pytdeextensions-14.1.2-Fix-FTBFS-caused-by-mkpath-returning-nothing.patch +++ /dev/null @@ -1,91 +0,0 @@ -From ecdb0099bd14fc440a09219bd3df5672208c483c Mon Sep 17 00:00:00 2001 -From: Michele Calgaro -Date: Fri, 17 Jan 2025 21:39:35 +0900 -Subject: [PATCH 27/35] Fix FTBFS caused by 'mkpath' returning nothing - -Signed-off-by: Michele Calgaro ---- - setup.py | 3 ++- - src/tdedistutils.py | 18 ++++++++++++------ - 2 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/setup.py b/setup.py -index fa41586..8690ffa 100755 ---- a/setup.py -+++ b/setup.py -@@ -318,6 +318,7 @@ class InstallLibpythonize(Command): - return self.outfiles - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - main() -diff --git a/src/tdedistutils.py b/src/tdedistutils.py -index e8cd35e..8487708 100644 ---- a/src/tdedistutils.py -+++ b/src/tdedistutils.py -@@ -373,7 +373,8 @@ class InstallApplicationDataAndLinks(install_data): - self.outfiles.extend( [item+'c' for item in self.outfiles if item.endswith('.py')] ) - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - ########################################################################### - class InstallExecutableLinks(Command): -@@ -415,7 +416,8 @@ class InstallExecutableLinks(Command): - return self.outfiles or [] - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - ########################################################################### - # Fix the --root option for the install_lib command. -@@ -1121,7 +1123,8 @@ class InstallKControlModule(Command): - return self.outfiles or [] - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - ########################################################################### - class BuildDocbookHTML(Command): -@@ -1240,7 +1243,8 @@ class InstallDocbookHTML(Command): - return self.outfiles or [] - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - ########################################################################### - class UpdateI18NMessages(Command): -@@ -1431,7 +1435,8 @@ class InstallI18NMessages(Command): - return self.outfiles - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - - ########################################################################### -@@ -2000,7 +2005,8 @@ class InstallTdeioslave(Command): - return self.outfiles or [] - - def mkpath(self, name, mode=0o777): -- return dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ dir_util.mkpath(name, mode, dry_run=self.dry_run) -+ return name - - ########################################################################### - class CheckPyTQt(Command): --- -2.49.1 - 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?= -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 -(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/sip4-tqt/files/sip4-tqt-14.1.2-Added-prototype-of-yylex-function.patch b/dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Added-prototype-of-yylex-function.patch deleted file mode 100644 index 6b511623..00000000 --- a/dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Added-prototype-of-yylex-function.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7f3c0748d4c8d3c601a3ff1c6913e6fc6ea4cfcd Mon Sep 17 00:00:00 2001 -From: ormorph -Date: Tue, 16 Jul 2024 16:50:34 +0300 -Subject: [PATCH 1/9] Added prototype of yylex() function Required for building - with the new gcc-14 - -Signed-off-by: ormorph -(cherry picked from commit dc7ba7a6d7019e4cd4fc2f33fbee4ec53ff8420a) ---- - sipgen/parser.y | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sipgen/parser.y b/sipgen/parser.y -index 2ed1b4e..05a12c1 100644 ---- a/sipgen/parser.y -+++ b/sipgen/parser.y -@@ -24,6 +24,7 @@ - #include "sip.h" - - void yyerror(char* s); -+int yylex(); - - #define MAX_NESTED_IF 10 - #define MAX_NESTED_SCOPE 10 --- -2.49.1 - diff --git a/dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch b/dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch deleted file mode 100644 index f2901957..00000000 --- a/dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch +++ /dev/null @@ -1,116 +0,0 @@ -From fa5e4646122884c24513931d95b363ee47f62520 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= -Date: Wed, 25 Sep 2024 20:51:56 +0200 -Subject: [PATCH] Fix FTBFS with Python 3.13. This solves issue #26. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: François Andriot -(cherry picked from commit 4ab9fdc0fc73f41d54bab0c9030d9645ac0bf18e) ---- - siplib/siplib.c | 50 +++++++++++++++++++++++++++++++++++++++---------- - siplib/tqtlib.c | 2 +- - 2 files changed, 41 insertions(+), 11 deletions(-) - -diff --git a/siplib/siplib.c b/siplib/siplib.c -index f2ac7be..27b9e35 100644 ---- a/siplib/siplib.c -+++ b/siplib/siplib.c -@@ -1691,7 +1691,7 @@ static PyObject *sip_api_call_method(int *isErr, PyObject *method, - va_start(va,fmt); - - if ((args = PyTuple_New(strlen(fmt))) != NULL && buildObject(args,fmt,va) != NULL) -- res = PyEval_CallObject(method,args); -+ res = PyObject_CallObject(method,args); - else - { - res = NULL; -@@ -9635,18 +9635,37 @@ static PyObject *parseString_AsEncodedString(PyObject *bytes, PyObject *obj, - static int parseBytes_AsCharArray(PyObject *obj, const char **ap, - SIP_SSIZE_T *aszp) - { -+ const char *a; -+ SIP_SSIZE_T asz; -+ - if (obj == Py_None) - { -- *ap = NULL; -- *aszp = 0; -+ a = NULL; -+ asz = 0; - } - else if (PyBytes_Check(obj)) - { -- *ap = PyBytes_AS_STRING(obj); -- *aszp = PyBytes_GET_SIZE(obj); -+ a = PyBytes_AS_STRING(obj); -+ asz = PyBytes_GET_SIZE(obj); - } -- else if (PyObject_AsCharBuffer(obj, ap, aszp) < 0) -- return -1; -+ else -+ { -+ Py_buffer view; -+ -+ if (PyObject_GetBuffer(obj, &view, PyBUF_SIMPLE) < 0) -+ return -1; -+ -+ a = view.buf; -+ asz = view.len; -+ -+ PyBuffer_Release(&view); -+ } -+ -+ if (ap) -+ *ap = a; -+ -+ if (aszp) -+ *aszp = asz; - - return 0; - } -@@ -9665,13 +9684,24 @@ static int parseBytes_AsChar(PyObject *obj, char *ap) - chp = PyBytes_AS_STRING(obj); - sz = PyBytes_GET_SIZE(obj); - } -- else if (PyObject_AsCharBuffer(obj, &chp, &sz) < 0) -- return -1; -+ else -+ { -+ Py_buffer view; -+ -+ if (PyObject_GetBuffer(obj, &view, PyBUF_SIMPLE) < 0) -+ return -1; -+ -+ chp = view.buf; -+ sz = view.len; -+ -+ PyBuffer_Release(&view); -+ } - - if (sz != 1) - return -1; - -- *ap = *chp; -+ if (ap) -+ *ap = *chp; - - return 0; - } -diff --git a/siplib/tqtlib.c b/siplib/tqtlib.c -index d59c138..1fa8cfa 100644 ---- a/siplib/tqtlib.c -+++ b/siplib/tqtlib.c -@@ -196,7 +196,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) - { - PyObject *nsa, *xtype, *xvalue, *xtb, *resobj; - -- if ((resobj = PyEval_CallObject(sfunc, sa)) != NULL) -+ if ((resobj = PyObject_CallObject(sfunc, sa)) != NULL) - { - Py_DECREF(sfunc); - Py_XDECREF(sref); --- -2.49.1 - diff --git a/dev-tqt/tqt/files/tqt-buffer.patch b/dev-tqt/tqt/files/tqt-buffer.patch deleted file mode 100644 index abe642c3..00000000 --- a/dev-tqt/tqt/files/tqt-buffer.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/tools/qglobal.cpp -+++ b/src/tools/qglobal.cpp -@@ -520,7 +520,7 @@ void tqDebug( const char *msg, ... ) - va_list ap; - va_start( ap, msg ); // use variable arg list - #if defined(QT_VSNPRINTF) -- QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH, msg, ap ); -+ QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH-len, msg, ap ); - #else - vsprintf( &buf[len], msg, ap ); - #endif -@@ -555,7 +555,7 @@ void tqWarning( const char *msg, ... ) - va_list ap; - va_start( ap, msg ); // use variable arg list - #if defined(QT_VSNPRINTF) -- QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH, msg, ap ); -+ QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH-len, msg, ap ); - #else - vsprintf( &buf[len], msg, ap ); - #endif -@@ -590,7 +590,7 @@ void tqFatal( const char *msg, ... ) - va_list ap; - va_start( ap, msg ); // use variable arg list - #if defined(QT_VSNPRINTF) -- QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH, msg, ap ); -+ QT_VSNPRINTF( &buf[len], QT_BUFFER_LENGTH-len, msg, ap ); - #else - vsprintf( &buf[len], msg, ap ); - #endif -- cgit v1.2.3