1 |
commit: eb3e263468b726f88871ac5e008de020e345bdc7 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 19 18:54:32 2020 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 19 18:58:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3e2634 |
7 |
|
8 |
dev-db/mysql-workbench: fix mysql-connector-c++ version |
9 |
|
10 |
mysql-connector-c++ is not compatible at runtime with mysql-workbench, |
11 |
so lock the dependency to the 1.x version which is compatible. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/707784 |
14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
15 |
RepoMan-Options: --force |
16 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
17 |
|
18 |
.../mysql-workbench-8.0.16-r1.ebuild | 109 +++++++++++++++++++++ |
19 |
.../mysql-workbench-8.0.19-r1.ebuild | 109 +++++++++++++++++++++ |
20 |
2 files changed, 218 insertions(+) |
21 |
|
22 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.16-r1.ebuild |
23 |
new file mode 100644 |
24 |
index 00000000000..b291bb37d1e |
25 |
--- /dev/null |
26 |
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.16-r1.ebuild |
27 |
@@ -0,0 +1,109 @@ |
28 |
+# Copyright 1999-2020 Gentoo Authors |
29 |
+# Distributed under the terms of the GNU General Public License v2 |
30 |
+ |
31 |
+EAPI=6 |
32 |
+GCONF_DEBUG="no" |
33 |
+ |
34 |
+PYTHON_COMPAT=( python2_7 ) |
35 |
+PYTHON_REQ_USE="sqlite" |
36 |
+ |
37 |
+ANTLR_VERSION=4.7.1 |
38 |
+ |
39 |
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils |
40 |
+ |
41 |
+MY_P="${PN}-community-${PV}-src" |
42 |
+ |
43 |
+DESCRIPTION="MySQL Workbench" |
44 |
+HOMEPAGE="https://www.mysql.com/products/workbench/" |
45 |
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz |
46 |
+ https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" |
47 |
+ |
48 |
+LICENSE="GPL-2" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
51 |
+IUSE="debug doc gnome-keyring" |
52 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
53 |
+ |
54 |
+# glibc: deprecated mutex functions, removed in 2.36.0 |
55 |
+CDEPEND="${PYTHON_DEPS} |
56 |
+ app-crypt/libsecret |
57 |
+ dev-libs/glib:2 |
58 |
+ dev-cpp/antlr-cpp:4 |
59 |
+ dev-cpp/atkmm |
60 |
+ dev-cpp/pangomm |
61 |
+ >=dev-cpp/glibmm-2.14:2 |
62 |
+ dev-cpp/gtkmm:3.0 |
63 |
+ dev-libs/atk |
64 |
+ >=net-libs/libssh-0.7.3[server] |
65 |
+ x11-libs/pango |
66 |
+ x11-libs/gtk+:3 |
67 |
+ gnome-base/libglade:2.0 |
68 |
+ >=x11-libs/cairo-1.5.12[glib,svg] |
69 |
+ dev-libs/libsigc++:2 |
70 |
+ >=dev-libs/boost-1.55.0[nls] |
71 |
+ >=dev-cpp/ctemplate-0.95 |
72 |
+ >=dev-libs/libxml2-2.6.2:2 |
73 |
+ dev-libs/libzip |
74 |
+ dev-libs/libpcre[cxx] |
75 |
+ >=sci-libs/gdal-1.11.1-r1[-mdb] |
76 |
+ virtual/opengl |
77 |
+ || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
78 |
+ dev-libs/tinyxml[stl] |
79 |
+ >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* |
80 |
+ dev-db/vsqlite++ |
81 |
+ || ( dev-db/libiodbc dev-db/unixODBC ) |
82 |
+ gnome-keyring? ( gnome-base/libgnome-keyring ) |
83 |
+ dev-python/pexpect |
84 |
+ >=dev-python/paramiko-1.7.4 |
85 |
+" |
86 |
+ |
87 |
+RDEPEND="${CDEPEND} |
88 |
+ app-admin/sudo |
89 |
+ >=sys-apps/net-tools-1.60_p20120127084908" |
90 |
+ |
91 |
+DEPEND="${CDEPEND} |
92 |
+ dev-lang/swig |
93 |
+ virtual/jre |
94 |
+ virtual/pkgconfig" |
95 |
+ |
96 |
+S="${WORKDIR}"/"${MY_P}" |
97 |
+ |
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
100 |
+ "${FILESDIR}/${PN}-6.3.10-i386-json.patch" |
101 |
+) |
102 |
+ |
103 |
+src_unpack() { |
104 |
+ unpack ${PN}-community-${PV}-src.tar.gz |
105 |
+} |
106 |
+ |
107 |
+src_prepare() { |
108 |
+ ## remove hardcoded CXXFLAGS |
109 |
+ sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |
110 |
+ ## And avoid -Werror |
111 |
+ sed -i -e 's/-Werror//' CMakeLists.txt || die |
112 |
+ |
113 |
+ ## package is very fragile... |
114 |
+ strip-flags |
115 |
+ |
116 |
+ cmake-utils_src_prepare |
117 |
+} |
118 |
+ |
119 |
+src_configure() { |
120 |
+ if has_version dev-db/libiodbc ; then |
121 |
+ IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" |
122 |
+ fi |
123 |
+ |
124 |
+ append-cxxflags -std=c++11 |
125 |
+ ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" |
126 |
+ local mycmakeargs=( |
127 |
+ -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} |
128 |
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
129 |
+ -DIODBC_INCLUDE_PATH="/usr/include/iodbc" |
130 |
+ ${IODBC} |
131 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
132 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
133 |
+ -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" |
134 |
+ ) |
135 |
+ cmake-utils_src_configure |
136 |
+} |
137 |
|
138 |
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild |
139 |
new file mode 100644 |
140 |
index 00000000000..2b07cff38b1 |
141 |
--- /dev/null |
142 |
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild |
143 |
@@ -0,0 +1,109 @@ |
144 |
+# Copyright 1999-2020 Gentoo Authors |
145 |
+# Distributed under the terms of the GNU General Public License v2 |
146 |
+ |
147 |
+EAPI=6 |
148 |
+GCONF_DEBUG="no" |
149 |
+ |
150 |
+PYTHON_COMPAT=( python2_7 ) |
151 |
+PYTHON_REQ_USE="sqlite" |
152 |
+ |
153 |
+ANTLR_VERSION=4.7.1 |
154 |
+ |
155 |
+inherit gnome2 flag-o-matic python-single-r1 cmake-utils |
156 |
+ |
157 |
+MY_P="${PN}-community-${PV}-src" |
158 |
+ |
159 |
+DESCRIPTION="MySQL Workbench" |
160 |
+HOMEPAGE="https://www.mysql.com/products/workbench/" |
161 |
+SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz |
162 |
+ https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" |
163 |
+ |
164 |
+LICENSE="GPL-2" |
165 |
+SLOT="0" |
166 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
167 |
+IUSE="debug doc" |
168 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
169 |
+ |
170 |
+# glibc: deprecated mutex functions, removed in 2.36.0 |
171 |
+CDEPEND="${PYTHON_DEPS} |
172 |
+ app-crypt/libsecret |
173 |
+ dev-libs/glib:2 |
174 |
+ dev-cpp/antlr-cpp:4 |
175 |
+ dev-cpp/atkmm |
176 |
+ dev-cpp/pangomm |
177 |
+ >=dev-cpp/glibmm-2.14:2 |
178 |
+ dev-cpp/gtkmm:3.0 |
179 |
+ dev-libs/atk |
180 |
+ >=net-libs/libssh-0.8.5[server] |
181 |
+ x11-libs/pango |
182 |
+ x11-libs/gtk+:3 |
183 |
+ gnome-base/libglade:2.0 |
184 |
+ >=x11-libs/cairo-1.5.12[glib,svg] |
185 |
+ >=dev-libs/rapidjson-1.1.0 |
186 |
+ dev-libs/libsigc++:2 |
187 |
+ >=dev-libs/boost-1.55.0[nls] |
188 |
+ >=dev-cpp/ctemplate-0.95 |
189 |
+ >=dev-libs/libxml2-2.6.2:2 |
190 |
+ dev-libs/libzip |
191 |
+ dev-libs/libpcre[cxx] |
192 |
+ >=sci-libs/gdal-1.11.1-r1 |
193 |
+ virtual/opengl |
194 |
+ || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) |
195 |
+ dev-libs/tinyxml[stl] |
196 |
+ >=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1* |
197 |
+ dev-db/vsqlite++ |
198 |
+ || ( dev-db/libiodbc dev-db/unixODBC ) |
199 |
+ dev-python/pexpect |
200 |
+ >=dev-python/paramiko-1.7.4 |
201 |
+" |
202 |
+ |
203 |
+RDEPEND="${CDEPEND} |
204 |
+ app-admin/sudo |
205 |
+ >=sys-apps/net-tools-1.60_p20120127084908" |
206 |
+ |
207 |
+DEPEND="${CDEPEND} |
208 |
+ dev-lang/swig |
209 |
+ virtual/jre |
210 |
+ virtual/pkgconfig" |
211 |
+ |
212 |
+S="${WORKDIR}"/"${MY_P}" |
213 |
+ |
214 |
+PATCHES=( |
215 |
+ "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" |
216 |
+ "${FILESDIR}/${P}-mysql-connector-8.patch" |
217 |
+) |
218 |
+ |
219 |
+src_unpack() { |
220 |
+ unpack ${PN}-community-${PV}-src.tar.gz |
221 |
+} |
222 |
+ |
223 |
+src_prepare() { |
224 |
+ ## remove hardcoded CXXFLAGS |
225 |
+ sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die |
226 |
+ ## And avoid -Werror |
227 |
+ sed -i -e 's/-Werror//' CMakeLists.txt || die |
228 |
+ |
229 |
+ ## package is very fragile... |
230 |
+ strip-flags |
231 |
+ |
232 |
+ cmake-utils_src_prepare |
233 |
+} |
234 |
+ |
235 |
+src_configure() { |
236 |
+ if has_version dev-db/libiodbc ; then |
237 |
+ IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" |
238 |
+ fi |
239 |
+ |
240 |
+ append-cxxflags -std=c++11 |
241 |
+ ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" |
242 |
+ local mycmakeargs=( |
243 |
+ -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} |
244 |
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)" |
245 |
+ -DIODBC_INCLUDE_PATH="/usr/include/iodbc" |
246 |
+ ${IODBC} |
247 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
248 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
249 |
+ -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" |
250 |
+ ) |
251 |
+ cmake-utils_src_configure |
252 |
+} |