commit: f7d93f3628d736a51c55f2d498578d0f0d817120 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Wed May 7 17:40:28 2025 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Wed May 7 17:41:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d93f36
dev-db/mysql-workbench: fix compatibiilty with swig 4.3 Closes: https://bugs.gentoo.org/953480 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> .../files/mysql-workbench-8.0.41-swig-4.3.patch | 56 ++++++++++++++++++++++ .../mysql-workbench/mysql-workbench-8.0.41.ebuild | 1 + 2 files changed, 57 insertions(+) diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.41-swig-4.3.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.41-swig-4.3.patch new file mode 100644 index 000000000000..47a0eab9565b --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.41-swig-4.3.patch @@ -0,0 +1,56 @@ +Last-Update: 2025-03-01 +Forwarded: no +Author: Dmitry Smirnov <[email protected]> +Bug-Other: https://github.com/numpy/numpy/issues/27578 +Description: fix FTBFS with SWIG 4.3 +``` +error: too few arguments to function 'PyObject* SWIG_Python_AppendOutput +``` + +--- a/library/forms/swig/cairo.i ++++ b/library/forms/swig/cairo.i +@@ -124,9 +124,9 @@ + } + + %typemap(argout) cairo_text_extents_t *extents { + PyObject *o= SWIG_NewPointerObj(new cairo_text_extents_t(*$1), SWIGTYPE_p_cairo_text_extents_t, 0 | 0 ); +- $result= SWIG_Python_AppendOutput($result, o); ++ $result= SWIG_AppendOutput($result, o); + } + + %typemap(in) const char* (std::string s) { + if (PyUnicode_Check($input)) +--- a/library/forms/swig/mforms.i ++++ b/library/forms/swig/mforms.i +@@ -721,18 +721,18 @@ + } + + %typemap(argout) std::string &ret_password { + PyObject *o= PyUnicode_DecodeUTF8(($1)->data(), ($1)->size(), NULL); +- $result= SWIG_Python_AppendOutput($result, o); ++ $result= SWIG_AppendOutput($result, o); + } + + %typemap(in,numinputs=0) std::string &ret_password(std::string temp) { + $1 = &temp; + } + + %typemap(argout) std::string &ret_value { + PyObject *o= PyUnicode_DecodeUTF8(($1)->data(), ($1)->size(), NULL); +- $result= SWIG_Python_AppendOutput($result, o); ++ $result= SWIG_AppendOutput($result, o); + } + + %typemap(in,numinputs=0) std::string &ret_value(std::string temp) { + $1 = &temp; +@@ -740,9 +740,9 @@ + + + %typemap(argout) bool &ret_store { + if (*$1) Py_INCREF(Py_True); else Py_INCREF(Py_False); +- $result= SWIG_Python_AppendOutput($result, *$1 ? Py_True : Py_False); ++ $result= SWIG_AppendOutput($result, *$1 ? Py_True : Py_False); + } + + %typemap(in,numinputs=0) bool &ret_store(bool temp) { + temp = false; diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.41.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.41.ebuild index dea0ef3847ca..a462808bbd7c 100644 --- a/dev-db/mysql-workbench/mysql-workbench-8.0.41.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.41.ebuild @@ -70,6 +70,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch" "${FILESDIR}/${PN}-8.0.33-gcc13.patch" + "${FILESDIR}/${PN}-8.0.41-swig-4.3.patch" ) src_unpack() {
