From 6aca435c65bc09fc30bc5d3fdd4945e31885526a Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 25 Apr 2013 20:31:16 -0300 Subject: development/mysql-workbench-gpl: Updated for version 5.2.47. Signed-off-by: Niels Horn --- .../config_and_ifconfig_paths.patch | 25 +++++ development/mysql-workbench-gpl/doinst.sh | 1 - .../mysql-workbench-gpl-5.2.43-src.patch | 124 --------------------- .../mysql-workbench-gpl.SlackBuild | 36 ++++-- .../mysql-workbench-gpl/mysql-workbench-gpl.info | 10 +- 5 files changed, 56 insertions(+), 140 deletions(-) create mode 100644 development/mysql-workbench-gpl/config_and_ifconfig_paths.patch delete mode 100644 development/mysql-workbench-gpl/mysql-workbench-gpl-5.2.43-src.patch (limited to 'development') diff --git a/development/mysql-workbench-gpl/config_and_ifconfig_paths.patch b/development/mysql-workbench-gpl/config_and_ifconfig_paths.patch new file mode 100644 index 0000000000..fbeac75803 --- /dev/null +++ b/development/mysql-workbench-gpl/config_and_ifconfig_paths.patch @@ -0,0 +1,25 @@ +diff -Naur mysql-workbench-gpl-5.2.43-src.orig/frontend/linux/workbench/mysql-workbench.in mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/mysql-workbench.in +--- mysql-workbench-gpl-5.2.43-src.orig/frontend/linux/workbench/mysql-workbench.in 2012-09-11 17:47:07.000000000 +0200 ++++ mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/mysql-workbench.in 2013-02-28 18:24:14.217249244 +0100 +@@ -4,6 +4,9 @@ + # This will cause passwords to be stored only temporarily for the session. + #WB_NO_GNOME_KEYRING=1 + ++# create config dir (safe if it already exists) ++mkdir -p $HOME/.mysql/workbench ++ + # force disable the Mac style single menu hack in Ubuntu Unity + UBUNTU_MENUPROXY=0 + +diff -Naur mysql-workbench-gpl-5.2.43-src.orig/plugins/wb.admin/backend/wb_server_control.py mysql-workbench-gpl-5.2.43-src/plugins/wb.admin/backend/wb_server_control.py +--- mysql-workbench-gpl-5.2.43-src.orig/plugins/wb.admin/backend/wb_server_control.py 2012-09-11 17:47:17.000000000 +0200 ++++ mysql-workbench-gpl-5.2.43-src/plugins/wb.admin/backend/wb_server_control.py 2013-02-28 18:25:09.285245528 +0100 +@@ -32,7 +32,7 @@ + + #------------------------------------------------------------------------------- + def get_local_ip_list(): +- cmd = "/bin/sh -c ifconfig" ++ cmd = "/bin/sh -c /sbin/ifconfig" + regexp = "inet addr:([0-9a-f:\.]+)" + + if hasattr(sys, 'getwindowsversion'): diff --git a/development/mysql-workbench-gpl/doinst.sh b/development/mysql-workbench-gpl/doinst.sh index 9830478e8c..9424ce43ff 100644 --- a/development/mysql-workbench-gpl/doinst.sh +++ b/development/mysql-workbench-gpl/doinst.sh @@ -11,4 +11,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi - 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 deleted file mode 100644 index 375d8f76a2..0000000000 --- a/development/mysql-workbench-gpl/mysql-workbench-gpl-5.2.43-src.patch +++ /dev/null @@ -1,124 +0,0 @@ -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 f695005fff..6a0e9139a9 100644 --- a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild +++ b/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild @@ -2,14 +2,30 @@ # Slackware build script for mysql-workbench-gpl -# Written by André Geraldo Vieira +# Originally written by André Geraldo Vieira +# Copyright 2013 Willy Sudiarto Raharjo +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by the SlackBuilds.org team -# Modified by Willy Sudiarto Raharjo - PRGNAM=mysql-workbench-gpl -VERSION=${VERSION:-5.2.43} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.2.47} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCVERSION=$VERSION-src @@ -56,15 +72,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# 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 libtoolize --force autoreconf -vif +# Patch from Ponce +patch -p1 < $CWD/config_and_ifconfig_paths.patch + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -72,10 +88,10 @@ autoreconf -vif --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ --disable-debug \ --enable-shared=yes \ --enable-static=no \ - --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 1a2335fd20..eb9a00b77d 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.43" +VERSION="5.2.47" HOMEPAGE="http://www.mysql.com/downloads/workbench/" -DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.43-src.tar.gz" -MD5SUM="0cb8cf19cbdd661eb864abe5eec5ac3f" +DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.47-src.tar.gz" +MD5SUM="e7cfb1249dddf628a6586bc309679ef3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkmm ctemplate paramiko pexpect lua wxPython" -MAINTAINER="André Geraldo Vieira" -EMAIL="andre.geraldo@gmail.com" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackware-id.org" -- cgit v1.2.3