diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2026-02-20 16:46:46 +0300 |
|---|---|---|
| committer | Fat-Zer <fatzer2@gmail.com> | 2026-02-20 15:08:02 +0000 |
| commit | 3881e851fa1f8baddfe76fee30b7dc5a40c8b7e3 (patch) | |
| tree | 6d7f3438b1865dbd2b81703c3465a878360878c2 /dev-python/sip4-tqt | |
| parent | c65dfd5ba71508d4ab57e920f61809929f1cf603 (diff) | |
| download | tde-packaging-gentoo-3881e851fa1f8baddfe76fee30b7dc5a40c8b7e3.tar.gz tde-packaging-gentoo-3881e851fa1f8baddfe76fee30b7dc5a40c8b7e3.zip | |
*/*: tree-clean unused patches
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
Diffstat (limited to 'dev-python/sip4-tqt')
| -rw-r--r-- | dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Added-prototype-of-yylex-function.patch | 27 | ||||
| -rw-r--r-- | dev-python/sip4-tqt/files/sip4-tqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch | 116 |
2 files changed, 0 insertions, 143 deletions
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 <roma251078@mail.ru> -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 <roma251078@mail.ru> -(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?= <francois.andriot@thalesgroup.com> -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 <albator78@libertysurf.fr> -(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 - |
