[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2024-01-29 Thread Hans de Graaff 
commit: d6c21bdac617b6b07cbeb7e8b17fa91ae90f0b55
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Jan 29 09:45:45 2024 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 29 13:02:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c21bda

dev-db/mysql-workbench: fix build with >=libxml2-2.12

Closes: https://bugs.gentoo.org/923020
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Hans de Graaff  gentoo.org>

 ...sql-workbench-8.0.36-libxml2-2.12-support.patch | 33 ++
 .../mysql-workbench/mysql-workbench-8.0.36.ebuild  |  1 +
 2 files changed, 34 insertions(+)

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
new file mode 100644
index ..e3ee9aa099f0
--- /dev/null
+++ 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/923020
+https://github.com/mysql/mysql-workbench/pull/43
+
+From 8f8917671ab5a06f842a340f31c6d4ec7634147a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Sat, 27 Jan 2024 22:51:15 +0200
+Subject: [PATCH] Fix support for libxml2-2.12 with its api and header changes
+
+Signed-off-by: Alfred Wingate 
+--- a/library/grt/src/grt.h
 b/library/grt/src/grt.h
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include "base/threading.h"
+ #include 
+--- a/library/grt/src/unserializer.cpp
 b/library/grt/src/unserializer.cpp
+@@ -401,7 +401,11 @@ ValueRef 
internal::Unserializer::unserialize_xmldata(const char *data, size_t si
+   xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);
+ 
+   if (!doc) {
++#if LIBXML_VERSION >= 21200
++const xmlError* error = xmlGetLastError();
++#else
+ xmlErrorPtr error = xmlGetLastError();
++#endif
+ 
+ if (error)
+   throw std::runtime_error(base::strfmt("Could not parse XML data. Line 
%d, %s", error->line, error->message));

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
index c8e0352d19f7..2f2d812652f4 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
"${FILESDIR}/${PN}-8.0.33-gcc13.patch"
+   "${FILESDIR}/${PN}-8.0.36-libxml2-2.12-support.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2021-09-21 Thread Conrad Kostecki 
commit: 15a9b4dc14c337d16f7182c7077a9fe8d9861bde
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Sep 21 17:01:09 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Sep 21 18:25:56 2021 +
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  levelnine.at>
Signed-off-by: Conrad Kostecki  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..000
--- 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.0 
+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]+")

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2021-09-01 Thread Conrad Kostecki 
commit: d539af30ee13fc8a2fcb3acb30cfef93657973df
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Sep  1 20:26:26 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Sep  1 20:27:57 2021 +
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  levelnine.at>
Signed-off-by: Conrad Kostecki  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..000
--- 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  includes.
-
-Signed-off-by: Ionen Wolkens 
 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(_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()) {
 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()) {
 a/library/ssh/SSHCommon.h
-+++ b/library/ssh/SSHCommon.h
-@@ -42,4 +42,5 @@
- #include 
- #include 
-+#include 
- #include 
- 
 a/library/ssh/SSHTunnelHandler.h
-+++ b/library/ssh/SSHTunnelHandler.h
-@@ -31,4 +31,5 @@
- #include 
- #include 
-+#include 
- #include 
- #include

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2021-02-21 Thread Hans de Graaff 
commit: 1896841452356d6598b3c5ce21131ecd260790db
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 21 10:38:11 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 21 10:38:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18968414

dev-db/mysql-workbench: re-import of 8.0.23

Add mysql-workbench back now that it is compatible with python 3.

Bug: https://bugs.gentoo.org/715172
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-db/mysql-workbench/Manifest|   2 +
 .../files/mysql-workbench-6.2.5-wbcopytables.patch |  12 +++
 .../mysql-workbench-8.0.19-mysql-connector-8.patch |  12 +++
 .../files/mysql-workbench-8.0.23-findlibssh.patch  |  11 ++
 dev-db/mysql-workbench/metadata.xml|  10 ++
 .../mysql-workbench/mysql-workbench-8.0.23.ebuild  | 112 +
 6 files changed, 159 insertions(+)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
new file mode 100644
index 000..d96880fdbf1
--- /dev/null
+++ b/dev-db/mysql-workbench/Manifest
@@ -0,0 +1,2 @@
+DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
+DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 
4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e
 SHA512 
f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
new file mode 100644
index 000..2d3d8db243f
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
@@ -0,0 +1,12 @@
+--- a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.0 
+0100
 b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100
+@@ -10,7 +10,8 @@
+ if (UNIX)
+   configure_file(wbcopytables.in wbcopytables)
+   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION 
${WB_INSTALL_BIN_DIR})
+-  
++
++  SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
+   add_executable(wbcopytables-bin
+   copytable/copytable.cpp
+   copytable/python_copy_data_source.cpp

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
new file mode 100644
index 000..c624dea0e56
--- /dev/null
+++ 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
@@ -0,0 +1,12 @@
+diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake 
b/build/cmake/Modules/FindMySQLCppConn.cmake
+--- a/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:31:34.520496484 +0100
 b/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:32:32.590496631 +0100
+@@ -27,7 +27,7 @@
+   set(MySQLCppConn_FIND_QUIETLY TRUE)
+ endif ()
+ 
+-find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/local/include)
++find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc)
+ 
+ SET(MySQLCppConn_NAMES mysqlcppconn)
+ 

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
new file mode 100644
index 000..3f250d78140
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.23-findlibssh.patch
@@ -0,0 +1,11 @@
+--- a/build/cmake/Modules/FindLibSSH.cmake.~1~ 2020-12-17 06:22:25.0 
+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]+")

diff --git a/dev-db/mysql-workbench/metadata.xml 
b/dev-db/mysql-workbench/metadata.xml
new file mode 100644
index 000..64e908505cd
--- /dev/null
+++ b/dev-db/mysql-workbench/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+gra...@gentoo.org
+  
+  
+antlr/website-antlr3
+  
+

diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/, profiles/

2020-09-21 Thread Michał Górny 
commit: 7db99d87e8cbce1345895fa416e78d2dba29b258
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 21 06:13:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 21 06:15:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db99d87

dev-db/mysql-workbench: Remove last-rited pkg

Closes: https://bugs.gentoo.org/715172
Signed-off-by: Michał Górny  gentoo.org>

 dev-db/mysql-workbench/Manifest|   4 -
 .../files/mysql-workbench-6.2.5-wbcopytables.patch |  12 --
 .../mysql-workbench-8.0.19-mysql-connector-8.patch |  12 --
 .../mysql-workbench-8.0.21-boost-1.73.0.patch  | 123 -
 dev-db/mysql-workbench/metadata.xml|  10 --
 .../mysql-workbench-8.0.19-r1.ebuild   | 109 --
 .../mysql-workbench/mysql-workbench-8.0.20.ebuild  | 109 --
 .../mysql-workbench/mysql-workbench-8.0.21.ebuild  | 110 --
 profiles/package.mask  |   1 -
 9 files changed, 490 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
deleted file mode 100644
index c1dd84e4105..000
--- a/dev-db/mysql-workbench/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 
3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed
 SHA512 
de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
-DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B 
f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe
 SHA512 
986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc
-DIST mysql-workbench-community-8.0.20-src.tar.gz 19391920 BLAKE2B 
9baf37dec18002ebf7956979fa1e3e45b69a7061bd85d6b2ef25f058ce7595a6847ea314b7443dadf7524ff985ff4e87869e91ea7a012e6cf07a6d139a6c733b
 SHA512 
b31314fac018959a008b283c795df5a676d6c667827e87a98379ce1de172b98cfdf8dd5cac009e2fb78241358afcb318abfed0178d73840bf6b4432b85b6a4e7
-DIST mysql-workbench-community-8.0.21-src.tar.gz 19211633 BLAKE2B 
452ac946d478acb1d0e358d2bc44125f0b7d1f1bc2943d2b03ce6767e659df71b7525b7a51ed1cd5560f02a7a1047e2cd35477a71ddd91f71992e5becc3d1c0d
 SHA512 
40c1144f801424c3b46eb033c9d1174c9bd903cd17672924eacd3ff58daa91b0d09f6045af4746ce7490f5ab2b0973b6d7f44ee8ae022607057cb0f09fc59a3f

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
deleted file mode 100644
index 2d3d8db243f..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.0 
+0100
-+++ b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100
-@@ -10,7 +10,8 @@
- if (UNIX)
-   configure_file(wbcopytables.in wbcopytables)
-   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION 
${WB_INSTALL_BIN_DIR})
--  
-+
-+  SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
-   add_executable(wbcopytables-bin
-   copytable/copytable.cpp
-   copytable/python_copy_data_source.cpp

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
deleted file mode 100644
index c624dea0e56..000
--- 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake 
b/build/cmake/Modules/FindMySQLCppConn.cmake
 a/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:31:34.520496484 +0100
-+++ b/build/cmake/Modules/FindMySQLCppConn.cmake   2019-12-18 
13:32:32.590496631 +0100
-@@ -27,7 +27,7 @@
-   set(MySQLCppConn_FIND_QUIETLY TRUE)
- endif ()
- 
--find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/local/include)
-+find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS 
/usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc)
- 
- SET(MySQLCppConn_NAMES mysqlcppconn)
- 

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
deleted file mode 100644
index 85825f14c04..000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Patch from Alt Linux as provided in https://bugs.gentoo.org/723432
-
-diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
-index cb74ba41..05535e56 100644
 a/library/forms/swig/mforms.i
-+++ b/library/forms/swig/mforms.i
-@@

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2020-06-13 Thread Mike Gilbert 
commit: 0e284078f85da68d22f75be7a1df666382bd75c8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Jun 13 08:08:38 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 13 16:27:31 2020 +
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  gmail.com>
Signed-off-by: Mike Gilbert  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..000
--- 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 
-Description: fixes FTBFS on 32bit architectures.
-
-
-/<>/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));
-   
^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'const JsonParser::JsonValue& 
JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
-/<>/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));
-   
^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'void JsonParser::JsonWriter::write(const 
JsonParser::JsonValue&)':
-/<>/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);
-^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: 
note: candidate: JsonParser::JsonValue::operator bool() const
-   JsonValue::operator bool() const {
-   ^
-/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: 
note: candidate: JsonParser::JsonValue::operator double() const
-   JsonValue::operator double() const {
-   ^
-/<>/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 {
-   ^
-/<>/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 {
-   ^
-/<>/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 ::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 ::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

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2019-12-06 Thread Aaron Bauman 
commit: 39b245cae69379476bbb2564b99e8701fe0d0cfe
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Dec  5 13:55:06 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Dec  6 15:38:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b245ca

dev-db/mysql-workbench: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13881
Signed-off-by: Aaron Bauman  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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2019-02-26 Thread Aaron Bauman 
commit: 9ac346b7c9110d5ecc7d6601064e2aaafa1c7e61
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Jan 19 09:22:16 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 27 05:35:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac346b7

dev-db/mysql-workbench: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10868
Signed-off-by: Aaron Bauman  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..000
--- 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.0 +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..000
--- 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.0 +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

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2018-10-27 Thread Hans de Graaff 
commit: e94534c89a38f3109c46fd5f9bba2cc484113e27
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Oct 27 07:27:47 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Oct 27 07:28:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94534c8

dev-db/mysql-workbench: fix compilation on x86

Fix compilation on x86 with debian patch. Thanks to asturm for finding
the patch.

Closes: https://bugs.gentoo.org/659176
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/mysql-workbench-6.3.10-i386-json.patch   | 182 +
 .../mysql-workbench/mysql-workbench-6.3.10.ebuild  |   1 +
 2 files changed, 183 insertions(+)

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
new file mode 100644
index 000..31e789992d1
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
@@ -0,0 +1,182 @@
+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 
+Description: fixes FTBFS on 32bit architectures.
+
+
+/<>/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));
+   
^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'const JsonParser::JsonValue& 
JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
+/<>/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));
+   
^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In 
member function 'void JsonParser::JsonWriter::write(const 
JsonParser::JsonValue&)':
+/<>/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);
+^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: 
note: candidate: JsonParser::JsonValue::operator bool() const
+   JsonValue::operator bool() const {
+   ^
+/<>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: 
note: candidate: JsonParser::JsonValue::operator double() const
+   JsonValue::operator double() const {
+   ^
+/<>/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 {
+   ^
+/<>/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 {
+   ^
+/<>/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 ::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 ::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 +=

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/

2017-06-11 Thread Hans de Graaff 
commit: 84027b5db0d48b5e47f5930a1f54509ec0b496e0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jun 11 06:28:02 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jun 11 06:28:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84027b5d

dev-db/mysql-workbench: fix compilation with mysql 5.6, bug 62

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.0 +0100
-+++ b/plugins/migration/copytable/copytable.cpp2017-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);

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2017-05-25 Thread Hans de Graaff 
commit: 5270e1de52c3b27edf3dd777b07e1f859008a421
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu May 25 06:44:23 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu May 25 06:44:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5270e1de

dev-db/mysql-workbench: add 6.3.9, fixing bug 567226

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-db/mysql-workbench/Manifest|   1 +
 .../files/mysql-workbench-6.2.5-wbcopytables.patch |   4 +-
 .../files/mysql-workbench-6.3.9-mariadb-json.patch |  55 +++
 .../mysql-workbench/mysql-workbench-6.3.9.ebuild   | 103 +
 4 files changed, 161 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 6854db6f8bc..9b917725e76 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,2 +1,3 @@
 DIST antlr-3.4-complete.jar 2388361 SHA256 
9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 
04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 WHIRLPOOL 
488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 
be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 
8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 WHIRLPOOL 
9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
+DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 SHA256 
607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951 SHA512 
a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
 WHIRLPOOL 
654eaa76d6f132e50ca904aae54c07a7d2aabe746e519f5c6c8cd5d40529ebe022616d5ef28be8dd322aba19e589dc8d9dd2bb4c5f2356fa7b5698a84190208e

diff --git 
a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch 
b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
index 0fcc837fef0..2d3d8db243f 100644
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
@@ -1,5 +1,5 @@
 plugins/migration/CMakeLists.txt.~1~   2015-02-25 09:08:47.0 
+0100
-+++ plugins/migration/CMakeLists.txt   2015-03-07 07:28:56.745378152 +0100
+--- a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.0 
+0100
 b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100
 @@ -10,7 +10,8 @@
  if (UNIX)
configure_file(wbcopytables.in wbcopytables)

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
new file mode 100644
index 000..74c84e374dc
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
@@ -0,0 +1,55 @@
+--- a/plugins/migration/copytable/copytable.cpp.~1~2017-02-03 
19:40:18.0 +0100
 b/plugins/migration/copytable/copytable.cpp2017-05-21 
17:23:14.135875375 +0200
+@@ -109,8 +109,10 @@
+   return "MYSQL_TYPE_STRING";
+ case MYSQL_TYPE_GEOMETRY:
+   return "MYSQL_TYPE_GEOMETRY";
++#ifndef 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:
++#ifndef 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
++#ifndef 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:
++#ifndef MARIADB_BASE_VERSION
+   case MYSQL_TYPE_JSON:
++#endif
+ _bulk_insert_record.append("'", 1);
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/libzdb/files/, dev-db/ctdb/files/, ...

2016-07-30 Thread Patrice Clement 
commit: 3e85c8c4859384b2e7860512dee265c8d18ec370
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Jul 19 17:29:57 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jul 30 06:46:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e85c8c4

dev-db/*: remove unused patches.

Squash all commit messages into a single one.

Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement  gentoo.org>

 dev-db/ctdb/files/autoconf-2.62-fix.patch  |  15 --
 dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch  |  77 ---
 dev-db/ctdb/files/ctdb-41.httpd_gentoo.patch   |  13 --
 dev-db/ctdb/files/ctdb-50.samba_gentoo.patch   |  14 --
 dev-db/ctdb/files/ctdb-functions.patch |  76 ---
 dev-db/ctdb/files/ctdb.initd   |  81 ---
 .../files/firebird-2.5.1.26351.0-deps-flags.patch  |  59 -
 dev-db/henplus/files/henplus-0.9.7-build.xml.patch |  34 ---
 dev-db/henplus/files/henplus.patch |  42 
 dev-db/libzdb/files/sqlite_configure.patch |  18 --
 dev-db/mongodb/files/mms-agent.confd   |   9 -
 dev-db/mongodb/files/mms-agent.initd   |  41 
 dev-db/mongodb/files/mms-agent.initd-r1|  31 ---
 dev-db/mongodb/files/mms-agent.initd-r2|  25 ---
 dev-db/mongodb/files/mongodb-2.0-fix-scons.patch   |  36 ---
 .../mongodb/files/mongodb-2.0-r1-boost-1.50.patch  | 245 -
 dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch |  28 ---
 dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch |  35 ---
 dev-db/mongodb/files/mongos.confd  |  16 --
 dev-db/mongodb/files/mongos.initd-r1   |  50 -
 .../mysql-connector-c++-1.1.0-disable-tests.patch  |  14 --
 .../mysql-connector-c++-1.1.0-fix-cmake.patch  |  85 ---
 .../mysql-connector-c++-1.1.5-fix-cmake.patch  | 106 -
 .../mysql-workbench-6.1.7-mysql_options4.patch |  29 ---
 .../files/mysql-workbench-6.1.7-wbcopytables.patch |  10 -
 .../files/mysql-workbench-6.2.3-ctemplate.patch|  35 ---
 .../files/mysql-workbench-6.2.3-glib.patch |  42 
 .../files/mysql-workbench-6.2.3-paramiko.patch |  51 -
 dev-db/postgis/files/postgis-2.0-ldflags.patch |  26 ---
 .../postgis/files/postgis-2.0-pkgconfig-json.patch |  99 -
 ...tgresql-9.4-alpha-fix-read-memory-barrier.patch |  13 --
 dev-db/redis/files/redis-2.4.17-shared.patch   |  22 --
 dev-db/redis/files/redis-2.4.3-shared.patch|  22 --
 dev-db/redis/files/redis-2.4.4-tcmalloc.patch  |  21 --
 dev-db/redis/files/redis-2.6.7-config.patch|  69 --
 dev-db/redis/files/redis-2.6.7-shared.patch|  36 ---
 dev-db/redis/files/redis-2.6.9-tclsh86.patch   |  57 -
 dev-db/redis/files/redis-2.8.3-config.patch|  59 -
 dev-db/redis/files/redis.initd-2   |  23 --
 dev-db/redis/files/redis.initd-3   |  32 ---
 dev-db/slony1/files/slony1-2.1.1-ldflags.patch |  29 ---
 .../files/sqlitebrowser-3.5.1-unbundle.patch   |  70 --
 ...itebrowser-3.6.0-unbundle-keep-qscintilla.patch |  62 --
 dev-db/tokyocabinet/files/1.4.45.patch |  12 -
 dev-db/tokyocabinet/files/1.4.46.patch |  12 -
 dev-db/tokyocabinet/files/remove_docinst.patch |  13 --
 .../files/unixODBC-2.3.0-sqldriverconnect.patch|  27 ---
 dev-db/wxsqlite3/files/wxsqlite3-3.0.6.1.pc.in |  14 --
 48 files changed, 2035 deletions(-)

diff --git a/dev-db/ctdb/files/autoconf-2.62-fix.patch 
b/dev-db/ctdb/files/autoconf-2.62-fix.patch
deleted file mode 100644
index 2f5bc2b..000
--- a/dev-db/ctdb/files/autoconf-2.62-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 lib/replace/autoconf-2.60.m4.orig  2008-04-19 00:26:33.0 -0400
-+++ lib/replace/autoconf-2.60.m4   2008-04-19 00:22:25.0 -0400
-@@ -179,6 +179,7 @@
- # 
- # Enable extensions on systems that normally disable them,
- # typically due to standards-conformance issues.
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
- AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
- [
-   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-@@ -208,3 +209,4 @@
- AC_DEFINE([__EXTENSIONS__])
-   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
- ])
-+])

diff --git a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch 
b/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
deleted file mode 100644
index c70350c..000
--- a/dev-db/ctdb/files/ctdb-1.0.114_p1-functions.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions
 ctdb-1.0.114.orig/config/functions 2010-04-04 18:01:18.278707515 +0200
-+++ ctdb-1.0.114/config/functions  2010-04-04 18:08:05.792447032 +0200
-@@ -22,6 +22,8 @@
-   . /etc/default/$1
- elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
-   . $CTDB_BASE/sysconfig/$1
-+  elif [ -f /etc/config.d/$1 ]; then
-+  .

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/

2015-12-29 Thread Pacho Ramos 
commit: 4905afbb4053aea415ce0c10f1f25f8b35f5fb2d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Dec 29 12:05:25 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Dec 29 12:07:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4905afbb

dev-db/mysql-workbench: Fix building with latest glibmm/libsigc++ (#58)

Package-Manager: portage-2.2.26

 .../files/mysql-workbench-6.3.4-cxx11.patch|  39 
 .../mysql-workbench-6.3.4-r1.ebuild| 108 +
 2 files changed, 147 insertions(+)

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 000..e8ed54a
--- /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 
+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/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild 
b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
new file mode 100644
index 000..0f9e0cc
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+CMAKE_MIN_VERSION="2.8.11.1"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/workbench/;
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz 
https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true
 -> antlr-3.4-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+   dev-libs/glib:2
+   dev-cpp/atkmm
+   dev-cpp/pangomm
+   >=dev-cpp/glibmm-2.14:2
+   >=dev-cpp/gtkmm-2.14:2.4
+   dev-libs/atk
+   x11-libs/pango
+   >=x11-libs/gtk+-2.20:2
+   gnome-base/libglade:2.0
+   >=x11-libs/cairo-1.5.12[glib,svg]
+   dev-libs/libsigc++:2
+   >=dev-libs/boost-1.55.0[nls]
+   >=dev-cpp/ctemplate-0.95
+   >=dev-libs/libxml2-2.6.2:2
+   dev-libs/libzip
+   >=virtual/mysql-5.1
+   dev-libs/libpcre
+   >=sci-libs/gdal-1.11.1-r1[-mdb]
+   virtual/opengl
+   >=dev-lang/lua-5.1[deprecated]
+   || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+   dev-libs/tinyxml[stl]
+   dev-db/mysql-connector-c++
+   dev-db/vsqlite++
+   || ( dev-db/libiodbc dev-db/unixODBC )
+   gnome-keyring? ( gnome-base/libgnome-keyring )
+   dev-python/pexpect
+   >=dev-python/paramiko-1.7.4
+   "
+
+# lua perhaps no longer needed? Was used via libgrt only
+
+RDEPEND="${CDEPEND}
+   app-admin/sudo
+   >=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   virtual/jre
+   virtual/pkgconfig"
+