* [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
@ 2017-06-11 6:28 Hans de Graaff
0 siblings, 0 replies; 6+ messages in thread
From: Hans de Graaff @ 2017-06-11 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 84027b5db0d48b5e47f5930a1f54509ec0b496e0
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 06:28:02 2017 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 06:28:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84027b5d
dev-db/mysql-workbench: fix compilation with mysql 5.6, bug 620000
Thanks to PhobosK for updating the patch and testing with mysql 5.6.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../files/mysql-workbench-6.3.9-mariadb-json.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
index 74c84e374dc..e785d6fb097 100644
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
@@ -1,13 +1,13 @@
---- a/plugins/migration/copytable/copytable.cpp.~1~ 2017-02-03 19:40:18.000000000 +0100
-+++ b/plugins/migration/copytable/copytable.cpp 2017-05-21 17:23:14.135875375 +0200
+--- a/plugins/migration/copytable/copytable.cpp
++++ b/plugins/migration/copytable/copytable.cpp
@@ -109,8 +109,10 @@
return "MYSQL_TYPE_STRING";
case MYSQL_TYPE_GEOMETRY:
return "MYSQL_TYPE_GEOMETRY";
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
case MYSQL_TYPE_JSON:
return "MYSQL_TYPE_JSON";
-+#endif
++#endif
default:
return "UNKNOWN";
}
@@ -15,9 +15,9 @@
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_BIT:
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
case MYSQL_TYPE_JSON:
-+#endif
++#endif
if (!col->is_long_data)
bind.buffer_length = (unsigned)col->source_length + 1;
@@ -27,9 +27,9 @@
rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
- rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
+ rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
+ || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif
++#endif
+ ) {
if (rowbuffer[index].buffer_length)
free(rowbuffer[index].buffer);
@@ -38,9 +38,9 @@
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_ENUM:
case MYSQL_TYPE_SET:
-+#ifndef MARIADB_BASE_VERSION
++#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
case MYSQL_TYPE_JSON:
-+#endif
++#endif
_bulk_insert_record.append("'", 1);
ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
*(*_row_buffer)[col_index].length);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
@ 2019-02-27 5:35 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2019-02-27 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 9ac346b7c9110d5ecc7d6601064e2aaafa1c7e61
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jan 19 09:22:16 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 05:35:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac346b7
dev-db/mysql-workbench: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10868
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/mysql-workbench-6.2.3-CMakeLists.patch | 43 ----------------------
.../mysql-workbench-6.3.3-mysql_options4.patch | 40 --------------------
.../files/mysql-workbench-6.3.4-cxx11.patch | 39 --------------------
.../files/mysql-workbench-6.3.4-gtk.patch | 38 -------------------
4 files changed, 160 deletions(-)
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 6e9a4d5e141..00000000000
--- 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 7fb9c8d57fc..00000000000
--- 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 e8ed54a8c70..00000000000
--- 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 e975906e19a..00000000000
--- 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();
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
@ 2019-12-06 15:39 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2019-12-06 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 39b245cae69379476bbb2564b99e8701fe0d0cfe
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Dec 5 13:55:06 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 15:38:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b245ca
dev-db/mysql-workbench: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13881
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/mysql-workbench-6.3.9-mariadb-json.patch | 55 ----------------------
1 file changed, 55 deletions(-)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
deleted file mode 100644
index e785d6fb097..00000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/plugins/migration/copytable/copytable.cpp
-+++ b/plugins/migration/copytable/copytable.cpp
-@@ -109,8 +109,10 @@
- return "MYSQL_TYPE_STRING";
- case MYSQL_TYPE_GEOMETRY:
- return "MYSQL_TYPE_GEOMETRY";
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
- case MYSQL_TYPE_JSON:
- return "MYSQL_TYPE_JSON";
-+#endif
- default:
- return "UNKNOWN";
- }
-@@ -295,7 +297,9 @@
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_BIT:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
- case MYSQL_TYPE_JSON:
-+#endif
- if (!col->is_long_data)
- bind.buffer_length = (unsigned)col->source_length + 1;
-
-@@ -1392,7 +1396,11 @@
- rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB ||
- rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB || rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
- rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
-- rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
-+ rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-+ || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif
-+ ) {
- if (rowbuffer[index].buffer_length)
- free(rowbuffer[index].buffer);
-
-@@ -2162,7 +2170,9 @@
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_ENUM:
- case MYSQL_TYPE_SET:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
- case MYSQL_TYPE_JSON:
-+#endif
- _bulk_insert_record.append("'", 1);
- ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
- *(*_row_buffer)[col_index].length);
-@@ -2621,7 +2621,7 @@
- // This is needed because the escaping depends on the character set in use by the server
- unsigned long ret_length = 0;
-
--#if MYSQL_CHECK_VERSION(5, 7, 6)
-+#if MYSQL_CHECK_VERSION(5, 7, 6) && ! defined MARIADB_BASE_VERSION
- if (_target->is_mysql_version_at_least(5, 7, 6))
- ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength, '"');
- else
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
@ 2020-06-13 16:28 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2020-06-13 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 0e284078f85da68d22f75be7a1df666382bd75c8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 08:08:38 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 16:27:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e284078
dev-db/mysql-workbench: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16211
.../files/mysql-workbench-6.3.10-i386-json.patch | 182 ---------------------
1 file changed, 182 deletions(-)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
deleted file mode 100644
index 31e789992d1..00000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Last-Update: 2018-03-05
-Forwarded: not-needed
-Origin: upstream, https://github.com/mysql/mysql-workbench/commit/fff08d9ec68de8215fc8f12fe0ee42e598e1cf75.patch
-Bug-Upstream: https://github.com/mysql/mysql-workbench/pull/14
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84886
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84951
-From: Christian Hesse <mail@eworm.de>
-Description: fixes FTBFS on 32bit architectures.
-
-~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:346:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
- ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'const JsonParser::JsonValue& JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:361:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
- ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'void JsonParser::JsonWriter::write(const JsonParser::JsonValue&)':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1672:44: error: conversion from 'const JsonParser::JsonValue' to 'int64_t {aka long long int}' is ambiguous
- _output += std::to_string((int64_t)value);
- ^~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: note: candidate: JsonParser::JsonValue::operator bool() const
- JsonValue::operator bool() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: note: candidate: JsonParser::JsonValue::operator double() const
- JsonValue::operator double() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:950:3: note: candidate: JsonParser::JsonValue::operator size_t() const
- JsonValue::operator size_t() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:939:3: note: candidate: JsonParser::JsonValue::operator ssize_t() const
- JsonValue::operator ssize_t() const {
- ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1675:45: error: conversion from 'const JsonParser::JsonValue' to 'uint64_t {aka long long unsigned int}' is ambiguous
- _output += std::to_string((uint64_t)value);
-~~~~
-
---- a/library/base/jsonparser.cpp
-+++ b/library/base/jsonparser.cpp
-@@ -342,9 +342,9 @@
- * If no such data is present std::out_of_range is thrown.
- */
- JsonValue &JsonArray::at(SizeType pos) {
- if (pos > _data.size())
-- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+ throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
- return _data.at(pos);
- }
-
- //--------------------------------------------------------------------------------------------------
-@@ -357,9 +357,9 @@
- * If no such data is present std::out_of_range is thrown.
- */
- const JsonValue &JsonArray::at(SizeType pos) const {
- if (pos > _data.size())
-- throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+ throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
- return _data.at(pos);
- }
-
- //--------------------------------------------------------------------------------------------------
-@@ -1667,14 +1667,16 @@
- break;
- case VDouble:
- _output += std::to_string((double)value);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- _output += std::to_string((int64_t)value);
- break;
- case VUint64:
- _output += std::to_string((uint64_t)value);
- break;
-+#endif
- case VObject:
- write((JsonObject)value);
- break;
- case VArray:
---- a/library/forms/jsonview.cpp
-+++ b/library/forms/jsonview.cpp
-@@ -650,10 +650,12 @@
- bool setData = false;
- if (data != nullptr) {
- std::stringstream buffer;
- double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- int64_t number2 = 0;
- uint64_t number3 = 0;
-+#endif
- bool retBool = false;
- auto &storedValue = data->getData();
- switch (storedValue.getType()) {
- case VDouble:
-@@ -663,8 +665,9 @@
- buffer >> number;
- storedValue = number;
- setData = true;
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- if (!base::is_number(value))
- break;
- buffer << value;
-@@ -679,8 +682,9 @@
- buffer >> number3;
- storedValue = number3;
- setData = true;
- break;
-+#endif
- case VBoolean:
- if (!base::isBool(value))
- break;
- buffer << value;
-@@ -1072,16 +1076,18 @@
- case VDouble:
- node->set_string(1, std::to_string((double)value));
- node->set_string(2, "Double");
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- node->set_string(1, std::to_string((int64_t)value));
- node->set_string(2, "Long Integer");
- break;
- case VUint64:
- node->set_string(1, std::to_string((uint64_t)value));
- node->set_string(2, "Unsigned Long Integer");
- break;
-+#endif
- default:
- break;
- }
- node->set_data(new JsonTreeBaseView::JsonValueNodeData(value));
-@@ -1321,10 +1327,12 @@
- JsonParser::JsonValue &storedValue = (!key.empty() ? ((JsonObject &)data->getData())[key] : data->getData());
- if (data != NULL) {
- std::stringstream buffer;
- double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- int64_t number2 = 0;
- uint64_t number3 = 0;
-+#endif
- bool retBool = false;
- switch (storedValue.getType()) {
- case VDouble:
- if (!base::is_number(value))
-@@ -1334,8 +1342,9 @@
- storedValue = number;
- node->set_float(column, number);
- _dataChanged(false);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- if (!base::is_number(value))
- break;
- buffer << value;
-@@ -1352,8 +1361,9 @@
- storedValue = number3;
- node->set_float(column, (double)number3);
- _dataChanged(false);
- break;
-+#endif
- case VBoolean:
- if (!base::isBool(value))
- break;
- buffer << value;
-@@ -1611,14 +1621,16 @@
- switch (value.getType()) {
- case VDouble:
- node->set_float(columnId, (double)value);
- break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
- case VInt64:
- node->set_long(columnId, (int64_t)value);
- break;
- case VUint64:
- node->set_long(columnId, (uint64_t)value);
- break;
-+#endif
- default:
- break;
- }
- }
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
@ 2021-09-01 20:28 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-09-01 20:28 UTC (permalink / raw
To: gentoo-commits
commit: d539af30ee13fc8a2fcb3acb30cfef93657973df
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 1 20:26:26 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 1 20:27:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d539af30
dev-db/mysql-workbench: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22178
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/mysql-workbench-8.0.24-gcc11-fix.patch | 55 ----------------------
1 file changed, 55 deletions(-)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
deleted file mode 100644
index 1ad5b1dafae..00000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/788199
-
-'volatile gsize' is not accepted by with gcc11 / clang12
-
-"While location has a volatile qualifier, this is a historical
- artifact and the pointer passed to it should not be volatile"
-https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
-
-For Scintilla GTK, see also:
-https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/
-
-Also adds missing <memory> includes.
-
-Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
---- a/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
-+++ b/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
-@@ -1011,5 +1011,5 @@
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
- static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
-- static volatile gsize type_id_result = 0;
-+ static gsize type_id_result = 0;
-
- if (g_once_init_enter(&type_id_result)) {
-@@ -1102,5 +1102,5 @@
- *cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
- #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
-- static volatile gsize registered = 0;
-+ static gsize registered = 0;
-
- if (g_once_init_enter(®istered)) {
---- a/library/forms/gtk/src/mforms_acc.cpp
-+++ b/library/forms/gtk/src/mforms_acc.cpp
-@@ -177,5 +177,5 @@
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
- GType mforms_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
-- static volatile gsize typeIdResult = 0;
-+ static gsize typeIdResult = 0;
-
- if (g_once_init_enter(&typeIdResult)) {
---- a/library/ssh/SSHCommon.h
-+++ b/library/ssh/SSHCommon.h
-@@ -42,4 +42,5 @@
- #include <thread>
- #include <atomic>
-+#include <memory>
- #include <mutex>
-
---- a/library/ssh/SSHTunnelHandler.h
-+++ b/library/ssh/SSHTunnelHandler.h
-@@ -31,4 +31,5 @@
- #include <thread>
- #include <map>
-+#include <memory>
- #include <mutex>
- #include <vector>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/
@ 2021-09-21 18:26 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-09-21 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 15a9b4dc14c337d16f7182c7077a9fe8d9861bde
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 21 17:01:09 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 18:25:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a9b4dc
dev-db/mysql-workbench: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22355
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/mysql-workbench-8.0.23-findlibssh.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
deleted file mode 100644
index 3f250d78140..00000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/cmake/Modules/FindLibSSH.cmake.~1~ 2020-12-17 06:22:25.000000000 +0100
-+++ b/build/cmake/Modules/FindLibSSH.cmake 2021-02-21 10:38:52.773491295 +0100
-@@ -51,7 +51,7 @@
- find_library(LibSSH_LIBRARY NAMES ${LibSSH_NAMES})
- endif()
-
--set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
-+set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
- file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
- if (LibSSH_VERSION_LINE_MAJOR)
- file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define LIBSSH_VERSION_MINOR[ ]+[0-9]+")
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-21 18:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-06 15:39 [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2021-09-21 18:26 Conrad Kostecki
2021-09-01 20:28 Conrad Kostecki
2020-06-13 16:28 Mike Gilbert
2019-02-27 5:35 Aaron Bauman
2017-06-11 6:28 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox