Author: wiget Date: Thu Mar 29 11:17:07 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 5.2.38
---- Files affected: packages/mysql-workbench: mysql-workbench-desktop.patch (1.2 -> 1.3) , mysql-workbench.spec (1.37 -> 1.38) , automake.patch (NONE -> 1.1) (NEW), glib.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mysql-workbench/mysql-workbench-desktop.patch diff -u packages/mysql-workbench/mysql-workbench-desktop.patch:1.2 packages/mysql-workbench/mysql-workbench-desktop.patch:1.3 --- packages/mysql-workbench/mysql-workbench-desktop.patch:1.2 Wed Apr 1 21:32:30 2009 +++ packages/mysql-workbench/mysql-workbench-desktop.patch Thu Mar 29 13:17:02 2012 @@ -1,14 +1,11 @@ ---- mysql-workbench-oss-5.1.9/MySQLWorkbench.desktop.in 2009-03-20 13:40:26.000000000 +0000 -+++ mysql-workbench-oss-5.1.9/MySQLWorkbench.desktop.in 2009-04-01 19:30:48.000000000 +0000 -@@ -1,8 +1,8 @@ +--- mysql-workbench-gpl-5.2.38-src/MySQLWorkbench.desktop.in.wiget 2012-03-29 09:29:49.000000000 +0200 ++++ mysql-workbench-gpl-5.2.38-src/MySQLWorkbench.desktop.in 2012-03-29 09:33:26.656122014 +0200 +@@ -1,7 +1,7 @@ [Desktop Entry] Name=MySQL Workbench - Comment=MySQL Database Design Tool + Comment=MySQL Database Design, Administration and Development Tool -Exec=#bindir#/mysql-workbench +Exec=mysql-workbench Terminal=false Type=Application --Icon=#pkgdatadir#/images/MySQLWorkbench-48.png --Categories=GTK;Database;Development;Application -+Icon=mysql-workbench -+Categories=GTK;Database;Development; + Icon=mysql-workbench ================================================================ Index: packages/mysql-workbench/mysql-workbench.spec diff -u packages/mysql-workbench/mysql-workbench.spec:1.37 packages/mysql-workbench/mysql-workbench.spec:1.38 --- packages/mysql-workbench/mysql-workbench.spec:1.37 Wed Mar 28 14:16:35 2012 +++ packages/mysql-workbench/mysql-workbench.spec Thu Mar 29 13:17:02 2012 @@ -2,15 +2,17 @@ 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.37 -Release: 3 +Version: 5.2.38 +Release: 0.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: c7301f078834512538353ee3ce2cf460 +# Source0-md5: cd2a0cec9dffd5465b6999f5d9c8de78 Patch0: %{name}-desktop.patch Patch1: %{name}-python_libs.patch Patch2: %{name}-posix.patch +Patch3: automake.patch +Patch4: glib.patch URL: http://wb.mysql.com/ BuildRequires: OpenGL-devel BuildRequires: autoconf @@ -76,6 +78,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__glib_gettextize} @@ -122,6 +125,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2012/03/29 11:17:02 wiget +- up to 5.2.38 + Revision 1.37 2012/03/28 12:16:35 arekm - release 3 ================================================================ Index: packages/mysql-workbench/automake.patch diff -u /dev/null packages/mysql-workbench/automake.patch:1.1 --- /dev/null Thu Mar 29 13:17:07 2012 +++ packages/mysql-workbench/automake.patch Thu Mar 29 13:17:02 2012 @@ -0,0 +1,59 @@ +--- mysql-workbench-gpl-5.2.38-src/library/forms/swig/Makefile.am.wig 2012-03-29 09:35:54.086119577 +0200 ++++ mysql-workbench-gpl-5.2.38-src/library/forms/swig/Makefile.am 2012-03-29 09:37:01.652785128 +0200 +@@ -2,7 +2,8 @@ + pkglib_LTLIBRARIES=_mforms.la + + pkglibdir=$(libdir)/@PACKAGE@/modules +-pkglib_DATA=mforms.py ++pkgdatadir=$(pkglibdir) ++pkgdata_DATA=mforms.py + + _mforms_la_SOURCES=\ + mforms_wrap.cxx +--- mysql-workbench-gpl-5.2.38-src/plugins/wb.admin/frontend/Makefile.am.wig 2012-03-29 09:38:10.986117315 +0200 ++++ mysql-workbench-gpl-5.2.38-src/plugins/wb.admin/frontend/Makefile.am 2012-03-29 09:38:22.292783795 +0200 +@@ -1,7 +1,7 @@ + +-pkglibdir=$(libdir)/@PACKAGE@/modules ++pkgdatadir=$(libdir)/@PACKAGE@/modules + +-pkglib_DATA=\ ++pkgdata_DATA=\ + wb_admin_grt.py\ + wb_admin_monitor.py\ + wb_admin_utils.py\ +--- mysql-workbench-gpl-5.2.38-src/plugins/wb.bugreport/Makefile.am.wig 2012-03-29 09:38:33.322783615 +0200 ++++ mysql-workbench-gpl-5.2.38-src/plugins/wb.bugreport/Makefile.am 2012-03-29 09:38:44.196116768 +0200 +@@ -1,7 +1,7 @@ + +-pkglibdir=$(libdir)/@PACKAGE@/modules ++pkgdatadir=$(libdir)/@PACKAGE@/modules + +-pkglib_DATA=\ ++pkgdata_DATA=\ + HTMLGetData.py\ + HTMLLookup.py\ + MySQLGetRequestResult.py\ +--- mysql-workbench-gpl-5.2.38-src/plugins/wb.doclib/Makefile.am.wig 2012-03-29 09:38:56.102783239 +0200 ++++ mysql-workbench-gpl-5.2.38-src/plugins/wb.doclib/Makefile.am 2012-03-29 09:39:08.662783035 +0200 +@@ -1,7 +1,7 @@ + +-pkglibdir=$(libdir)/@PACKAGE@/modules ++pkgdatadir=$(libdir)/@PACKAGE@/modules + +-pkglib_DATA=\ ++pkgdata_DATA=\ + mysqldoclib.py\ + wb_doclib_grt.py + +--- mysql-workbench-gpl-5.2.38-src/modules/wb.utils/Makefile.am.wig 2012-03-29 09:37:24.452784753 +0200 ++++ mysql-workbench-gpl-5.2.38-src/modules/wb.utils/Makefile.am 2012-03-29 09:37:40.289451158 +0200 +@@ -1,6 +1,6 @@ + +-pkglibdir=$(libdir)/@PACKAGE@/modules ++pkgdatadir=$(libdir)/@PACKAGE@/modules + +-pkglib_DATA=catalog_utils.grt.lua tools.grt.lua wb_utils_grt.py sqlide_grt.py text_grt.py sql_reformatter.py\ ++pkgdata_DATA=catalog_utils.grt.lua tools.grt.lua wb_utils_grt.py sqlide_grt.py text_grt.py sql_reformatter.py\ + wb_dev_utils_grt.py table_utils_grt.py code_utils_grt.py + ================================================================ Index: packages/mysql-workbench/glib.patch diff -u /dev/null packages/mysql-workbench/glib.patch:1.1 --- /dev/null Thu Mar 29 13:17:07 2012 +++ packages/mysql-workbench/glib.patch Thu Mar 29 13:17:02 2012 @@ -0,0 +1,73 @@ +--- mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view.h.wig 2012-03-29 09:43:18.032778914 +0200 ++++ mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view.h 2012-03-29 09:43:28.729445403 +0200 +@@ -28,7 +28,7 @@ + #include "mdc_selection.h" + + #ifndef _WIN32 +-#include <glib/gthread.h> ++#include <glib.h> + #endif + + BEGIN_MDC_DECLS +--- mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view_printing.cpp.wig 2012-03-29 09:48:20.466107248 +0200 ++++ mysql-workbench-gpl-5.2.38-src/library/canvas/src/mdc_canvas_view_printing.cpp 2012-03-29 09:48:29.776107097 +0200 +@@ -21,7 +21,7 @@ + + #include "mdc_canvas_view.h" + #include "mdc_canvas_view_printing.h" +-#include <glib/gmessages.h> ++#include <glib.h> + + #ifdef _WIN32 + #include <cairo/cairo-win32.h> +--- mysql-workbench-gpl-5.2.38-src/library/grt/src/grtpp_util.cpp.wig 2012-03-29 09:51:11.806104420 +0200 ++++ mysql-workbench-gpl-5.2.38-src/library/grt/src/grtpp_util.cpp 2012-03-29 09:51:23.076104235 +0200 +@@ -25,7 +25,7 @@ + #include "grtpp_util.h" + #include "base/string_utilities.h" + +-#include <glib/gbase64.h> ++#include <glib.h> + #include <functional> + + using namespace grt; +--- mysql-workbench-gpl-5.2.38-src/backend/wbprivate/sqlide/wb_live_schema_tree.h.wig 2012-03-29 11:21:20.055793953 +0200 ++++ mysql-workbench-gpl-5.2.38-src/backend/wbprivate/sqlide/wb_live_schema_tree.h 2012-03-29 11:21:30.989127107 +0200 +@@ -24,7 +24,7 @@ + #include "grtpp.h" + #include "workbench/wb_backend_public_interface.h" + #include "base/string_utilities.h" +-#include <glib/gpattern.h> ++#include <glib.h> + + namespace wb + { +--- mysql-workbench-gpl-5.2.38-src/plugins/db.mysql/backend/db_plugin_be.cpp.wig 2012-03-29 12:35:37.652163391 +0200 ++++ mysql-workbench-gpl-5.2.38-src/plugins/db.mysql/backend/db_plugin_be.cpp 2012-03-29 12:35:47.015496574 +0200 +@@ -31,7 +31,7 @@ + #include "grts/structs.db.h" + #include "base/string_utilities.h" + +-#include <glib/gunicode.h> ++#include <glib.h> + + void Db_plugin::grtm(bec::GRTManager *grtm) + { +--- mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp.wig 2012-03-29 12:18:35.735513605 +0200 ++++ mysql-workbench-gpl-5.2.38-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp 2012-03-29 12:18:47.355513413 +0200 +@@ -20,7 +20,7 @@ + + #include "stdafx.h" + +-#include <glib/gunicode.h> ++#include <glib.h> + #include "grt/common.h" + #include "grt/grt_manager.h" + #include "grtdb/charset_utils.h" +@@ -651,4 +651,4 @@ std::string Mysql_sql_parser_fe::get_fir + return versioning_comment_subst_token; + else + return token; +-} +\ Brak znaku nowej linii na końcu pliku ++} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/mysql-workbench/mysql-workbench-desktop.patch?r1=1.2&r2=1.3 http://cvs.pld-linux.org/packages/mysql-workbench/mysql-workbench.spec?r1=1.37&r2=1.38 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
