Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1b20b7f4edf1ed7c65551ae422f0d4fe7b58c0e8
commit 1b20b7f4edf1ed7c65551ae422f0d4fe7b58c0e8 Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Oct 13 20:57:52 2011 +0200 mysql-workbench-oss-5.2.35-1-x86_64 *Version bump diff --git a/source/gnome-extra/mysql-workbench-oss/FrugalBuild b/source/gnome-extra/mysql-workbench-oss/FrugalBuild index 8bedc22..c292399 100644 --- a/source/gnome-extra/mysql-workbench-oss/FrugalBuild +++ b/source/gnome-extra/mysql-workbench-oss/FrugalBuild @@ -3,8 +3,8 @@ pkgname=mysql-workbench-oss _F_archive_name=mysql-workbench-gpl -pkgver=5.2.33b -pkgrel=2 +pkgver=5.2.35 +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' \ @@ -16,11 +16,8 @@ options=('scriptlet') Fconfopts="${Fconfopts[@]} --enable-readline" up2date="lynx -dump -source http://dev.mysql.com/downloads/workbench/5.1.html |Flasttar" mirror="http://mysql.mirrors.crysys.hit.bme.hu/" -source=($mirror/Downloads/MySQLGUITools/$_F_archive_name-$pkgver-src.tar.gz \ - gtkmm.diff cpp.diff) -sha1sums=('1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed' \ - '5a7d12936f6db1119ba8cb43c528d2a60a4301be' \ - 'c1963994fd1cd9ece84ada66cec510d7c58e8930') +source=($mirror/Downloads/MySQLGUITools/$_F_archive_name-$pkgver-src.tar.gz) +sha1sums=('74c2dddba06e4b233f3b28acf8be45f0394310f2') replaces=('mysql-administrator') provides=('mysql-administrator') diff --git a/source/gnome-extra/mysql-workbench-oss/cpp.diff b/source/gnome-extra/mysql-workbench-oss/cpp.diff deleted file mode 100644 index 2ace6a6..0000000 --- a/source/gnome-extra/mysql-workbench-oss/cpp.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- library/base/base/xml_util_functions.h.~1~ 2011-03-11 00:03:28.000000000 +0100 -+++ library/base/base/xml_util_functions.h 2011-03-14 18:57:34.571514279 +0100 -@@ -20,10 +20,6 @@ - #ifndef _XML_UTIL_FUNCTIONS_H_ - #define _XML_UTIL_FUNCTIONS_H_ - --#ifdef __cplusplus --extern "C" { --#endif -- - #include "base/common.h" - //#include "util.h" - -@@ -31,6 +27,10 @@ - #include <libxml/tree.h> - //#endif - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - typedef char base_bool; - - BASELIBRARY_PUBLIC_FUNC xmlDocPtr base_xmlParseFile(const char *filename); - diff --git a/source/gnome-extra/mysql-workbench-oss/gtkmm.diff b/source/gnome-extra/mysql-workbench-oss/gtkmm.diff deleted file mode 100644 index 53406f4..0000000 --- a/source/gnome-extra/mysql-workbench-oss/gtkmm.diff +++ /dev/null @@ -1,16 +0,0 @@ -Patch to fix compilation with gtkmm-2.24.0. Taken from -http://bugs.mysql.com/bug.php?id=60603 - -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); - - combo->pack_start(color_combo_columns->image); - - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git