Author: arekm Date: Sun Apr 3 07:29:45 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 6; build fix
---- Files affected:
packages/mysql-workbench:
mysql-workbench-build.patch (1.3 -> 1.4) , mysql-workbench.spec (1.31 ->
1.32)
---- Diffs:
================================================================
Index: packages/mysql-workbench/mysql-workbench-build.patch
diff -u packages/mysql-workbench/mysql-workbench-build.patch:1.3
packages/mysql-workbench/mysql-workbench-build.patch:1.4
--- packages/mysql-workbench/mysql-workbench-build.patch:1.3 Thu Feb 3
14:32:14 2011
+++ packages/mysql-workbench/mysql-workbench-build.patch Sun Apr 3
09:29:40 2011
@@ -1,44 +1,13 @@
---- 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 @@
+diff -up
mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46
mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp
+---
mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46
2011-03-23 16:56:16.000000000 +0100
++++
mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp
2011-03-23 17:07:36.000000000 +0100
+@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo
+ }
+ Glib::RefPtr<Gtk::ListStore> model=
Gtk::ListStore::create(*color_combo_columns);
+- Gtk::ComboBox *combo= new Gtk::ComboBox(model);
++ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel>
&)model);
- 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
+ combo->pack_start(color_combo_columns->image);
- 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.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.31
packages/mysql-workbench/mysql-workbench.spec:1.32
--- packages/mysql-workbench/mysql-workbench.spec:1.31 Sun Apr 3 08:52:33 2011
+++ packages/mysql-workbench/mysql-workbench.spec Sun Apr 3 09:29:40 2011
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a
Name: mysql-workbench
Version: 5.2.33
-Release: 5
+Release: 6
License: GPL v2
Group: Applications/Databases
Source0:
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}b-src.tar.gz
@@ -11,6 +11,7 @@
Patch0: %{name}-desktop.patch
Patch1: %{name}-python_libs.patch
Patch2: %{name}-replace_gnome_url_show_by_xdg-open.patch
+Patch3: %{name}-build.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
@@ -76,6 +77,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__glib_gettextize}
@@ -122,6 +124,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2011/04/03 07:29:40 arekm
+- rel 6; build fix
+
Revision 1.31 2011/04/03 06:52:33 arekm
- rel 5; 5.2.33b
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench-build.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench.spec?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
