Date: Friday, August 28, 2015 @ 10:49:34 Author: eworm Revision: 138851
upgpkg: mysql-workbench 6.3.4-4 swig 3.0.6 has been fixed, we have to revert a workaround Added: mysql-workbench/trunk/0011-mysql-workbench-swig.patch Modified: mysql-workbench/trunk/PKGBUILD ---------------------------------+ 0011-mysql-workbench-swig.patch | 40 ++++++++++++++++++++++++++++++++++++++ PKGBUILD | 7 +++++- 2 files changed, 46 insertions(+), 1 deletion(-) Added: 0011-mysql-workbench-swig.patch =================================================================== --- 0011-mysql-workbench-swig.patch (rev 0) +++ 0011-mysql-workbench-swig.patch 2015-08-28 08:49:34 UTC (rev 138851) @@ -0,0 +1,40 @@ +From f972aaad2c9e762d61c43d93467b9e03010594cf Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +Date: Thu, 27 Aug 2015 20:23:03 +0200 +Subject: [PATCH 1/1] swig 3.0.6 changed behaviour again - revert + +Signed-off-by: Christian Hesse <[email protected]> +--- + library/forms/mforms/textbox.h | 2 +- + library/forms/swig/mforms.i | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/library/forms/mforms/textbox.h b/library/forms/mforms/textbox.h +index d244a8f..1989592 100644 +--- a/library/forms/mforms/textbox.h ++++ b/library/forms/mforms/textbox.h +@@ -72,7 +72,7 @@ namespace mforms { + class MFORMS_EXPORT TextBox : public View + { + #ifdef SWIG +-#if SWIG_VERSION < 0x030003 // starting with SWIG v3.0.3, this is no longer necessary (https://github.com/swig/swig/pull/201) ++#if SWIG_VERSION < 0x030003 || SWIG_VERSION >= 0x030006 // starting with SWIG v3.0.3, this is no longer necessary (https://github.com/swig/swig/pull/201) + //workaround for problem with unicode strings and default args in swig + %rename(append_text_and_scroll) append_text(const std::string &text, bool scroll_to_end); + %rename(append_text) append_text(const std::string &text); +diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i +index 7e0775c..7ae6f6f 100644 +--- a/library/forms/swig/mforms.i ++++ b/library/forms/swig/mforms.i +@@ -1129,7 +1129,7 @@ SWIG_ADD_SIGNAL_VOID_CALLBACK(deactivated_callback, self->signal_deactivated()); + + %extend mforms::TextBox { + SWIG_ADD_SIGNAL_VOID_CALLBACK(changed_callback, self->signal_changed()); +-#if SWIG_VERSION >= 0x030003 // SWIG v3.0.3 changed its behaviour and broke compatibility (https://github.com/swig/swig/pull/201). This is a workaround to make it work again. ++#if SWIG_VERSION >= 0x030003 && SWIG_VERSION < 0x030006 // SWIG v3.0.3 changed its behaviour and broke compatibility (https://github.com/swig/swig/pull/201). This is a workaround to make it work again. + void append_text_and_scroll(const std::string &text, bool scroll_to_end= false) + { + self->append_text(text, scroll_to_end); +-- +2.5.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-28 07:27:54 UTC (rev 138850) +++ PKGBUILD 2015-08-28 08:49:34 UTC (rev 138851) @@ -7,7 +7,7 @@ pkgname=mysql-workbench pkgver=6.3.4 -pkgrel=4 +pkgrel=5 pkgdesc='A cross-platform, visual database design tool developed by MySQL' arch=('i686' 'x86_64') url='https://www.mysql.com/products/workbench/' @@ -29,6 +29,7 @@ '0007-mysql-workbench-no-set-gtid-purged.patch' '0009-mysql-workbench-gnome-keyring.patch' '0010-mysql-workbench-object.patch' + '0011-mysql-workbench-swig.patch' 'arch_linux_profile.xml') sha256sums=('be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3' 'SKIP' @@ -37,6 +38,7 @@ 'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865' '9c2ae2fe7a4f59502bdcf591a07353c350b0ba29c3935c8242d97848cc0e50d3' 'c8bbaee5d601333730bd200baa9514e880e4c5277b1241a67e267b602b400ded' + 'ac110e12ec775dd18400dc3e8ed2b0502ad857ea2b4c6c509481eaed1991a646' '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e') prepare() { @@ -55,6 +57,9 @@ # fix cannot call member function without object patch -Np1 < "${srcdir}"/0010-mysql-workbench-object.patch + # fix the swig workaround + patch -Np1 < "${srcdir}"/0011-mysql-workbench-swig.patch + # fix GDAL sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h
