packages: mysql-workbench/mysql-workbench-build.patch, mysql-workbench/mysq...

arekm arekm at pld-linux.org
Thu Feb 3 14:32:19 CET 2011 

Author: arekm                        Date: Thu Feb  3 13:32:19 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.2.31

---- Files affected:
packages/mysql-workbench:
   mysql-workbench-build.patch (1.2 -> 1.3) , mysql-workbench-python_libs.patch (1.2 -> 1.3) , mysql-workbench.spec (1.24 -> 1.25) , mysql-workbench-5.2.30-mysql55.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql-workbench/mysql-workbench-build.patch
diff -u packages/mysql-workbench/mysql-workbench-build.patch:1.2 packages/mysql-workbench/mysql-workbench-build.patch:1.3
--- packages/mysql-workbench/mysql-workbench-build.patch:1.2	Tue May 18 12:05:29 2010
+++ packages/mysql-workbench/mysql-workbench-build.patch	Thu Feb  3 14:32:14 2011
@@ -31,3 +31,14 @@
  
  wb_validation_grt_la_SOURCES=src/register_plugin.cpp\
  	src/wb_module_validation.cpp
+--- mysql-workbench-oss-5.2.21/backend/wbprivate/model/canvas_floater.cpp~	2010-05-11 15:50:45.000000000 +0200
++++ mysql-workbench-oss-5.2.21/backend/wbprivate/model/canvas_floater.cpp	2010-05-18 12:06:16.387985948 +0200
+@@ -62,7 +62,7 @@
+     _title->set_padding(6, 6);
+     _title->set_font(mdc::FontSpec("helvetica", mdc::SNormal, mdc::WBold));
+     _title->set_color(mdc::Color::Black());
+-    _title->set_text_color(mdc::Color::Color(0.7, 0.7, 0.7));
++    _title->set_text_color(mdc::Color(0.7, 0.7, 0.7));
+     _title->set_rounded(mdc::CTop);
+     add(_title, false, false);
+   }

================================================================
Index: packages/mysql-workbench/mysql-workbench-python_libs.patch
diff -u packages/mysql-workbench/mysql-workbench-python_libs.patch:1.2 packages/mysql-workbench/mysql-workbench-python_libs.patch:1.3
--- packages/mysql-workbench/mysql-workbench-python_libs.patch:1.2	Fri Jul  2 10:02:14 2010
+++ packages/mysql-workbench/mysql-workbench-python_libs.patch	Thu Feb  3 14:32:14 2011
@@ -6,10 +6,10 @@
 http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=blob;f=dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch;h=8fb6b71e91b0c5e14bb542e05f2bab1da4dbc60d;hb=6c2a287fc8cd60b3806ec3d5b058a513c4b417b5
 --- mysql-workbench-oss-5.2.22/configure.in	2010-04-02 03:26:27.000000000 +0200
 +++ mysql-workbench-oss-5.2.22/configure.in	2010-04-09 16:06:10.271092660 +0200
-@@ -303,12 +303,7 @@
- dnl 	enable_python=$enableval, enable_python=no)
- 
- AC_MSG_CHECKING(for Python)
+@@ -280,12 +280,7 @@
+ AC_CHECK_PROG(PYTHON27, python2.7, [yes])
+ # Python headers
+ AC_MSG_CHECKING(for Python libraries)
 -PYTHON_LIBS=[$(python -c "from distutils import sysconfig
 -import os 
 -cfg=sysconfig.get_config_vars()
@@ -20,3 +20,4 @@
  PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
  print sysconfig.get_python_inc()")]
  PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
+

================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.24 packages/mysql-workbench/mysql-workbench.spec:1.25
--- packages/mysql-workbench/mysql-workbench.spec:1.24	Mon Jan 31 09:52:50 2011
+++ packages/mysql-workbench/mysql-workbench.spec	Thu Feb  3 14:32:14 2011
@@ -2,15 +2,16 @@
 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.29
-Release:	2
+Version:	5.2.31
+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:	80f379871c5cd8cc04673d5e3edda173
+# Source0-md5:	3021ce9802a90956ac5bcd4145dedb1e
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-python_libs.patch
 Patch2:		%{name}-replace_gnome_url_show_by_xdg-open.patch
+Patch3:		mysql-workbench-5.2.30-mysql55.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -47,6 +48,9 @@
 Obsoletes:	mysql-query-browser
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# too broken
+%define		no_install_post_check_so	1
+
 %description
 MySQL Workbench is a database modeling tool for MySQL. You can use it
 to design and create new database schemas, document existing databases
@@ -61,10 +65,18 @@
 %prep
 %setup -q -n %{name}-gpl-%{version}-src
 %undos MySQLWorkbench.desktop.in
+# we use System provided libraries
 rm -rf ext/boost
+rm -rf ext/curl
+rm -rf ext/libsigc++
+rm -rf ext/yassl
+# rm -rf ext/cppconn
+# rm -rf ext/ctemplate
+# rm -rf library/tinyxml
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__glib_gettextize}
@@ -111,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/02/03 13:32:14  arekm
+- up to 5.2.31
+
 Revision 1.24  2011/01/31 08:52:50  arekm
 - release 2
 

================================================================
Index: packages/mysql-workbench/mysql-workbench-5.2.30-mysql55.patch
diff -u /dev/null packages/mysql-workbench/mysql-workbench-5.2.30-mysql55.patch:1.1
--- /dev/null	Thu Feb  3 14:32:19 2011
+++ packages/mysql-workbench/mysql-workbench-5.2.30-mysql55.patch	Thu Feb  3 14:32:14 2011
@@ -0,0 +1,34 @@
+--- mysql-workbench-gpl-5.2.30-src/library/sql-parser/source/my_global.h.mysql55	2010-11-18 23:04:05.000000000 +0100
++++ mysql-workbench-gpl-5.2.30-src/library/sql-parser/source/my_global.h	2010-12-28 18:11:29.000000000 +0100
+@@ -24,6 +24,20 @@
+ #define HAVE_EXTERNAL_CLIENT
+ #endif
+ 
++/* 
++  MYSQL_PLUGIN_IMPORT macro is used to export mysqld data
++  (i.e variables) for usage in storage engine loadable plugins.
++  Outside of Windows, it is dummy.
++*/
++#ifndef MYSQL_PLUGIN_IMPORT
++#if (defined(_WIN32) && defined(MYSQL_DYNAMIC_PLUGIN))
++#define MYSQL_PLUGIN_IMPORT __declspec(dllimport)
++#else
++#define MYSQL_PLUGIN_IMPORT
++#endif
++#endif
++
++
+ #if defined( __EMX__) && !defined( MYSQL_SERVER)
+ /* moved here to use below VOID macro redefinition */
+ #define INCL_BASE
+@@ -1013,8 +1027,8 @@
+ typedef char		byte;	/* Smallest addressable unit */
+ #endif
+ typedef char		my_bool; /* Small bool */
+-#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
+-typedef char		bool;	/* Ordinary boolean values 0 1 */
++#if !defined(__cplusplus) && !defined(bool)
++#define bool In_C_you_should_use_my_bool_instead()
+ #endif
+ 	/* Macros for converting *constants* to the right type */
+ #define INT8(v)		(int8) (v)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench-build.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench-python_libs.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench.spec?r1=1.24&r2=1.25&f=u

More information about the pld-cvs-commit mailing list