diff options
Diffstat (limited to 'dev-db/mysql-workbench')
5 files changed, 0 insertions, 164 deletions
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 7c22b371e063..081ab3f29518 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,9 +1,5 @@ -AUX mysql-workbench-6.2.3-CMakeLists.patch 1455 BLAKE2B f08c387531091609192a9a0ebc495ba8aa506f3b7a50f8785299df1772fbc8dd1275fa64fb48592932b90845035cef5546cf495aa291931d1514d32be85368d8 SHA512 8a38b0fa7be0ac982b1d501964727fcb6bd0c7ab5179e2a69a1926c1abe56e2f30c6d9a046b48cdcaaec948d5c9deadb62e14331d52cf39e91f26ee90104c812 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b AUX mysql-workbench-6.3.10-i386-json.patch 7167 BLAKE2B 44a6e2446b24cd2f7f096d51b6cfdacfb485634a94733c4ef67a128ec903fec3736cb62ed45d6abbe7c7793b7d3ab668198f663a44b1bcc313f4d02ced4cd578 SHA512 992595df7719c4c958c98b5561f3fea04607213287c72daea6bb331392c417123d6fe5d1126c6dec128a857aa299908221f3a2c0ac08744241bf395e80a9574d -AUX mysql-workbench-6.3.3-mysql_options4.patch 1713 BLAKE2B d879fbcb6e098402d8f59046c67cf55f8a76e0cd857b1141c99d8ce7ed1866b79aacd784fd50d0020de3ab8993ad33f625e29ba325c8ed362d9e1a0705c9c7af SHA512 6371903765be6eb2f489523d10f6662e20903da2dd5755445c2cc8dcdcf07f0b5aa7b694b89fa7b625452d5a3f8b9157bad2278dc875de2b7b6c23daf4438539 -AUX mysql-workbench-6.3.4-cxx11.patch 1550 BLAKE2B 89df45aed8ad8b006f43f0b6fc1158021c8152929694adaeed18c736ad8920e5bf0c3f852f298654e76ba2d478ff21afcdc0343cfb31c67cdf5382d48bc3ea99 SHA512 e312edede63f2308c466300e34c2d9ff19451fff9daca265219b9b074b2e28f5f8fb0799efbe825f5aaedd5515f2e99a4d1ab2dff6018e5140a5f4c9ab3c9d41 -AUX mysql-workbench-6.3.4-gtk.patch 1190 BLAKE2B d3d09cc3536929a7ddf6af77efaddb3bc28067bcc2772a3c42a0e31c5787d9aca829cf810894fe08abb8152d93068681e1a3024f40cb5cc6f19a48f6b7e0280c SHA512 81af1d9dbe40b0ad04e9d8e317a1b47832b864071e26ab954237f850685bdb53ad84fedf4aa546e83f4dd122e368d1bc90e46e9b6261104b86998607b7830d33 AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 BLAKE2B 9dcf7ca5091109ab71a201a68aa16259402dae85d4ea1135fbce476dbc0d4f49ad154005a6fe6195ce86ffba49ebf3d03de8ac94b6adcda2a297600b1ac6d0d3 SHA512 23e4135ee5c8b7cc7b70cc6b5170209c9a6350cfc7e8450d29a1098c31472b68494147ec4f1286365f7802af72570f4822b0078ae269affbbaf98e3ad9e99eb4 DIST antlr-3.4-complete.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1 diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch deleted file mode 100644 index 6e9a4d5e1410..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200 -+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200 -@@ -18,6 +18,9 @@ - find_package(PkgConfig REQUIRED) - - find_package(GTK2 2.20 REQUIRED gtk gtkmm) -+if (NOT GTK2_FOUND) -+ message( FATAL_ERROR "Not all GTK2 components were found!" ) -+endif() - pkg_check_modules(GTHREAD REQUIRED gthread-2.0) - pkg_check_modules(GMODULE REQUIRED gmodule-2.0) - set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS}) -@@ -32,7 +35,8 @@ - endif () - - # All known publicly available versions of Antlr3C are buggy -- -+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973 -+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too - if (SKIP_BUNDLED_ANTLR) - find_package(Antlr3C) - endif () -@@ -89,7 +93,8 @@ - pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12) - pkg_check_modules(UUID REQUIRED uuid) - pkg_check_modules(LIBZIP REQUIRED libzip) --if (UNIX) -+ -+if (UNIX AND USE_GNOME_KEYRING) - pkg_check_modules(GNOME_KEYRING gnome-keyring-1) - if (GNOME_KEYRING_FOUND) - set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING") -@@ -99,7 +104,10 @@ - set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING") - endif() - endif() -+ if (NOT GNOME_KEYRING_FOUND) -+ message( FATAL_ERROR "Gnome keyring libraries could not be found" ) -+ endif() - endif() - - include (CheckFunctionExists) - diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch deleted file mode 100644 index 7fb9c8d57fc5..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-15 15:54:19.000000000 +0200 -+++ plugins/migration/copytable/copytable.cpp 2015-04-26 08:53:08.871167725 +0200 -@@ -1920,12 +1920,17 @@ - _incoming_data_charset = "latin1"; - - mysql_init(&_mysql); -+/* This is optional has compiled in for MySQL >= 5.6.6 -+ * Looks like MariaDB does not support this as supposed, -+ * so disable completly. */ -+#ifndef MARIADB_BASE_VERSION - #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) - #if MYSQL_CHECK_VERSION(5,6,6) - if (is_mysql_version_at_least(5,6,6)) - mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); - #endif - #endif -+#endif - - // _bulk_insert_record is used to prepare a single record string, the connection - // is needed to escape binary data properly ---- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-26 08:57:30.444285953 +0200 -+++ plugins/migration/copytable/copytable.cpp 2015-04-26 10:16:39.234711324 +0200 -@@ -2875,6 +2875,9 @@ - - // This function is used to create a legal SQL string that you can use in an SQL statement - // This is needed because the escaping depends on the character set in use by the server -+ #ifdef MARIADB_BASE_VERSION -+ length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); -+ #else - #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) - #if MYSQL_CHECK_VERSION(5,7,6) - if (is_mysql_version_at_least(5,7,6)) -@@ -2885,6 +2888,7 @@ - length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); - #endif - #endif -+ #endif - - return true; - } 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 deleted file mode 100644 index e8ed54a8c705..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch +++ /dev/null @@ -1,39 +0,0 @@ -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; - } - - //-------------------------------------------------------------------------------------------------- diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch deleted file mode 100644 index e975906e19ab..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch +++ /dev/null @@ -1,38 +0,0 @@ -Last-Update: 2016-11-13 -Forwarded: not-needed -Author: Dmitry Smirnov <onlyjob@debian.org> -Bug-Debian: https://bugs.debian.org/839356 -Description: fix FTBFS - ---- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popover.cpp -+++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popover.cpp -@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const i - if (_style == mforms::PopoverStyleTooltip) - { - Glib::RefPtr<Gdk::Window> wnd = this->get_window(); -- if (wnd != 0) -+ if (wnd) - { - int xx; - int yy; -@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const i - { - Gdk::ModifierType mask; - Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default(); -- if (dsp != 0) -+ if (dsp) - dsp->get_pointer(x, y, mask); - } - ---- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popup.cpp -+++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popup.cpp -@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const - { - d("\n"); - Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap(); -- _have_rgba = colormap; -+ if (colormap) -+ _have_rgba = true; - - if (!_have_rgba) - colormap = screen->get_rgb_colormap(); |