From 0a6941d8b7bd241a8473fd48a13337714e91bbb7 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 17 Jan 2023 14:22:40 +0000
Subject: [PATCH] community/mysql-workbench to 8.0.32-1

---
 community/mysql-workbench/PKGBUILD | 32 ++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index aac4a4bb6..26eda0509 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -12,11 +12,11 @@
 highmem=1
 
 pkgname=mysql-workbench
-pkgver=8.0.31
-pkgrel=3
+pkgver=8.0.32
+pkgrel=1
 _mysql_version=${pkgver}
 _connector_version=${pkgver}
-_gdal_version=3.5.1
+_gdal_version=3.6.2
 _boost_version=1.77.0
 # bump the antlr4 version as required, this is to match the jar file name
 _antlr4_version=4.9.3
@@ -47,13 +47,13 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community
 	'0001-fix-buiild-for-32-bit.patch'
 	'atomic.patch'
 	'arch_linux_profile.xml')
-sha256sums=('86ab0945851209ce3c3a280570edee983d5839439d983df3b7544fe8c69f32c8'
+sha256sums=('aee19d6131b428f8519d47657da663b75affb40840d57780b630e0bbf2bda242'
             'SKIP'
-            '67bb8cba75b28e95c7f7948563f01fb84528fcbb1a35dba839d4ce44fe019baa'
+            '1f0d92a237898244716dd581f799356e073c2da63c3b2e4a01e1032cbed50e28'
             'SKIP'
-            '1d217bc84c9b9b3cc342f975730519fe6957a955f19c81ea8366bf1df26d10b0'
+            'fbdb7f214427632f423e84ba7594be1f9205eac8128c6b1857203b2f5455cef3'
             'SKIP'
-            'd12c30a9eacdeaab493c0d1c9f88eb337c9cbb5bb40744c751bdd5a5af166ab6'
+            '35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681'
             'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854'
             'afcd40946d3de4d81e28d7c88d467289e0587285d27adb172aecc5494a17df36'
             '5f0af6efd81f476c3e775c486eb0a71c25d6bbc14373e88a64690e2738d68e03'
@@ -134,19 +134,17 @@ build() {
 	make DESTDIR="${srcdir}/install-bundle/" install
 
 	# Build gdal
-	cd "${srcdir}/gdal-${_gdal_version}"
+	cd "${srcdir}/"
 	echo "Configure gdal..."
-	./configure \
-		--prefix=/usr \
-		--includedir=/usr/include/gdal \
-		--with-sqlite3 \
-		--with-mysql="${srcdir}/install-bundle/usr/bin/mysql_config" \
-		--with-curl \
-		--without-jasper
+	cmake -B build-gdal -S "${srcdir}/gdal-${_gdal_version}" \
+		-DCMAKE_INSTALL_PREFIX='/usr' \
+		-DGDAL_USE_JASPER='OFF' \
+		-DGDAL_USE_MYSQL='OFF'
 	echo "Build gdal..."
-	make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/"
+	make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" -C build-gdal
 	echo "Install gdal..."
-	make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" DESTDIR="${srcdir}/install-bundle/" install
+	make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" DESTDIR="${srcdir}/install-bundle/" -C build-gdal install
+	ln -s '.' "${srcdir}/install-bundle/usr/include/gdal"
 
 	# temporary fix until wb builds against antlr4-runtime 4.10.x...
 	mkdir "${srcdir}/antlr4-build"