[arch-commits] Commit in mysql-workbench/trunk (PKGBUILD)

[Christian Hesse]

    Date: Wednesday, October 17, 2018 @ 10:05:45
  Author: eworm
Revision: 395037

upgpkg: mysql-workbench 8.0.12-5

rebuild with current toolchain and recent changes

Modified:
  mysql-workbench/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-17 09:54:16 UTC (rev 395036)
+++ PKGBUILD	2018-10-17 10:05:45 UTC (rev 395037)
@@ -6,7 +6,7 @@
 
 pkgname=mysql-workbench
 pkgver=8.0.12
-pkgrel=4
+pkgrel=5
 _mysql_version=8.0.12
 _connector_version=8.0.12
 _gdal_version=2.3.2
@@ -19,7 +19,7 @@
 	'hicolor-icon-theme' 'libgl' 'libsecret' 'libiodbc' 'libxml2'
 	'libzip' 'mysql-python' 'pcre' 'python2' 'python2-cairo' 'libssh'
 	'python2-pexpect' 'tinyxml' 'unixodbc' 'vsqlite++' 'proj' 'json-c'
-	'antlr4-runtime')
+	'antlr4-runtime' 'giflib' 'zstd' 'curl')
 optdepends=('python2-pyodbc: database migration')
 makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' 'antlr4')
 validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') # MySQL Release Engineering <mysql-build at oss.oracle.com>
@@ -70,7 +70,7 @@
 	# Build mysql
 	mkdir "${srcdir}/mysql-${_mysql_version}-build"
 	cd "${srcdir}/mysql-${_mysql_version}-build"
-	msg "Configure mysql"
+	echo "Configure mysql..."
 	cmake "${srcdir}/mysql-${_mysql_version}" \
 		-DWITHOUT_SERVER=ON \
 		-DBUILD_CONFIG=mysql_release \
@@ -78,15 +78,15 @@
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_DATADIR=/var/lib/mysql \
 		-DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
-	msg "Build mysql"
+	echo "Build mysql..."
 	make
-	msg "Install mysql"
+	echo "Install mysql..."
 	make DESTDIR="${srcdir}/install-bundle/" install
 
 	# Build mysql-connector-c++
 	mkdir "${srcdir}/mysql-connector-c++-${_connector_version}-src-build"
 	cd "${srcdir}/mysql-connector-c++-${_connector_version}-src-build"
-	msg "Configure mysql-connector-c++"
+	echo "Configure mysql-connector-c++..."
 	cmake "${srcdir}/mysql-connector-c++-${_connector_version}-src" \
 		-Wno-dev \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -95,14 +95,14 @@
 		-DMYSQL_DIR="${srcdir}/install-bundle/" \
 		-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
 		-DWITH_JDBC=ON
-	msg "Build mysql-connector-c++"
+	echo "Build mysql-connector-c++..."
 	make
-	msg "Install mysql-connector-c++"
+	echo "Install mysql-connector-c++..."
 	make DESTDIR="${srcdir}/install-bundle/" install
 
 	# Build gdal
 	cd "${srcdir}/gdal-${_gdal_version}"
-	msg "Configure gdal"
+	echo "Configure gdal..."
 	./configure \
 		--prefix=/usr \
 		--includedir=/usr/include/gdal \
@@ -110,15 +110,15 @@
 		--with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
 		--with-curl \
 		--without-jasper
-	msg "Build gdal"
+	echo "Build gdal..."
 	make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/"
-	msg "Install gdal"
+	echo "Install gdal..."
 	make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" DESTDIR="${srcdir}/install-bundle/" install
 
 	# Build MySQL Workbench itself with bundled libs
 	mkdir "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
 	cd "${srcdir}/mysql-workbench-community-${pkgver}-src-build"
-	msg "Configure mysql-workbench"
+	echo "Configure mysql-workbench..."
 	cmake "${srcdir}/mysql-workbench-community-${pkgver}-src" \
 		-Wno-dev \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
@@ -131,7 +131,7 @@
 		-DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
 		-DWITH_ANTLR_JAR='/usr/share/java/antlr-complete.jar' \
 		-DUSE_BUNDLED_MYSQLDUMP=1
-	msg "Build mysql-workbench"
+	echo "Build mysql-workbench..."
 	make
 }