summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-12-29 13:05:25 +0100
committerPacho Ramos <pacho@gentoo.org>2015-12-29 13:07:39 +0100
commit4905afbb4053aea415ce0c10f1f25f8b35f5fb2d (patch)
treecad3247c162f46fc49e48d82ef16bbdf6be86bbb /dev-db/mysql-workbench/files
parentmedia-sound/gnome-sound-recorder: Fix COMMON_DEPEND/RDEPEND/DEPEND usage (#56... (diff)
downloadgentoo-4905afbb4053aea415ce0c10f1f25f8b35f5fb2d.tar.gz
gentoo-4905afbb4053aea415ce0c10f1f25f8b35f5fb2d.tar.bz2
gentoo-4905afbb4053aea415ce0c10f1f25f8b35f5fb2d.zip
dev-db/mysql-workbench: Fix building with latest glibmm/libsigc++ (#566668)
Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-db/mysql-workbench/files')
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch
new file mode 100644
index 000000000000..e8ed54a8c705
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch
@@ -0,0 +1,39 @@
+Last-Update: 2015-10-24
+Forwarded: not-needed
+Bug-Upstream: https://bugs.mysql.com/bug.php?id=78668
+From: Marcin Szalowicz
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: fix FTBFS
+ ~~~~
+ library/forms/view.cpp:515:32: error: cannot convert 'boost::signals2::signal<bool()>::result_type {aka boost::optional<bool>}' to 'bool' in return
+ return _signal_mouse_leave();
+ ^
+ library/forms/CMakeFiles/mforms.dir/build.make:1865: recipe for target 'library/forms/CMakeFiles/mforms.dir/view.cpp.o' failed
+ ~~~~
+
+--- a/library/forms/swig/mforms.i
++++ b/library/forms/swig/mforms.i
+@@ -532,9 +532,9 @@
+ void add_##method(PyObject *callback) { signal->connect(pycall_void_toolbaritem_fun(callback)); }
+
+ #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)); }
+
+--- a/library/forms/view.cpp
++++ b/library/forms/view.cpp
+@@ -511,9 +511,9 @@
+
+ bool View::mouse_leave()
+ {
+ if (_signal_mouse_leave.num_slots() > 0)
+- return _signal_mouse_leave();
++ return *_signal_mouse_leave();
+ return false;
+ }
+
+ //--------------------------------------------------------------------------------------------------