[packages/mysql-workbench] - up to 6.3.4; unfortunately fails to build - http://bugs.mysql.com/bug.php?id=78668

arekm arekm at pld-linux.org
Thu Oct 15 12:09:49 CEST 2015


commit e4ef0475bcf3b2ad257dfd42a1786acf15566154
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Oct 15 12:09:43 2015 +0200

    - up to 6.3.4; unfortunately fails to build - http://bugs.mysql.com/bug.php?id=78668

 mysql-workbench.spec | 10 ++++++----
 wrapper-exec.patch   | 21 +++++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index e6141fb..c474391 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.3
-Release:	2
+Version:	6.3.4
+Release:	0.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:	f42b0ecfcc55fe241d7f28617962d77d
+# Source0-md5:	9bcbde151b46cfa374a906cd57dec33a
 Source1:	http://www.antlr3.org/download/antlr-3.4-complete.jar
 # Source1-md5:	1b91dea1c7d480b3223f7c8a9aa0e172
 Source2:	PLD_Linux_(MySQL_Package).xml
@@ -35,7 +35,7 @@ BuildRequires:	automake >= 1.9
 BuildRequires:	boost-devel
 BuildRequires:	cairo-devel >= 1.5.12
 BuildRequires:	cmake >= 2.8
-BuildRequires:	ctemplate-devel
+BuildRequires:	ctemplate-devel >= 2.3
 BuildRequires:	gdal-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gtkmm-devel >= 2.12
@@ -80,6 +80,8 @@ Obsoletes:	mysql-gui-tools
 Obsoletes:	mysql-query-browser
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		specflags			-std=gnu++11
+
 # too broken
 %define		no_install_post_check_so	1
 
diff --git a/wrapper-exec.patch b/wrapper-exec.patch
index d845989..d1064af 100644
--- a/wrapper-exec.patch
+++ b/wrapper-exec.patch
@@ -1,12 +1,13 @@
---- mysql-workbench-community-6.1.4-nodocs-src/frontend/linux/workbench/mysql-workbench.in~	2014-03-26 17:47:23.000000000 +0200
-+++ mysql-workbench-community-6.1.4-nodocs-src/frontend/linux/workbench/mysql-workbench.in	2014-05-04 00:46:34.728331575 +0300
-@@ -51,7 +51,7 @@
- export MWB_BINARIES_DIR="$destdir at WB_INSTALL_DIR_EXECUTABLE@"
- 
- if type -p catchsegv > /dev/null; then
--catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
-+exec catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
+--- mysql-workbench-community-6.3.4-src/frontend/linux/workbench/mysql-workbench.in~	2015-10-15 10:22:21.000000000 +0200
++++ mysql-workbench-community-6.3.4-src/frontend/linux/workbench/mysql-workbench.in	2015-10-15 10:22:52.565329843 +0200
+@@ -74,8 +74,8 @@
+   $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
  else
--$MWB_BINARIES_DIR/mysql-workbench-bin "$@"
-+exec $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
+   if type -p catchsegv > /dev/null; then
+-  catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
++  exec catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
+   else
+-  $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
++  exec $MWB_BINARIES_DIR/mysql-workbench-bin "$@"
+   fi
  fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/e4ef0475bcf3b2ad257dfd42a1786acf15566154



More information about the pld-cvs-commit mailing list