1 |
commit: 9ac346b7c9110d5ecc7d6601064e2aaafa1c7e61 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jan 19 09:22:16 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 05:35:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac346b7 |
7 |
|
8 |
dev-db/mysql-workbench: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/10868 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
.../files/mysql-workbench-6.2.3-CMakeLists.patch | 43 ---------------------- |
15 |
.../mysql-workbench-6.3.3-mysql_options4.patch | 40 -------------------- |
16 |
.../files/mysql-workbench-6.3.4-cxx11.patch | 39 -------------------- |
17 |
.../files/mysql-workbench-6.3.4-gtk.patch | 38 ------------------- |
18 |
4 files changed, 160 deletions(-) |
19 |
|
20 |
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 |
21 |
deleted file mode 100644 |
22 |
index 6e9a4d5e141..00000000000 |
23 |
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.3-CMakeLists.patch |
24 |
+++ /dev/null |
25 |
@@ -1,43 +0,0 @@ |
26 |
---- mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-08-30 18:05:12.000000000 +0200 |
27 |
-+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt 2013-09-08 11:41:18.723838826 +0200 |
28 |
-@@ -18,6 +18,9 @@ |
29 |
- find_package(PkgConfig REQUIRED) |
30 |
- |
31 |
- find_package(GTK2 2.20 REQUIRED gtk gtkmm) |
32 |
-+if (NOT GTK2_FOUND) |
33 |
-+ message( FATAL_ERROR "Not all GTK2 components were found!" ) |
34 |
-+endif() |
35 |
- pkg_check_modules(GTHREAD REQUIRED gthread-2.0) |
36 |
- pkg_check_modules(GMODULE REQUIRED gmodule-2.0) |
37 |
- set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS}) |
38 |
-@@ -32,7 +35,8 @@ |
39 |
- endif () |
40 |
- |
41 |
- # All known publicly available versions of Antlr3C are buggy |
42 |
-- |
43 |
-+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973 |
44 |
-+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too |
45 |
- if (SKIP_BUNDLED_ANTLR) |
46 |
- find_package(Antlr3C) |
47 |
- endif () |
48 |
-@@ -89,7 +93,8 @@ |
49 |
- pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12) |
50 |
- pkg_check_modules(UUID REQUIRED uuid) |
51 |
- pkg_check_modules(LIBZIP REQUIRED libzip) |
52 |
--if (UNIX) |
53 |
-+ |
54 |
-+if (UNIX AND USE_GNOME_KEYRING) |
55 |
- pkg_check_modules(GNOME_KEYRING gnome-keyring-1) |
56 |
- if (GNOME_KEYRING_FOUND) |
57 |
- set(KEYRING_DEFINITION "HAVE_GNOME_KEYRING") |
58 |
-@@ -99,7 +104,10 @@ |
59 |
- set(KEYRING_DEFINITION "HAVE_OLD_GNOME_KEYRING") |
60 |
- endif() |
61 |
- endif() |
62 |
-+ if (NOT GNOME_KEYRING_FOUND) |
63 |
-+ message( FATAL_ERROR "Gnome keyring libraries could not be found" ) |
64 |
-+ endif() |
65 |
- endif() |
66 |
- |
67 |
- include (CheckFunctionExists) |
68 |
- |
69 |
|
70 |
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 |
71 |
deleted file mode 100644 |
72 |
index 7fb9c8d57fc..00000000000 |
73 |
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch |
74 |
+++ /dev/null |
75 |
@@ -1,40 +0,0 @@ |
76 |
---- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-15 15:54:19.000000000 +0200 |
77 |
-+++ plugins/migration/copytable/copytable.cpp 2015-04-26 08:53:08.871167725 +0200 |
78 |
-@@ -1920,12 +1920,17 @@ |
79 |
- _incoming_data_charset = "latin1"; |
80 |
- |
81 |
- mysql_init(&_mysql); |
82 |
-+/* This is optional has compiled in for MySQL >= 5.6.6 |
83 |
-+ * Looks like MariaDB does not support this as supposed, |
84 |
-+ * so disable completly. */ |
85 |
-+#ifndef MARIADB_BASE_VERSION |
86 |
- #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) |
87 |
- #if MYSQL_CHECK_VERSION(5,6,6) |
88 |
- if (is_mysql_version_at_least(5,6,6)) |
89 |
- mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); |
90 |
- #endif |
91 |
- #endif |
92 |
-+#endif |
93 |
- |
94 |
- // _bulk_insert_record is used to prepare a single record string, the connection |
95 |
- // is needed to escape binary data properly |
96 |
---- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-26 08:57:30.444285953 +0200 |
97 |
-+++ plugins/migration/copytable/copytable.cpp 2015-04-26 10:16:39.234711324 +0200 |
98 |
-@@ -2875,6 +2875,9 @@ |
99 |
- |
100 |
- // This function is used to create a legal SQL string that you can use in an SQL statement |
101 |
- // This is needed because the escaping depends on the character set in use by the server |
102 |
-+ #ifdef MARIADB_BASE_VERSION |
103 |
-+ length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); |
104 |
-+ #else |
105 |
- #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) |
106 |
- #if MYSQL_CHECK_VERSION(5,7,6) |
107 |
- if (is_mysql_version_at_least(5,7,6)) |
108 |
-@@ -2885,6 +2888,7 @@ |
109 |
- length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); |
110 |
- #endif |
111 |
- #endif |
112 |
-+ #endif |
113 |
- |
114 |
- return true; |
115 |
- } |
116 |
|
117 |
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 |
118 |
deleted file mode 100644 |
119 |
index e8ed54a8c70..00000000000 |
120 |
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-cxx11.patch |
121 |
+++ /dev/null |
122 |
@@ -1,39 +0,0 @@ |
123 |
-Last-Update: 2015-10-24 |
124 |
-Forwarded: not-needed |
125 |
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=78668 |
126 |
-From: Marcin Szalowicz |
127 |
-Author: Dmitry Smirnov <onlyjob@××××××××××.org> |
128 |
-Description: fix FTBFS |
129 |
- ~~~~ |
130 |
- library/forms/view.cpp:515:32: error: cannot convert 'boost::signals2::signal<bool()>::result_type {aka boost::optional<bool>}' to 'bool' in return |
131 |
- return _signal_mouse_leave(); |
132 |
- ^ |
133 |
- library/forms/CMakeFiles/mforms.dir/build.make:1865: recipe for target 'library/forms/CMakeFiles/mforms.dir/view.cpp.o' failed |
134 |
- ~~~~ |
135 |
- |
136 |
---- a/library/forms/swig/mforms.i |
137 |
-+++ b/library/forms/swig/mforms.i |
138 |
-@@ -532,9 +532,9 @@ |
139 |
- void add_##method(PyObject *callback) { signal->connect(pycall_void_toolbaritem_fun(callback)); } |
140 |
- |
141 |
- #define SWIG_ADD_SIGNAL_BOOL_INT_CALLBACK(method, signal)\ |
142 |
- void add_##method(PyObject *callback) { signal->connect(pycall_bool_int_fun(callback)); }\ |
143 |
-- bool call_##method(int i) { return (*signal)(i); } |
144 |
-+ bool call_##method(int i) { return *( (*signal)(i) ); } |
145 |
- |
146 |
- #define SWIG_ADD_SIGNAL_VOID_ENTRYACTION_CALLBACK(method, signal)\ |
147 |
- void add_##method(PyObject *callback) { signal->connect(pycall_void_entryaction_fun(callback)); } |
148 |
- |
149 |
---- a/library/forms/view.cpp |
150 |
-+++ b/library/forms/view.cpp |
151 |
-@@ -511,9 +511,9 @@ |
152 |
- |
153 |
- bool View::mouse_leave() |
154 |
- { |
155 |
- if (_signal_mouse_leave.num_slots() > 0) |
156 |
-- return _signal_mouse_leave(); |
157 |
-+ return *_signal_mouse_leave(); |
158 |
- return false; |
159 |
- } |
160 |
- |
161 |
- //-------------------------------------------------------------------------------------------------- |
162 |
|
163 |
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 |
164 |
deleted file mode 100644 |
165 |
index e975906e19a..00000000000 |
166 |
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.4-gtk.patch |
167 |
+++ /dev/null |
168 |
@@ -1,38 +0,0 @@ |
169 |
-Last-Update: 2016-11-13 |
170 |
-Forwarded: not-needed |
171 |
-Author: Dmitry Smirnov <onlyjob@××××××.org> |
172 |
-Bug-Debian: https://bugs.debian.org/839356 |
173 |
-Description: fix FTBFS |
174 |
- |
175 |
---- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popover.cpp |
176 |
-+++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popover.cpp |
177 |
-@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const i |
178 |
- if (_style == mforms::PopoverStyleTooltip) |
179 |
- { |
180 |
- Glib::RefPtr<Gdk::Window> wnd = this->get_window(); |
181 |
-- if (wnd != 0) |
182 |
-+ if (wnd) |
183 |
- { |
184 |
- int xx; |
185 |
- int yy; |
186 |
-@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const i |
187 |
- { |
188 |
- Gdk::ModifierType mask; |
189 |
- Glib::RefPtr<Gdk::Display> dsp = Gdk::Display::get_default(); |
190 |
-- if (dsp != 0) |
191 |
-+ if (dsp) |
192 |
- dsp->get_pointer(x, y, mask); |
193 |
- } |
194 |
- |
195 |
---- mysql-workbench-6.3.4+dfsg.orig/library/forms/gtk/src/lf_popup.cpp |
196 |
-+++ mysql-workbench-6.3.4+dfsg/library/forms/gtk/src/lf_popup.cpp |
197 |
-@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const |
198 |
- { |
199 |
- d("\n"); |
200 |
- Glib::RefPtr<Gdk::Colormap> colormap = screen->get_rgba_colormap(); |
201 |
-- _have_rgba = colormap; |
202 |
-+ if (colormap) |
203 |
-+ _have_rgba = true; |
204 |
- |
205 |
- if (!_have_rgba) |
206 |
- colormap = screen->get_rgb_colormap(); |