Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c47882f6a9b391c063117da9e58c9b103fcc1b72
commit c47882f6a9b391c063117da9e58c9b103fcc1b72 Author: Elentir <[email protected]> Date: Sat May 5 22:39:03 2012 +0200 mysql-workbench-oss-5.2.39-1-x86_64 * version bump * add patch to fix build * fix depends diff --git a/source/gnome-extra/mysql-workbench-oss/FrugalBuild b/source/gnome-extra/mysql-workbench-oss/FrugalBuild index 4413569..f6020c2 100644 --- a/source/gnome-extra/mysql-workbench-oss/FrugalBuild +++ b/source/gnome-extra/mysql-workbench-oss/FrugalBuild @@ -3,13 +3,13 @@ pkgname=mysql-workbench-oss _F_archive_name=mysql-workbench-gpl -pkgver=5.2.38 +pkgver=5.2.39 pkgrel=1 pkgdesc="MySQL Workbench is a cross-platform, visual database design tool developed by MySQL." url="http://wb.mysql.com/"; depends=('libmysqlclient' 'libzip' 'libsigc++2' 'libglade' 'gtkmm2' 'libgnome' \ 'paramiko' 'pexpect' 'lua' 'ctemplate>=2.1' 'readline' 'openssl>=1.0.0') -makedepends=('mysql' 'boost>=1.46.1') +makedepends=('mysql' 'boost') groups=('gnome-extra') archs=('i686' 'x86_64') options=('scriptlet') @@ -17,10 +17,12 @@ Fconfopts="${Fconfopts[@]} --enable-readline" mirror="http://mysql.sh.cvut.cz/Downloads/MySQLGUITools"; up2date="Flastarchive $mirror -src.tar.gz" source=($mirror/$_F_archive_name-$pkgver-src.tar.gz \ - frugalware.xml frugalware.patch) -sha1sums=('6b92140e041642761f4ebee1c8a928ab34f6889a' \ + frugalware.xml frugalware.patch \ + glib2-2.32.patch) +sha1sums=('a01ff48a17b55cd0affb3cea5d0b631037286b7b' \ '48e98ffa340dbc27eb96d26134fd6be4156e564e' \ - '1f4e1ab0ad490cd9ad284aefffea33fb09156fac') + '1f4e1ab0ad490cd9ad284aefffea33fb09156fac' \ + '0bc892db5a9176b086d683bcc66c2f0f248fdcf2') replaces=('mysql-administrator') provides=('mysql-administrator') diff --git a/source/gnome-extra/mysql-workbench-oss/glib2-2.32.patch b/source/gnome-extra/mysql-workbench-oss/glib2-2.32.patch new file mode 100644 index 0000000..bef06a2 --- /dev/null +++ b/source/gnome-extra/mysql-workbench-oss/glib2-2.32.patch @@ -0,0 +1,144 @@ +diff -ruNa a/backend/wbprivate/sqlide/wb_live_schema_tree.h b/backend/wbprivate/sqlide/wb_live_schema_tree.h +--- a/backend/wbprivate/sqlide/wb_live_schema_tree.h 2012-04-06 21:40:51.000000000 +0200 ++++ b/backend/wbprivate/sqlide/wb_live_schema_tree.h 2012-04-12 15:23:03.348365331 +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 + { +diff -ruNa a/backend/wbprivate/workbench/stdafx.h b/backend/wbprivate/workbench/stdafx.h +--- a/backend/wbprivate/workbench/stdafx.h 2012-04-06 21:40:54.000000000 +0200 ++++ b/backend/wbprivate/workbench/stdafx.h 2012-04-12 15:23:03.348365331 +0200 +@@ -56,7 +56,7 @@ + #include <gl/glu.h> + + #include <glib.h> +-#include <glib/gthread.h> ++#include <glib.h> + + #include "grtpp.h" + #include "grtpp_util.h" +diff -ruNa a/backend/windows/wbprivate.wr/src/stdafx.h b/backend/windows/wbprivate.wr/src/stdafx.h +--- a/backend/windows/wbprivate.wr/src/stdafx.h 2012-04-06 21:40:55.000000000 +0200 ++++ b/backend/windows/wbprivate.wr/src/stdafx.h 2012-04-12 15:23:03.348365331 +0200 +@@ -65,7 +65,7 @@ + + #include <gl/glu.h> + +-#include <glib/gthread.h> ++#include <glib.h> + + #ifndef _WIN32 + #include <sys/time.h> +diff -ruNa a/library/canvas/src/mdc_canvas_view.h b/library/canvas/src/mdc_canvas_view.h +--- a/library/canvas/src/mdc_canvas_view.h 2012-04-06 21:40:54.000000000 +0200 ++++ b/library/canvas/src/mdc_canvas_view.h 2012-04-12 15:23:03.345032016 +0200 +@@ -28,7 +28,7 @@ + #include "mdc_selection.h" + + #ifndef _WIN32 +-#include <glib/gthread.h> ++#include <glib.h> + #endif + + BEGIN_MDC_DECLS +diff -ruNa a/library/canvas/src/mdc_canvas_view_printing.cpp b/library/canvas/src/mdc_canvas_view_printing.cpp +--- a/library/canvas/src/mdc_canvas_view_printing.cpp 2012-04-06 21:40:54.000000000 +0200 ++++ b/library/canvas/src/mdc_canvas_view_printing.cpp 2012-04-12 15:23:03.345032016 +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> +diff -ruNa a/library/canvas/src/stdafx.h b/library/canvas/src/stdafx.h +--- a/library/canvas/src/stdafx.h 2012-04-06 21:40:55.000000000 +0200 ++++ b/library/canvas/src/stdafx.h 2012-04-12 15:23:03.345032016 +0200 +@@ -52,7 +52,7 @@ + #include <gl/gl.h> + #include <gl/glu.h> + +-#include <glib/gthread.h> ++#include <glib.h> + + #endif // _WIN32 + +diff -ruNa a/library/grt/src/grtpp_util.cpp b/library/grt/src/grtpp_util.cpp +--- a/library/grt/src/grtpp_util.cpp 2012-04-06 21:40:54.000000000 +0200 ++++ b/library/grt/src/grtpp_util.cpp 2012-04-12 15:23:03.348365331 +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; +diff -ruNa a/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp +--- a/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp 2012-04-06 21:40:49.000000000 +0200 ++++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp 2012-04-12 15:23:03.348365331 +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" +diff -ruNa a/modules/db.mysql.sqlparser/src/stdafx.h b/modules/db.mysql.sqlparser/src/stdafx.h +--- a/modules/db.mysql.sqlparser/src/stdafx.h 2012-04-06 21:40:55.000000000 +0200 ++++ b/modules/db.mysql.sqlparser/src/stdafx.h 2012-04-12 15:23:03.348365331 +0200 +@@ -32,7 +32,7 @@ + #include <algorithm> + #include <sstream> + #include <fstream> +-#include <glib/gunicode.h> ++#include <glib.h> + #include <map> + #include "direct.h" + +diff -ruNa a/modules/wb.mysql.import/src/stdafx.h b/modules/wb.mysql.import/src/stdafx.h +--- a/modules/wb.mysql.import/src/stdafx.h 2012-04-06 21:40:54.000000000 +0200 ++++ b/modules/wb.mysql.import/src/stdafx.h 2012-04-12 15:23:03.348365331 +0200 +@@ -10,7 +10,7 @@ + #include <algorithm> + #include <sstream> + #include <fstream> +-#include <glib/gunicode.h> ++#include <glib.h> + #include <map> + #include "direct.h" + +diff -ruNa a/plugins/db.mysql/backend/db_plugin_be.cpp b/plugins/db.mysql/backend/db_plugin_be.cpp +--- a/plugins/db.mysql/backend/db_plugin_be.cpp 2012-04-06 21:40:52.000000000 +0200 ++++ b/plugins/db.mysql/backend/db_plugin_be.cpp 2012-04-12 15:23:03.345032016 +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) + { +diff -ruNa a/plugins/wb.printing/backend/stdafx.h b/plugins/wb.printing/backend/stdafx.h +--- a/plugins/wb.printing/backend/stdafx.h 2012-04-06 21:40:54.000000000 +0200 ++++ b/plugins/wb.printing/backend/stdafx.h 2012-04-12 15:23:03.345032016 +0200 +@@ -44,7 +44,7 @@ + #include <gl/gl.h> + #include <gl/glu.h> + +-#include <glib/gthread.h> ++#include <glib.h> + + #ifndef _WIN32 + #include <sys/time.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
