diff options
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.SlackBuild | 6 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.info | 8 | ||||
| -rw-r--r-- | development/mysql-workbench/workbench-gdal.patch | 22 |
3 files changed, 31 insertions, 5 deletions
diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild index 93c85fb72ac6..cb3424732ff6 100644 --- a/development/mysql-workbench/mysql-workbench.SlackBuild +++ b/development/mysql-workbench/mysql-workbench.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mysql-workbench -VERSION=${VERSION:-6.1.7} +VERSION=${VERSION:-6.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,6 +79,9 @@ patch -p1 < $CWD/config_and_ifconfig_paths.patch # Reserved for ctemplate 2.3 update # patch -p1 < $CWD/mysql-workbench-ctemplate.patch +# Patch to fix gdal include path +patch -p1 < $CWD/workbench-gdal.patch + mkdir wb-build cd wb-build cmake \ @@ -88,6 +91,7 @@ cmake \ -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \ -DPYTHON_LIBRARY:FILEPATH=/usr/lib$LIBDIRSUFFIX/libpython2.7.so \ + -DGDAL_INCLUDE_DIR=/usr/include \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info index a00a6d76581c..73a002ad25f1 100644 --- a/development/mysql-workbench/mysql-workbench.info +++ b/development/mysql-workbench/mysql-workbench.info @@ -1,10 +1,10 @@ PRGNAM="mysql-workbench" -VERSION="6.1.7" +VERSION="6.2.1" HOMEPAGE="https://www.mysql.com/downloads/workbench/" -DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.1.7-src.tar.gz" -MD5SUM="ac059e239869fb77bf5d7a1f5845a8af" +DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.2.1-src.tar.gz" +MD5SUM="0dc4b958678c8e1ed53555cb2621cec3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="tinyxml ecdsa mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython" +REQUIRES="tinyxml ecdsa mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython gdal" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/development/mysql-workbench/workbench-gdal.patch b/development/mysql-workbench/workbench-gdal.patch new file mode 100644 index 000000000000..36a93b1d781b --- /dev/null +++ b/development/mysql-workbench/workbench-gdal.patch @@ -0,0 +1,22 @@ +--- mysql-workbench-community-6.2.1-src/backend/wbprivate/sqlide/spatial_handler.h.orig 2014-08-30 11:27:11.434520066 +0700 ++++ mysql-workbench-community-6.2.1-src/backend/wbprivate/sqlide/spatial_handler.h 2014-08-30 11:27:28.737541213 +0700 +@@ -20,12 +20,12 @@ + #ifndef SPATIAL_HANDLER_H_ + #define SPATIAL_HANDLER_H_ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal_pam.h> +-#include <gdal/memdataset.h> +-#include <gdal/gdal_alg.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal_pam.h> ++#include <memdataset.h> ++#include <gdal_alg.h> ++#include <gdal.h> + #include <deque> + #include "base/geometry.h" + + |