development/mysql-workbench-gpl: Updated for version 5.2.43.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 143 insertions, 26 deletions

diff --git a/development/mysql-workbench-gpl/README b/development/mysql-workbench-gpl/README
index a1b79b3826..bb9d38ca1d 100644
--- a/development/mysql-workbench-gpl/README
+++ b/development/mysql-workbench-gpl/README
@@ -5,9 +5,10 @@ on Windows, Linux and OS X in different editions.
 
 MySQL Workbench provides DBAs and developers an integrated tools
 environment for:
-
 * Database Design & Modeling
 * SQL Development (replacing MySQL Query Browser)
 * Database Administration (replacing MySQL Administrator)
 
-The Community (OSS) Edition is available under the GPL.
+You need to allow MySQL to accept incoming connections from outside:
+Remove or comment this line:  SKIP="--skip-networking"  and then do:
+/etc/rc.d/rc.mysqld restart
diff --git a/development/mysql-workbench-gpl/mysql-workbench-gpl-5.2.43-src.patch b/development/mysql-workbench-gpl/mysql-workbench-gpl-5.2.43-src.patch
new file mode 100644
index 0000000000..375d8f76a2
--- /dev/null
+++ b/development/mysql-workbench-gpl/mysql-workbench-gpl-5.2.43-src.patch
@@ -0,0 +1,124 @@
+diff -Nur mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.am.orig mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.am
+--- mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.am.orig 2012-09-13 21:49:26.288841700 +0700
++++ mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.am      2012-09-13 21:50:35.127099727 +0700
+@@ -2,30 +2,30 @@
+ workbenchdir=$(pkgdatadir)/mysql.profiles
+ 
+ workbench_DATA=\
+-Fedora_Linux_(MySQL_Package).xml\
+-Fedora_Linux_(Vendor_Package).xml\
+-Fedora_Linux_16_(Vendor_Package).xml\
+-Fedora_Linux_15_(Vendor_Package).xml\
+-FreeBSD_(MySQL_Package).xml\
+-Generic_Linux_(MySQL_tar_package).xml\
+-Linux_(Custom).xml\
+-MacOS_X_(MySQL_Package).xml\
+-OpenSolaris_(MySQL_Package).xml\
+-RHEL_(MySQL_Package).xml\
+-SLES_(MySQL_Package).xml\
+-Ubuntu_Linux_(MySQL_Package).xml\
+-Ubuntu_Linux_(Vendor_Package).xml\
+-Ubuntu_Linux_Upstart_(MySQL_Package).xml\
+-Ubuntu_Linux_Upstart_(Vendor_Package).xml\
+-Windows_(MySQL_5.0_x64_Installer_Package).xml\
+-Windows_(MySQL_5.0_x86_Installer_Package).xml\
+-Windows_x64_(MySQL_5.0_x86_Installer_Package).xml\
+-Windows_(MySQL_5.1_x64_Installer_Package).xml\
+-Windows_(MySQL_5.1_x86_Installer_Package).xml\
+-Windows_(MySQL_5.5_x64_Installer_Package).xml\
+-Windows_(MySQL_5.5_x86_Installer_Package).xml\
+-Windows_x64_(MySQL_5.1_x86_Installer_Package).xml\
+-Windows_x64_(MySQL_5.5_x86_Installer_Package).xml\
+-Windows_(MySQL_x64_zip_Package).xml\
+-Windows_(MySQL_x86_zip_Package).xml\
+-Windows_x64_(MySQL_x86_zip_Package).xml
++Fedora_Linux_\(MySQL_Package\).xml\
++Fedora_Linux_\(Vendor_Package\).xml\
++Fedora_Linux_16_\(Vendor_Package\).xml\
++Fedora_Linux_15_\(Vendor_Package\).xml\
++FreeBSD_\(MySQL_Package\).xml\
++Generic_Linux_\(MySQL_tar_package\).xml\
++Linux_\(Custom\).xml\
++MacOS_X_\(MySQL_Package\).xml\
++OpenSolaris_\(MySQL_Package\).xml\
++RHEL_\(MySQL_Package\).xml\
++SLES_\(MySQL_Package\).xml\
++Ubuntu_Linux_\(MySQL_Package\).xml\
++Ubuntu_Linux_\(Vendor_Package\).xml\
++Ubuntu_Linux_Upstart_\(MySQL_Package\).xml\
++Ubuntu_Linux_Upstart_\(Vendor_Package\).xml\
++Windows_\(MySQL_5.0_x64_Installer_Package\).xml\
++Windows_\(MySQL_5.0_x86_Installer_Package\).xml\
++Windows_x64_\(MySQL_5.0_x86_Installer_Package\).xml\
++Windows_\(MySQL_5.1_x64_Installer_Package\).xml\
++Windows_\(MySQL_5.1_x86_Installer_Package\).xml\
++Windows_\(MySQL_5.5_x64_Installer_Package\).xml\
++Windows_\(MySQL_5.5_x86_Installer_Package\).xml\
++Windows_x64_\(MySQL_5.1_x86_Installer_Package\).xml\
++Windows_x64_\(MySQL_5.5_x86_Installer_Package\).xml\
++Windows_\(MySQL_x64_zip_Package\).xml\
++Windows_\(MySQL_x86_zip_Package\).xml\
++Windows_x64_\(MySQL_x86_zip_Package\).xml
+diff -Nur mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.in.orig mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.in
+--- mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.in.orig 2012-09-13 21:50:59.495836763 +0700
++++ mysql-workbench-gpl-5.2.43-src/res/mysql.profiles/Makefile.in      2012-09-13 21:51:53.093257821 +0700
+@@ -221,33 +221,33 @@
+ unixodbc = @unixodbc@
+ workbenchdir = $(pkgdatadir)/mysql.profiles
+ workbench_DATA = \
+-Fedora_Linux_(MySQL_Package).xml\
+-Fedora_Linux_(Vendor_Package).xml\
+-Fedora_Linux_16_(Vendor_Package).xml\
+-Fedora_Linux_15_(Vendor_Package).xml\
+-FreeBSD_(MySQL_Package).xml\
+-Generic_Linux_(MySQL_tar_package).xml\
+-Linux_(Custom).xml\
+-MacOS_X_(MySQL_Package).xml\
+-OpenSolaris_(MySQL_Package).xml\
+-RHEL_(MySQL_Package).xml\
+-SLES_(MySQL_Package).xml\
+-Ubuntu_Linux_(MySQL_Package).xml\
+-Ubuntu_Linux_(Vendor_Package).xml\
+-Ubuntu_Linux_Upstart_(MySQL_Package).xml\
+-Ubuntu_Linux_Upstart_(Vendor_Package).xml\
+-Windows_(MySQL_5.0_x64_Installer_Package).xml\
+-Windows_(MySQL_5.0_x86_Installer_Package).xml\
+-Windows_x64_(MySQL_5.0_x86_Installer_Package).xml\
+-Windows_(MySQL_5.1_x64_Installer_Package).xml\
+-Windows_(MySQL_5.1_x86_Installer_Package).xml\
+-Windows_(MySQL_5.5_x64_Installer_Package).xml\
+-Windows_(MySQL_5.5_x86_Installer_Package).xml\
+-Windows_x64_(MySQL_5.1_x86_Installer_Package).xml\
+-Windows_x64_(MySQL_5.5_x86_Installer_Package).xml\
+-Windows_(MySQL_x64_zip_Package).xml\
+-Windows_(MySQL_x86_zip_Package).xml\
+-Windows_x64_(MySQL_x86_zip_Package).xml
++Fedora_Linux_\(MySQL_Package\).xml\
++Fedora_Linux_\(Vendor_Package\).xml\
++Fedora_Linux_16_\(Vendor_Package).xml\
++Fedora_Linux_15_\(Vendor_Package\).xml\
++FreeBSD_\(MySQL_Package\).xml\
++Generic_Linux_\(MySQL_tar_package\).xml\
++Linux_\(Custom\).xml\
++MacOS_X_\(MySQL_Package\).xml\
++OpenSolaris_\(MySQL_Package\).xml\
++RHEL_\(MySQL_Package\).xml\
++SLES_\(MySQL_Package\).xml\
++Ubuntu_Linux_\(MySQL_Package\).xml\
++Ubuntu_Linux_\(Vendor_Package\).xml\
++Ubuntu_Linux_Upstart_\(MySQL_Package\).xml\
++Ubuntu_Linux_Upstart_\(Vendor_Package\).xml\
++Windows_\(MySQL_5.0_x64_Installer_Package\).xml\
++Windows_\(MySQL_5.0_x86_Installer_Package\).xml\
++Windows_x64_\(MySQL_5.0_x86_Installer_Package\).xml\
++Windows_\(MySQL_5.1_x64_Installer_Package\).xml\
++Windows_\(MySQL_5.1_x86_Installer_Package\).xml\
++Windows_\(MySQL_5.5_x64_Installer_Package\).xml\
++Windows_\(MySQL_5.5_x86_Installer_Package\).xml\
++Windows_x64_\(MySQL_5.1_x86_Installer_Package\).xml\
++Windows_x64_\(MySQL_5.5_x86_Installer_Package\).xml\
++Windows_\(MySQL_x64_zip_Package\).xml\
++Windows_\(MySQL_x86_zip_Package\).xml\
++Windows_x64_\(MySQL_x86_zip_Package\).xml
+ 
+ all: all-am
diff --git a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild b/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
index bcf22efbf4..25562873dd 100644
--- a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
+++ b/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
@@ -5,10 +5,11 @@
 # Written by André Geraldo Vieira <andre.geraldo@gmail.com>
 
 # Modified by the SlackBuilds.org team
-
+# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
+ 
 PRGNAM=mysql-workbench-gpl
-VERSION=${VERSION:-5.2.29}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.2.43}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCVERSION=$VERSION-src
@@ -55,24 +56,26 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-#Patch for gtkmm-2.24
-patch -p1 < $CWD/mysqlwb_gtkmm224.patch
+# Patches from Dhaby Xiloj - reworked for 5.2.43
+patch -p1 < $CWD/mysql-workbench-gpl-5.2.43-src.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
+./autogen.sh
+libtoolize --force
+autoreconf -vif
+
+./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
   --disable-debug \
   --enable-shared=yes \
   --enable-static=no \
-  --enable-python-modules \
-  --enable-readline
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
diff --git a/development/mysql-workbench-gpl/mysql-workbench-gpl.info b/development/mysql-workbench-gpl/mysql-workbench-gpl.info
index 1a52951bb3..1a2335fd20 100644
--- a/development/mysql-workbench-gpl/mysql-workbench-gpl.info
+++ b/development/mysql-workbench-gpl/mysql-workbench-gpl.info
@@ -1,10 +1,10 @@
 PRGNAM="mysql-workbench-gpl"
-VERSION="5.2.29"
+VERSION="5.2.43"
 HOMEPAGE="http://www.mysql.com/downloads/workbench/"
-DOWNLOAD="http://linorg.usp.br/mysqlDownloads/MySQLGUITools/mysql-workbench-gpl-5.2.29-src.tar.gz"
-MD5SUM="80f379871c5cd8cc04673d5e3edda173"
+DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.43-src.tar.gz"
+MD5SUM="0cb8cf19cbdd661eb864abe5eec5ac3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libglademm libgnome lua wxPython"
+REQUIRES="gtkmm ctemplate paramiko pexpect lua wxPython"
 MAINTAINER="André Geraldo Vieira"
 EMAIL="andre.geraldo@gmail.com"
diff --git a/development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch b/development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch
deleted file mode 100644
index ff55cc8582..0000000000
--- a/development/mysql-workbench-gpl/mysqlwb_gtkmm224.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-workbench-gpl-5.2.29-src/frontend/linux/linux_utilities/toolbar_manager.cpp	2010-10-11 04:28:19.000000000 -0300
-+++ mysql-workbench-gpl-5.2.29-src_patched/frontend/linux/linux_utilities/toolbar_manager.cpp	2011-05-02 08:51:38.000000000 -0300
-@@ -31,7 +31,7 @@
-   }
- 
-   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);
-