Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=202880534711e7b027af3466e2af592f94fe85fc
commit 202880534711e7b027af3466e2af592f94fe85fc Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Apr 22 13:09:17 2011 +0200 mysql-workbench-oss-5.2.33b-1-x86_64 *version bump diff --git a/source/gnome-extra/mysql-workbench-oss/FrugalBuild b/source/gnome-extra/mysql-workbench-oss/FrugalBuild index 138c115..6157c8c 100644 --- a/source/gnome-extra/mysql-workbench-oss/FrugalBuild +++ b/source/gnome-extra/mysql-workbench-oss/FrugalBuild @@ -2,11 +2,12 @@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=mysql-workbench-oss -pkgver=5.2.21 -pkgrel=2 +_F_archive_name=mysql-workbench-gpl +pkgver=5.2.33b +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' 'gtkmm>=2.20.3' 'libgnome' \ +depends=('libmysqlclient' 'libzip' 'libsigc++2' 'libglade' 'gtkmm2' 'libgnome' \ 'paramiko' 'pexpect' 'lua' 'ctemplate' 'readline' 'openssl>=1.0.0') makedepends=('mysql' 'boost') groups=('gnome-extra') @@ -15,18 +16,17 @@ 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/$pkgname-$pkgver.tar.gz) -sha1sums=('7a4b4254236c1595fc8c60ff58ddfbf8a09492d2') +source=($mirror/Downloads/MySQLGUITools/$_F_archive_name-$pkgver-src.tar.gz \ + gtkmm.diff cpp.diff) +sha1sums=('1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed' \ + '5a7d12936f6db1119ba8cb43c528d2a60a4301be' \ + 'c1963994fd1cd9ece84ada66cec510d7c58e8930') replaces=('mysql-administrator') provides=('mysql-administrator') build() { - Fcd - #gcc 4.5 - Fsed "mdc::Color::Color(0.7, 0.7, 0.7)" \ - "mdc::Color(0.7,0.7,0.7)" \ - backend/wbprivate/model/canvas_floater.cpp + Fcd $_F_archive_name-${pkgver/b/}-src sh ./autogen.sh || Fdie Fbuild } diff --git a/source/gnome-extra/mysql-workbench-oss/cpp.diff b/source/gnome-extra/mysql-workbench-oss/cpp.diff new file mode 100644 index 0000000..2ace6a6 --- /dev/null +++ b/source/gnome-extra/mysql-workbench-oss/cpp.diff @@ -0,0 +1,25 @@ +--- 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 new file mode 100644 index 0000000..53406f4 --- /dev/null +++ b/source/gnome-extra/mysql-workbench-oss/gtkmm.diff @@ -0,0 +1,16 @@ +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
