[arch-commits] Commit in mysql-workbench/trunk (2 files)

[Christian Hesse]

    Date: Thursday, October 22, 2015 @ 16:00:53
  Author: eworm
Revision: 144700

upgpkg: mysql-workbench 6.3.4-7

fix build against libsigc++ 2.6.1-1 by using ISO C++ 2011 standard

Added:
  mysql-workbench/trunk/0012-mysql-workbench-cpp11.patch
Modified:
  mysql-workbench/trunk/PKGBUILD

----------------------------------+
 0012-mysql-workbench-cpp11.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                         |   13 +++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

Added: 0012-mysql-workbench-cpp11.patch
===================================================================
--- 0012-mysql-workbench-cpp11.patch	                        (rev 0)
+++ 0012-mysql-workbench-cpp11.patch	2015-10-22 14:00:53 UTC (rev 144700)
@@ -0,0 +1,25 @@
+diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
+index 3f5104f..cdcca30 100644
+--- a/library/forms/swig/mforms.i
++++ b/library/forms/swig/mforms.i
+@@ -533,7 +533,7 @@ inline boost::function<void (mforms::TextEntryAction)> pycall_void_entryaction_f
+ 
+ #define SWIG_ADD_SIGNAL_BOOL_INT_CALLBACK(method, signal)\
+         void add_##method(PyObject *callback) { signal->connect(pycall_bool_int_fun(callback)); }\
+-        bool call_##method(int i) { return (*signal)(i); }
++        bool call_##method(int i) { return *( (*signal)(i) ); }
+ 
+ #define SWIG_ADD_SIGNAL_VOID_ENTRYACTION_CALLBACK(method, signal)\
+ 	void add_##method(PyObject *callback) { signal->connect(pycall_void_entryaction_fun(callback)); }
+diff --git a/library/forms/view.cpp b/library/forms/view.cpp
+index ec49389..67ff486 100644
+--- a/library/forms/view.cpp
++++ b/library/forms/view.cpp
+@@ -512,7 +512,7 @@ DropPosition View::get_drop_position()
+ bool View::mouse_leave()
+ {
+   if (_signal_mouse_leave.num_slots() > 0)
+-    return _signal_mouse_leave();
++    return *_signal_mouse_leave();
+   return false;
+ }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-22 13:58:22 UTC (rev 144699)
+++ PKGBUILD	2015-10-22 14:00:53 UTC (rev 144700)
@@ -7,7 +7,7 @@
 
 pkgname=mysql-workbench
 pkgver=6.3.4
-pkgrel=6
+pkgrel=7
 pkgdesc='A cross-platform, visual database design tool developed by MySQL'
 arch=('i686' 'x86_64')
 url='https://www.mysql.com/products/workbench/'
@@ -30,6 +30,7 @@
 	'0009-mysql-workbench-gnome-keyring.patch'
 	'0010-mysql-workbench-object.patch'
 	'0011-mysql-workbench-swig.patch'
+	'0012-mysql-workbench-cpp11.patch'
 	'arch_linux_profile.xml')
 sha256sums=('be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3'
             'SKIP'
@@ -39,6 +40,7 @@
             '9c2ae2fe7a4f59502bdcf591a07353c350b0ba29c3935c8242d97848cc0e50d3'
             'c8bbaee5d601333730bd200baa9514e880e4c5277b1241a67e267b602b400ded'
             'ac110e12ec775dd18400dc3e8ed2b0502ad857ea2b4c6c509481eaed1991a646'
+            'f76ffa7343b758ac0de2448e948c533e8623a0e426d293602ab7261c853ec684'
             '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
 
 prepare() {
@@ -60,6 +62,10 @@
 	# fix the swig workaround
 	patch -Np1 < "${srcdir}"/0011-mysql-workbench-swig.patch
 
+	# fix for C++11
+	# http://bugs.mysql.com/bug.php?id=78668
+	patch -Np1 < "${srcdir}"/0012-mysql-workbench-cpp11.patch
+
 	# fix GDAL
 	sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h
 
@@ -70,8 +76,11 @@
 build() {
 	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
 
+	# link to libsigc++, which requires ISO C++ 2011 standard
+	# so add the flag to enable c++11
 	cmake . \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DCMAKE_CXX_FLAGS="-std=c++11"
 
 	make
 }