diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-db/mysql-workbench | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-db/mysql-workbench')
-rw-r--r-- | dev-db/mysql-workbench/Manifest | 3 | ||||
-rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch | 123 | ||||
-rw-r--r-- | dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild | 110 |
3 files changed, 236 insertions, 0 deletions
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 1aebe0ec3b27..6c74e32dd9d3 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,8 +1,11 @@ AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7 +AUX mysql-workbench-8.0.21-boost-1.73.0.patch 4579 BLAKE2B 2e39180d9c4ac6fb87b03bdb4cbff5b2f09df9334cbf83465c4a79705f060a18dc7a1a2520857ff262e8f5d599498234be84cba57f77b70659f14c7ba9d19fb6 SHA512 eab05b945c9e5217619748d3bce6909d15dc4a40e40017a735fe13610ae2731c97696c4b8bfe285d4eb62773b1534f24c8a5c50897dd61c99073ce5915be36b7 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 EBUILD mysql-workbench-8.0.19-r1.ebuild 2629 BLAKE2B 3796fddc98646419abf3b497862b1e3eecbd3d846dc4654bb4629adab10679738d2434b48b5fbc221c3383bbc59cc94ef0bc25b22beb18a8cb73628a7560c26a SHA512 4ef8643322b88a123a0cac098f5835e64581ab21e1eefa339b92bc1d507f03a9976bfa67a75a14e58165e90cf8ad1aa16e259db32ccc22c172a82b7f15fe3df4 EBUILD mysql-workbench-8.0.20.ebuild 2639 BLAKE2B cada322f63595aaf9a6add80d1db5f160f616f4026cb65f8bd3bb968def8348ff8cc89b7fbc1f6c550780b5df332ef6f814dbf9f1578734671eedcd07276b334 SHA512 ce59a3350cae3f4714e139553f824aa29992ea374bdfcf4a9b881ef9a875f069845d4e4655597aacc7c4ed05105536b79a8dabdef430efa57703f29af7422be0 +EBUILD mysql-workbench-8.0.21.ebuild 2678 BLAKE2B b4beba334812494af029c372321999d65fe0c8b613ebd3aa3eed95f1fc85366b15159f7af27cdb35faf0d4acff5d3d06fb6f5606f25b99eeb122651716a7fae1 SHA512 077105f1bf95a827df03cd56dcbe27e3f2b953115ac3415cab2381d8bd05bfddc8df3b6b17d65b0dd3359dc8e159ee63ac1d68bc96623f3a186e5952f0f8a882 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193 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 new file mode 100644 index 000000000000..85825f14c047 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch @@ -0,0 +1,123 @@ +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 +@@ -3,6 +3,7 @@ + #pragma SWIG nowarn=401,402,509 + + %{ ++#include <boost/bind.hpp> + #include <boost/signals2/signal.hpp> + #include <sstream> + #include <frameobject.h> +diff --git a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp b/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp +index 24db3d63..d997c410 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp ++++ b//modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp +@@ -31,6 +31,7 @@ + #include "base/string_utilities.h" + #include <sstream> + #include <boost/lambda/bind.hpp> ++#include <boost/bind.hpp> + + using namespace grt; + using namespace base; +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp +index 3da58757..a9b082ac 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp +@@ -27,6 +27,7 @@ + + #include "mysql_sql_inserts_loader.h" + #include "mysql_sql_parser_utils.h" ++#include <boost/bind.hpp> + #include <boost/foreach.hpp> + + using namespace grt; +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp +index 0c0f72bc..baf3d897 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp +@@ -22,6 +22,7 @@ + */ + + #include <glib.h> ++#include <boost/bind.hpp> + #include <boost/signals2.hpp> + #include <cctype> + +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp +index ef51d77c..68f397ae 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp +@@ -39,6 +39,7 @@ + #include "base/string_utilities.h" + #include <sstream> + #include <iterator> ++#include <boost/bind.hpp> + #include <boost/lambda/bind.hpp> + + using namespace grt; +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h +index 9e790dfb..2addd87e 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h +@@ -30,6 +30,8 @@ + + #include "base/string_utilities.h" + ++#include <boost/bind.hpp> ++ + using namespace grt; + + template <typename T> +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp +index 617487b5..9614ad9c 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp +@@ -22,6 +22,7 @@ + */ + + #include <glib.h> ++#include <boost/bind.hpp> + #include <boost/signals2.hpp> + + #include "mysql_sql_schema_rename.h" +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp +index bbbb733a..51c3215d 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp +@@ -28,6 +28,7 @@ + #include "mysql_sql_parser_fe.h" + #include "grtdb/charset_utils.h" + #include "base/string_utilities.h" ++#include <boost/bind.hpp> + #include <boost/scoped_array.hpp> + #include <sstream> + +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp +index b87535a0..3900b7a8 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp +@@ -29,6 +29,7 @@ + #include "mysql_sql_parser_fe.h" + #include "base/string_utilities.h" + #include <boost/foreach.hpp> ++#include <boost/bind.hpp> + #include <boost/lambda/bind.hpp> + + using namespace grt; +diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp +index 0f9f80ad..1cb5f78a 100644 +--- a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp +@@ -28,6 +28,7 @@ + #include "mysql_sql_parser_fe.h" + #include "grtdb/charset_utils.h" + #include "base/string_utilities.h" ++#include <boost/bind.hpp> + #include <boost/lambda/bind.hpp> + + using namespace grt; diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild new file mode 100644 index 000000000000..d811ec775a6e --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +ANTLR_VERSION=4.7.1 + +inherit gnome2 flag-o-matic python-single-r1 cmake-utils + +MY_P="${PN}-community-${PV}-src" + +DESCRIPTION="MySQL Workbench" +HOMEPAGE="https://www.mysql.com/products/workbench/" +SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz + https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + app-crypt/libsecret + dev-libs/glib:2 + dev-cpp/antlr-cpp:4 + dev-cpp/atkmm + dev-cpp/pangomm + >=dev-cpp/glibmm-2.14:2 + dev-cpp/gtkmm:3.0 + dev-libs/atk + >=net-libs/libssh-0.8.5[server] + x11-libs/pango + x11-libs/gtk+:3 + gnome-base/libglade:2.0 + >=x11-libs/cairo-1.5.12[glib,svg] + >=dev-libs/rapidjson-1.1.0 + 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 + dev-libs/libpcre[cxx] + >=sci-libs/gdal-1.11.1-r1 + virtual/opengl + || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 +" + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-lang/swig + virtual/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" + "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch" + "${FILESDIR}/${P}-boost-1.73.0.patch" +) + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + ## And avoid -Werror + sed -i -e 's/-Werror//' CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake-utils_src_prepare +} + +src_configure() { + if has_version dev-db/libiodbc ; then + IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" + fi + + append-cxxflags -std=c++11 + ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" + local mycmakeargs=( + -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DIODBC_INCLUDE_PATH="/usr/include/iodbc" + ${IODBC} + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" + ) + cmake-utils_src_configure +} |