commit 97e6bd11f166340a3c61be283790b761e81bb6f8
Author: Elan Ruusamäe <[email protected]>
Date: Thu May 1 20:44:58 2014 +0300
up to 5.2.47
libzip-headers.patch | 38 ++++++++++++++++++++++++++++++++++++++
log_slow_queries.patch | 16 ++++++++--------
mysql-workbench.spec | 6 ++++--
3 files changed, 50 insertions(+), 10 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 7751096..2fd16aa 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -6,12 +6,12 @@
Summary: Extensible modeling tool for MySQL
Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a
Name: mysql-workbench
-Version: 5.2.46
+Version: 5.2.47
Release: 1
License: GPL v2
Group: Applications/Databases
Source0:
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}-src.tar.gz
-# Source0-md5: 3aec37396b1af487d3d94e3427ccd387
+# Source0-md5: e7cfb1249dddf628a6586bc309679ef3
Source1: PLD_Linux_(MySQL_Package).xml
Patch0: %{name}-desktop.patch
Patch1: %{name}-python_libs.patch
@@ -24,6 +24,7 @@ Patch8: bashism.patch
Patch9: system-cppconn.patch
Patch10: avoid-version.patch
Patch11: wrapper-exec.patch
+Patch12: libzip-headers.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
@@ -101,6 +102,7 @@ rm -r ext/python/pexpect
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
cp -p '%{SOURCE1}' res/mysql.profiles
%build
diff --git a/libzip-headers.patch b/libzip-headers.patch
new file mode 100644
index 0000000..756649f
--- /dev/null
+++ b/libzip-headers.patch
@@ -0,0 +1,38 @@
+
+Fix missing libzip includedir
+
+
+/grt -I../../ext/cppconn/ -I../../library/dbc/src
-I../../ext/scintilla/include -I../../ext/vsqlite++/include -I../../ext/vsqli
+te -I../../ext/tinyxml -O2 -fwrapv -pipe -Wformat -Werror=format-security
-gdwarf-4 -fno-debug-types-section -fvar-tracking-
+assignments -g2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector
--param=ssp-buffer-size=4 -fPIC -march=x86-64 -gdwarf-4 -fno-debug-ty
+pes-section -fvar-tracking-assignments -g2 -Wextra -Wall -Wno-unused
-Wno-deprecated -DTIXML_USE_STL=1 -c -o wb_model_file.
+o `test -f 'workbench/wb_model_file.cpp' || echo
'./'`workbench/wb_model_file.cpp
+In file included from workbench/wb_model_file.cpp:24:0:
+/usr/include/zip.h:53:21: fatal error: zipconf.h: No such file or directory
+ #include <zipconf.h>
+ ^
+compilation terminated.
+Makefile:1126: recipe for target 'wb_model_file.o' failed
+make[3]: *** [wb_model_file.o] Error 1
+make[3]: *** Waiting for unfinished jobs....
+In file included from ../../backend/wbpublic/grt/grt_manager.h:22:0,
+ from workbench/wb_command_ui.h:25,
+ from workbench/wb_context_ui.h:31,
+ from workbench/wb_command_ui.cpp:23:
+../../library/grt/src/grtpp.h:113:5: warning: unused parameter 'index'
[-Wunused-parameter]
+ bad_item(size_t index, size_t count) : std::logic_error("Index out of
range.") {}
+ ^
+../../library/grt/src/grtpp.h:113:5: warning: unused parameter 'count'
[-Wunused-parameter]
+In file included from ../../backend/wbpublic/grt/grt_dispatcher.h:23:0,
+ from ../../backend/wbpublic/grt/grt_manager.h:26,
+--- mysql-workbench-gpl-5.2.47-src/backend/wbprivate/Makefile.am~
2013-02-14 22:54:06.000000000 +0200
++++ mysql-workbench-gpl-5.2.47-src/backend/wbprivate/Makefile.am
2014-05-01 18:39:09.127379244 +0300
+@@ -2,7 +2,7 @@
+
+ noinst_LIBRARIES=libwbprivate.a
+
+-INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@
@GNOME_CFLAGS@ @PCRE_CFLAGS@\
++INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@
@GNOME_CFLAGS@ @PCRE_CFLAGS@ @ZIP_CFLAGS@ \
+ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/base\
+ -I$(top_srcdir)/library/forms\
+ -I$(top_srcdir)/library/forms/mforms\
diff --git a/log_slow_queries.patch b/log_slow_queries.patch
index fc73e9e..98d68a9 100644
--- a/log_slow_queries.patch
+++ b/log_slow_queries.patch
@@ -1,11 +1,11 @@
----
mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_admin_control.py~
2012-09-26 23:50:47.000000000 +0300
-+++
mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_admin_control.py
2012-10-04 11:51:21.335635822 +0300
-@@ -677,7 +677,7 @@
- general_log_file_path = opts[config_section].get('log',
'').strip(' "') if opts.has_key(config_section) else ''
- self.server_profile.general_log_file_path =
general_log_file_path or os.path.join(datadir, hostname + '.log')
+---
mysql-workbench-gpl-5.2.47-src/./plugins/wb.admin/backend/wb_admin_control.py~
2013-02-14 22:54:03.000000000 +0200
++++
mysql-workbench-gpl-5.2.47-src/./plugins/wb.admin/backend/wb_admin_control.py
2014-05-01 16:06:43.138434870 +0300
+@@ -704,7 +704,7 @@
+ self.server_profile.general_log_file_path =
general_log_file_path or os.path.join(self.server_profile.datadir, hostname +
'.log')
+ request_save_profile = True
- slow_query_log_file =
opts[config_section].get('log-slow-queries', '').strip(' "') if
opts.has_key(config_section) else ''
+ slow_query_log_file =
(opts[config_section].get('log-slow-queries', '') or
opts[config_section].get('log_slow_queries', '')).strip(' "') if
opts.has_key(config_section) else ''
- self.server_profile.slow_log_file_path = slow_query_log_file
or os.path.join(datadir, hostname + '.slow')
-
- error_log_file_path = opts[config_section].get('log-error',
'').strip(' "') if opts.has_key(config_section) else ''
+ if self.server_profile.slow_log_file_path !=
slow_query_log_file:
+ self.server_profile.slow_log_file_path =
slow_query_log_file or os.path.join(self.server_profile.datadir, hostname +
'.slow')
+ request_save_profile = True
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/97e6bd11f166340a3c61be283790b761e81bb6f8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
