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

[Christian Hesse]

    Date: Wednesday, May 16, 2018 @ 21:38:19
  Author: eworm
Revision: 323269

upgpkg: mysql-workbench 6.3.10-6

update bundled libraries

Added:
  mysql-workbench/trunk/0007-mysql-connector-cpp-linking.patch
Modified:
  mysql-workbench/trunk/PKGBUILD

----------------------------------------+
 0007-mysql-connector-cpp-linking.patch |   13 +++++++++++++
 PKGBUILD                               |   26 +++++++++++++++-----------
 2 files changed, 28 insertions(+), 11 deletions(-)

Added: 0007-mysql-connector-cpp-linking.patch
===================================================================
--- 0007-mysql-connector-cpp-linking.patch	                        (rev 0)
+++ 0007-mysql-connector-cpp-linking.patch	2018-05-16 21:38:19 UTC (rev 323269)
@@ -0,0 +1,13 @@
+diff --git a/FindMySQL.cmake b/FindMySQL.cmake
+index c9d10c6..0df9683 100644
+--- a/FindMySQL.cmake
++++ b/FindMySQL.cmake
+@@ -700,8 +700,6 @@ endif()
+ 
+ # For dynamic linking use the built-in sys and strings
+ if(NOT MYSQLCLIENT_STATIC_LINKING)
+-   list(APPEND SYS_LIBRARIES "mysql_sys")
+-   list(APPEND SYS_LIBRARIES "mysql_strings")
+    list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
+    SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-16 21:34:13 UTC (rev 323268)
+++ PKGBUILD	2018-05-16 21:38:19 UTC (rev 323269)
@@ -7,10 +7,10 @@
 
 pkgname=mysql-workbench
 pkgver=6.3.10
-pkgrel=5
+pkgrel=6
 _mysql_version=5.7.22
-_connector_version=1.1.9
-_gdal_version=2.2.4
+_connector_version=1.1.11
+_gdal_version=2.3.0
 _boost_version=1.59.0
 pkgdesc='A cross-platform, visual database design tool developed by MySQL'
 arch=('x86_64')
@@ -35,14 +35,15 @@
 	'0003-add-option-to-hide-nonstandard-server-warning.patch'
 	'0005-gdal-use-CPLFree.patch'
 	'0006-mysql-include-my_dir.patch'
+	'0007-mysql-connector-cpp-linking.patch'
 	'arch_linux_profile.xml')
 sha256sums=('b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3'
             'SKIP'
             '4eb8405b0a9acb0381eae94c1741b2850dfc6467742b24b676e62b566409cff2'
             'SKIP'
-            '3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4'
+            '1962489c205bb86aa984e46a0a8a7702ea2ea25ee6e177973e6587cd92de6a65'
             'SKIP'
-            '441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278'
+            '6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2'
             '727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
             '9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7'
             'b189e15c6b6f5a707357d9a9297f39ee3a33264fd28b44d5de6f537f851f82cf'
@@ -50,6 +51,7 @@
             '3c9097af599f08388c471d6fd02f40ea72e5759eaa89f731e662852a5e67feea'
             '0965b4f12a0ae26bea131f05c7383d4a9b068d556b092ad23e19e1d8f6895531'
             'd97a1fec15e0dc4491e79ce380f6f994f1c4b387d960c13e178a18b0299c0436'
+            'ea857f44f8e7abacec9a693ad0c4129aa9f93b238c26f4b53aa097a4bb42074a'
             '2ade582ca25f6d6d748bc84a913de39b34dcaa6e621a77740fe143007f2833af')
 
 prepare() {
@@ -58,6 +60,11 @@
 	# fix build without server
 	patch -Np1 < "${srcdir}"/0006-mysql-include-my_dir.patch
 
+	cd "${srcdir}/mysql-connector-c++-${_connector_version}/"
+
+	# fix linking
+	patch -Np1 < "${srcdir}"/0007-mysql-connector-cpp-linking.patch
+
 	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"
 
 	# Disable 'Help' -> 'Check for Updates'
@@ -101,7 +108,6 @@
 		-DSYSCONFDIR=/etc/mysql \
 		-DMYSQL_DATADIR=/var/lib/mysql \
 		-DWITH_BOOST="${srcdir}/boost_${_boost_version//./_}"
-	make
 	make DESTDIR="${srcdir}/install-bundle/" install
 
 	# Build mysql-connector-c++
@@ -113,9 +119,7 @@
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
 		-DMYSQL_DIR="${srcdir}/install-bundle/" \
-		-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config" \
-		-DBOOST_ROOT:STRING="${srcdir}/boost_${_boost_version//./_}"
-
+		-DMYSQL_CONFIG_EXECUTABLE="${srcdir}/install-bundle/usr/bin/mysql_config"
 	make DESTDIR="${srcdir}/install-bundle/" install
 
 	# Build gdal
@@ -127,8 +131,8 @@
 		--with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
 		--with-curl \
 		--without-jasper
-	make
-	make DESTDIR="${srcdir}/install-bundle/" install
+	make lib-target
+	make DESTDIR="${srcdir}/install-bundle/" install-lib install-static-lib
 
 	# Build MySQL Workbench itself with bundled libs
 	cd "${srcdir}/mysql-workbench-community-${pkgver}-src/"