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

[arekm]

Author: arekm                        Date: Tue May 18 10:05:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 5.2.21; still doesn't build

---- Files affected:
packages/mysql-workbench:
   mysql-workbench-build.patch (1.1 -> 1.2) , mysql-workbench.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/mysql-workbench/mysql-workbench-build.patch
diff -u packages/mysql-workbench/mysql-workbench-build.patch:1.1 packages/mysql-workbench/mysql-workbench-build.patch:1.2
--- packages/mysql-workbench/mysql-workbench-build.patch:1.1	Thu Apr  8 14:02:28 2010
+++ packages/mysql-workbench/mysql-workbench-build.patch	Tue May 18 12:05:29 2010
@@ -1,10 +1,33 @@
---- mysql-workbench-oss-5.1.17/library/grt/src/Makefile.am~	2009-08-14 01:09:21.000000000 +0200
-+++ mysql-workbench-oss-5.1.17/library/grt/src/Makefile.am	2010-04-08 13:49:58.694826677 +0200
-@@ -13,6 +13,7 @@
- 	@GRT_CFLAGS@
- 
- libgrt_la_LIBADD=\
-+        @GLIB_LIBS@\
-         @LUA_LIBS@\
-         $(top_srcdir)/library/utilities/src/libguiutil.la
+--- mysql-workbench-oss-5.1.17/modules/wb.model/Makefile.am~	2009-08-14 01:09:22.000000000 +0200
++++ mysql-workbench-oss-5.1.17/modules/wb.model/Makefile.am	2010-04-08 17:03:37.051164523 +0200
+@@ -66,7 +66,7 @@
  
+ 
+ wb_model_grt_la_LDFLAGS=-module
+-#wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate
++wb_model_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate/ctemplate-src/libctemplate_wb.la
+ 
+ wb_model_grt_la_SOURCES=src/graph_renderer.cpp \
+ 	src/reporting.cpp \
+--- mysql-workbench-oss-5.1.17/modules/wb.mysql.validation/Makefile.am~	2009-08-14 01:09:22.000000000 +0200
++++ mysql-workbench-oss-5.1.17/modules/wb.mysql.validation/Makefile.am	2010-04-08 17:05:50.690317559 +0200
+@@ -20,7 +20,7 @@
+ 
+ 
+ wb_mysql_validation_grt_la_LDFLAGS=-module
+-#wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
++wb_mysql_validation_grt_la_LIBADD=$(top_srcdir)/library/grt/src/libgrt.la
+ 
+ wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\
+ 	src/wb_module_validation_mysql.cpp\
+--- mysql-workbench-oss-5.1.17//modules/wb.validation/Makefile.am~	2009-08-14 01:09:22.000000000 +0200
++++ mysql-workbench-oss-5.1.17//modules/wb.validation/Makefile.am	2010-04-08 17:07:03.196977336 +0200
+@@ -19,7 +19,7 @@
+ 
+ 
+ wb_validation_grt_la_LDFLAGS=-module
+-#wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la 
++wb_validation_grt_la_LIBADD=$(top_srcdir)/library/grt/src/libgrt.la
+ 
+ wb_validation_grt_la_SOURCES=src/register_plugin.cpp\
+ 	src/wb_module_validation.cpp

================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.12 packages/mysql-workbench/mysql-workbench.spec:1.13
--- packages/mysql-workbench/mysql-workbench.spec:1.12	Sun Apr 11 17:28:05 2010
+++ packages/mysql-workbench/mysql-workbench.spec	Tue May 18 12:05:29 2010
@@ -11,12 +11,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.1.18
+Version:	5.2.21
 Release:	1
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-oss-%{version}.tar.gz
-# Source0-md5:	f136bac3e808cadda36321ac0e644399
+# Source0-md5:	460fd6f5faee3ef800a2aa2076c22535
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-build.patch
 URL:		http://wb.mysql.com/
@@ -41,9 +41,6 @@
 BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# FIXME: fix linking of m/usr/lib{,64}/mysql-workbench/plugins/*.so* modules and then drop this
-%define		filterout_ld	-Wl,--as-needed
-
 %description
 MySQL Workbench is a database modeling tool for MySQL. You can use it
 to design and create new database schemas, document existing databases
@@ -108,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/05/18 10:05:29  arekm
+- 5.2.21; still doesn't build
+
 Revision 1.12  2010/04/11 15:28:05  arvenil
 - up to 5.1.18
 
================================================================

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