diff --git a/packages/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-cxx11.patch b/packages/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-cxx11.patch new file mode 100644 index 00000000..e8ed54a8 --- /dev/null +++ b/packages/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-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 +Description: fix FTBFS + ~~~~ + library/forms/view.cpp:515:32: error: cannot convert 'boost::signals2::signal::result_type {aka boost::optional}' 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; + } + + //-------------------------------------------------------------------------------------------------- diff --git a/packages/dev-db/mysql-workbench/mysql-workbench-6.3.9.exheres-0 b/packages/dev-db/mysql-workbench/mysql-workbench-6.3.9.exheres-0 new file mode 100644 index 00000000..047f9aac --- /dev/null +++ b/packages/dev-db/mysql-workbench/mysql-workbench-6.3.9.exheres-0 @@ -0,0 +1,82 @@ +# Copyright 2017 Julian Ospald +# Distributed under the terms of the GNU General Public License v2 + +WORK=${WORKBASE}/${PN}-community-${PV}-src + +require cmake [ api=2 ] + +SUMMARY="MySQL Workbench" +HOMEPAGE="https://www.mysql.com/products/workbench/" +DOWNLOADS="https://dev.mysql.com/get/Downloads/MySQLGUITools/${PN}-community-${PV}-src.tar.gz + http://www.antlr3.org/download/antlr-3.4-complete.jar" + +LICENCES="GPL-2" +SLOT="0" +PLATFORMS="~amd64 ~x86" +MYOPTIONS="" + +# not 100% sure about tinyxml and net-tools +DEPENDENCIES=" + build: + dev-lang/swig + virtual/jre + virtual/pkg-config + build+run: + app-arch/libzip + dev-cpp/cairomm:1.0 + dev-cpp/ctemplate + dev-cpp/libsigc++:2 + dev-db/libiodbc + dev-db/mysql-connector-c++ + dev-db/vsqlite++ + dev-lang/python:2.7[sqlite] + dev-libs/boost + dev-libs/glib:2 + dev-libs/libxml2:2.0 + dev-libs/pcre + dev-libs/tinyxml + dev-python/paramiko[python_abis:2.7] + dev-python/pexpect[python_abis:2.7] + dev-python/pycairo[python_abis:2.7] + gnome-bindings/atkmm:1.6 + gnome-bindings/glibmm:2.4 + gnome-bindings/gtkmm:3 + gnome-bindings/pangomm:1.4 + gnome-desktop/libgnome-keyring + gnome-platform/libglade:2 + sci-libs/gdal + virtual/mysql + x11-dri/mesa + x11-libs/cairo + x11-libs/gdk-pixbuf:2.0 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + run: + sys-apps/net-tools +" + +BUGS_TO="hasufell@posteo.de" + +src_prepare() { + edo install -D "${FETCHEDDIR}"/antlr-3.4-complete.jar \ + "${WORKBASE}"/linux-res/bin/antlr-3.4-complete.jar + + # fix python detection + edo sed -i \ + -e '/find_package(PythonLibs 2.6)/d' \ + "${CMAKE_SOURCE}"/CMakeLists.txt + + cmake_src_prepare +} + +src_configure() { + CMAKE_SRC_CONFIGURE_PARAMS=( + -DIODBC_CONFIG_PATH="/usr/$(exhost --target)/bin/iodbc-config" + -DLIB_INSTALL_DIR="/usr/$(exhost --target)/lib" + -DSHARE_INSTALL_PREFIX=/usr/share + ) + + cmake_src_configure +} +