[packages/mysql-workbench] - updated to 6.3.10 - updated patches; added ldconfig.patch - commented json.patch - build with perc
witekfl
witekfl at pld-linux.org
Sat Mar 3 13:05:47 CET 2018
commit 99c11e7c005ddf74dfc4435354ff415d1892fcb0
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Sat Mar 3 13:01:09 2018 +0100
- updated to 6.3.10
- updated patches; added ldconfig.patch
- commented json.patch
- build with percona-server, because built with mysql-5.6 cannot connect to mariadb servers
- some features are not available, I don't know why
antlr-res.patch | 4 +--
ldconfig.patch | 11 +++++++
mysql-workbench-json.patch | 82 ++++++++++++++++------------------------------
mysql-workbench.spec | 20 ++++++-----
4 files changed, 54 insertions(+), 63 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 2a701ab..3818d2f 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -13,13 +13,13 @@
Summary: Extensible modeling tool for MySQL
Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a
Name: mysql-workbench
-Version: 6.3.7
-Release: 0.1
+Version: 6.3.10
+Release: 1
License: GPL v2
Group: Applications/Databases
# Source0Download: http://dev.mysql.com/downloads/workbench/
Source0: http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-community-%{version}-src.tar.gz
-# Source0-md5: 385987776b63ad9a1c9389a9da07a6c5
+# Source0-md5: 565e52097c58a663d3498bb740eaefe5
Source1: http://www.antlr3.org/download/antlr-3.4-complete.jar
# Source1-md5: 1b91dea1c7d480b3223f7c8a9aa0e172
Source2: PLD_Linux_(MySQL_Package).xml
@@ -30,6 +30,7 @@ Patch3: wrapper-exec.patch
Patch4: antlr-res.patch
Patch5: mysql-version.patch
Patch6: %{name}-json.patch
+Patch7: ldconfig.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
@@ -41,7 +42,7 @@ BuildRequires: ctemplate >= 2.3
BuildRequires: ctemplate-devel >= 2.3
BuildRequires: gdal-devel
BuildRequires: glib2-devel
-BuildRequires: gtkmm-devel >= 2.12
+BuildRequires: gtkmm3-devel
%{?with_system_antlr:BuildRequires: libantlr3c-devel >= 3.4}
BuildRequires: libgnome-keyring-devel
%{?with_gnome_keyring:BuildRequires: libgnome-keyring-devel}
@@ -52,8 +53,8 @@ BuildRequires: libvsqlitepp-devel
BuildRequires: libxml2-devel
BuildRequires: libzip-devel
BuildRequires: lua51-devel
-BuildRequires: mysql-connector-c++-devel >= 1.1.0-0.bzr916
-BuildRequires: mysql-devel >= 5.6.0
+BuildRequires: mysql-connector-c++-devel >= 1.1.8
+BuildRequires: /usr/bin/mysql_config
BuildRequires: pcre-cxx-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
@@ -107,7 +108,8 @@ skomplikowanych migracji do MySQL-a.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
+#%%patch6 -p1
+%patch7 -p1
cp -p '%{SOURCE2}' res/mysql.profiles
%if %{with system_antlr}
@@ -129,6 +131,7 @@ cd build
-DLIB_INSTALL_DIR=%{_libdir} \
-DWB_INSTALL_DIR_EXECUTABLE=%{_libdir}/%{name} \
-DUSE_UNIXODBC=%{!?with_unixodbc:NO}%{?with_unixodbc:YES} \
+ -DMySQL_CONFIG_PATH=%{_bindir}/mysql_config \
..
%{__make}
@@ -171,7 +174,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/*.glade
%{_datadir}/%{name}/*.py.txt
%{_datadir}/%{name}/*.py[co]
-%{_datadir}/%{name}/*.rc
+#%%{_datadir}/%{name}/*.rc
+%{_datadir}/%{name}/*.css
%{_datadir}/%{name}/*.vbs
%{_datadir}/%{name}/data
%{_datadir}/%{name}/extras
diff --git a/antlr-res.patch b/antlr-res.patch
index 458220b..789e7dc 100644
--- a/antlr-res.patch
+++ b/antlr-res.patch
@@ -1,7 +1,7 @@
stay in buildroot
---- mysql-workbench-community-6.2.5-src/library/mysql.parser/grammar/build-parser~ 2015-02-25 10:08:47.000000000 +0200
-+++ mysql-workbench-community-6.2.5-src/library/mysql.parser/grammar/build-parser 2015-05-12 11:52:46.517522447 +0300
+--- mysql-workbench-community-6.3.10-src/library/parsers/grammars/build-parsers~ 2015-02-25 10:08:47.000000000 +0200
++++ mysql-workbench-community-6.3.10-src/library/parsers/grammars/build-parsers 2015-05-12 11:52:46.517522447 +0300
@@ -2,7 +2,7 @@
TARGET_DIRECTORY=..
diff --git a/ldconfig.patch b/ldconfig.patch
new file mode 100644
index 0000000..9ffe33e
--- /dev/null
+++ b/ldconfig.patch
@@ -0,0 +1,11 @@
+--- mysql-workbench-community-6.3.10-src/frontend/linux/workbench/mysql-workbench.in.ldconfig 2018-03-03 11:33:57.108754383 +0100
++++ mysql-workbench-community-6.3.10-src/frontend/linux/workbench/mysql-workbench.in 2018-03-03 12:55:25.937612439 +0100
+@@ -22,7 +22,7 @@ wblibdir="$destdir at WB_INSTALL_LIB_DIR@"
+ # Check if PROJSO env is set and file exists, if not, try to handle this on our own
+ if [[ -z "${PROJSO}" ]]; then
+ # Set the PROJSO env variable so gdal can find proj cause it's using dlopen instead ld
+- TMPLOC=`ldconfig -p | grep libproj | awk '{printf $4;exit;}'`
++ TMPLOC=`/sbin/ldconfig -p | grep libproj | awk '{printf $4;exit;}'`
+ if [[ -f "$TMPLOC" ]]; then
+ echo "Found $TMPLOC"
+ export PROJSO=$TMPLOC
diff --git a/mysql-workbench-json.patch b/mysql-workbench-json.patch
index 864c20c..493f215 100644
--- a/mysql-workbench-json.patch
+++ b/mysql-workbench-json.patch
@@ -1,70 +1,46 @@
---- mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp~ 2015-10-17 16:35:48.000000000 +0200
-+++ mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp 2015-10-22 18:42:11.725161258 +0200
-@@ -79,7 +79,9 @@ static const char *mysql_field_type_to_n
- case MYSQL_TYPE_VAR_STRING: return "MYSQL_TYPE_VAR_STRING";
- case MYSQL_TYPE_STRING: return "MYSQL_TYPE_STRING";
- case MYSQL_TYPE_GEOMETRY: return "MYSQL_TYPE_GEOMETRY";
+--- mysql-workbench-community-6.3.10-src/plugins/migration/copytable/copytable.cpp.orig 2017-11-09 17:11:42.000000000 +0100
++++ mysql-workbench-community-6.3.10-src/plugins/migration/copytable/copytable.cpp 2018-03-02 20:07:46.147102294 +0100
+@@ -109,8 +109,10 @@ static const char *mysql_field_type_to_n
+ return "MYSQL_TYPE_STRING";
+ case MYSQL_TYPE_GEOMETRY:
+ return "MYSQL_TYPE_GEOMETRY";
+#ifdef MYSQL_TYPE_JSON
- case MYSQL_TYPE_JSON: return "MYSQL_TYPE_JSON";
+ case MYSQL_TYPE_JSON:
+ return "MYSQL_TYPE_JSON";
+#endif
default:
return "UNKNOWN";
}
-@@ -241,6 +243,7 @@ RowBuffer::RowBuffer(boost::shared_ptr<s
+@@ -295,7 +297,9 @@ RowBuffer::RowBuffer(std::shared_ptr<std
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_BIT:
+#ifdef MYSQL_TYPE_JSON
case MYSQL_TYPE_JSON:
- if (!col->is_long_data)
- bind.buffer_length = (unsigned)col->source_length+1;
-@@ -249,6 +252,7 @@ RowBuffer::RowBuffer(boost::shared_ptr<s
- if (!bind.length)
- throw std::runtime_error("Could not allocate memory for row buffer");
- break;
+#endif
- case MYSQL_TYPE_BLOB:
- case MYSQL_TYPE_GEOMETRY:
- // source_length is not reliable (and returns bogus value for access)
-@@ -1551,8 +1555,11 @@ bool MySQLCopyDataSource::fetch_row(RowB
- 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 (!col->is_long_data)
+ bind.buffer_length = (unsigned)col->source_length + 1;
+
+@@ -1392,7 +1396,11 @@ bool MySQLCopyDataSource::fetch_row(RowB
+ 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
+#ifdef MYSQL_TYPE_JSON
-+ || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
++ || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
+#endif
-+ )
- {
++ ){
if (rowbuffer[index].buffer_length)
free(rowbuffer[index].buffer);
-@@ -2357,11 +2364,13 @@ bool MySQLCopyDataTarget::append_bulk_co
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_ENUM:
- case MYSQL_TYPE_SET:
-+#ifdef MYSQL_TYPE_JSON
- case MYSQL_TYPE_JSON:
- _bulk_insert_record.append("'", 1);
- ret_val = _bulk_insert_record.append_escaped((char*)(*_row_buffer)[col_index].buffer, *(*_row_buffer)[col_index].length);
- _bulk_insert_record.append("'", 1);
- break;
-+#endif
- case MYSQL_TYPE_TIME:
- case MYSQL_TYPE_DATE:
- case MYSQL_TYPE_NEWDATE:
---- mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp~ 2015-10-17 16:35:49.000000000 +0200
-+++ mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 2015-10-22 18:58:55.605073479 +0200
-@@ -300,9 +300,11 @@ public:
- case sql::DataType::SET:
- type= "string";
- break;
+
+@@ -2162,7 +2170,9 @@ bool MySQLCopyDataTarget::append_bulk_co
+ case MYSQL_TYPE_STRING:
+ case MYSQL_TYPE_ENUM:
+ case MYSQL_TYPE_SET:
+#ifdef MYSQL_TYPE_JSON
- case sql::DataType::JSON:
- type = "json";
- break;
+ case MYSQL_TYPE_JSON:
+#endif
- case sql::DataType::SQLNULL:
- type = "null";
- break;
+ _bulk_insert_record.append("'", 1);
+ ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
+ *(*_row_buffer)[col_index].length);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/99c11e7c005ddf74dfc4435354ff415d1892fcb0
More information about the pld-cvs-commit
mailing list