community/mysql-workbench to 8.0.33-1

community/mysql-workbench/PKGBUILD

@@ -12,14 +12,14 @@
 highmem=1
 
 pkgname=mysql-workbench
-pkgver=8.0.32
+pkgver=8.0.33
 pkgrel=1
 _mysql_version=${pkgver}
 _connector_version=${pkgver}
-_gdal_version=3.6.2
+_gdal_version=3.6.3
 _boost_version=1.77.0
 # bump the antlr4 version as required, this is to match the jar file name
-_antlr4_version=4.9.3
+_antlr4_version=4.11.1
 pkgdesc='A cross-platform, visual database design tool developed by MySQL'
 arch=('x86_64')
 url='https://www.mysql.com/products/workbench/'
@@ -29,34 +29,29 @@ depends=('cairo' 'antlr4-runtime' 'curl' 'desktop-file-utils' 'freetype2' 'gifli
          'libxml2' 'libzip' 'pcre' 'proj' 'python' 'rapidjson' 'unixodbc'
          'vsqlite++' 'zstd')
 makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick'
-	# tmporary fix for antlr4...
+             "antlr4=${_antlr4_version}")
-	#"antlr4=${_antlr4_version}"
-	'git'
-)
 validpgpkeys=('859BE8D7C586F538430B19C2467B942D3A79BD29') # MySQL Release Engineering <mysql-build@oss.oracle.com>
 source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
 	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
 	"https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${_connector_version}-src.tar.gz"{,.asc}
 	"https://download.osgeo.org/gdal/${_gdal_version}/gdal-${_gdal_version}.tar.xz"
 	"https://downloads.sourceforge.net/project/boost/boost/${_boost_version}/boost_${_boost_version//./_}.tar.bz2"
-	'https://www.antlr.org/download/antlr-4.9.3-complete.jar'
+	'https://www.antlr.org/download/antlr-4.11.1-complete.jar'
-	'https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip'
 	'0001-mysql-workbench-no-check-for-updates.patch'
 	'0002-disable-unsupported-operating-system-warning.patch'
 	'0003-include-list.patch'
 	'0001-fix-buiild-for-32-bit.patch'
 	'atomic.patch'
 	'arch_linux_profile.xml')
-sha256sums=('aee19d6131b428f8519d47657da663b75affb40840d57780b630e0bbf2bda242'
+sha256sums=('a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc'
             'SKIP'
-            '1f0d92a237898244716dd581f799356e073c2da63c3b2e4a01e1032cbed50e28'
+            '962002f5d906f42f40b277a39d2db93931248c1f07ff8f4312c288e63803dd12'
             'SKIP'
-            'fbdb7f214427632f423e84ba7594be1f9205eac8128c6b1857203b2f5455cef3'
+            '160cf6881fbde9bd46cd11aaf12930b676bc6e27589ac5c7ba49c196b97e053b'
             'SKIP'
-            '35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681'
+            '3cccbed883b1fb99b913966aa3a650ad930e7c3afc714f5823f9754176ee49ea'
             'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854'
-            'afcd40946d3de4d81e28d7c88d467289e0587285d27adb172aecc5494a17df36'
+            '62975e192b4af2622b72b5f0131553ee3cbce97f76dc2a41632dcc55e25473e1'
-            '5f0af6efd81f476c3e775c486eb0a71c25d6bbc14373e88a64690e2738d68e03'
             'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
             '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
             'e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53'
@@ -84,7 +79,7 @@ prepare() {
 	sed -i 's| -Wno-deprecated-register||' ext/scintilla/gtk/CMakeLists.txt
 
 	# be happy with more recent antlr
-	sed -i "/set(ANTLR_JAR_FILENAME/s/4.9.1/${_antlr4_version}/" CMakeLists.txt
+	#sed -i "/set(ANTLR_JAR_FILENAME/s/4.11.1/${_antlr4_version}/" CMakeLists.txt
 
 	# remove -Wno-deprecated-copy
 	sed -i 's|-Wno-deprecated-copy||' CMakeLists.txt
@@ -146,18 +141,6 @@ build() {
 	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"
-	cd "${srcdir}/antlr4-build"
-	cmake ../ \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_CXX_STANDARD=17 \
-		-DANTLR4_INSTALL=ON \
-		-DINSTALL_GTEST=OFF
-	make
-	make 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"
@@ -172,11 +155,9 @@ build() {
 		-DMySQLCppConn_INCLUDE_DIR="${srcdir}/install-bundle/usr/include/jdbc" \
 		-DGDAL_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
 		-DGDAL_LIBRARY="${srcdir}/install-bundle/usr/lib/libgdal.so" \
-		-DANTLR4_INCLUDE_DIR="${srcdir}/install-bundle/usr/include" \
+		-DUNIXODBC_CONFIG_PATH='/usr/bin/odbc_config' \
-		-DANTLR4_LIBRARY="${srcdir}/install-bundle/usr/lib/libantlr4-runtime.so" \
+		-DUSE_BUNDLED_MYSQLDUMP=1 \
-		-DWITH_ANTLR_JAR="${srcdir}/antlr-4.9.3-complete.jar" \
+		-DWITH_ANTLR_JAR="${srcdir}/antlr-${_antlr4_version}-complete.jar"
-		-DUNIXODBC_INCLUDE_DIR='/usr/include' \
-		-DUSE_BUNDLED_MYSQLDUMP=1
 	echo "Build mysql-workbench..."
 	make
 }
@@ -189,7 +170,6 @@ package() {
 		install -D -m0755 "${LIBRARY}" "${pkgdir}"/usr/lib/mysql-workbench/"${BASENAME}"
 		ln -s "${BASENAME}" "${pkgdir}"/usr/lib/mysql-workbench/"${SONAME}"
 	done
-	install -D -m0755 "${srcdir}/install-bundle/usr/lib/libantlr4-runtime.so.4.9.3" "${pkgdir}/usr/lib/mysql-workbench/libantlr4-runtime.so.4.9.3"
 
 	# install bundled mysql and mysqldump
 	install -m0755 "${srcdir}/install-bundle/usr/bin/mysql"{,dump} "${pkgdir}"/usr/lib/mysql-workbench/