diff --git a/extra/mysql-workbench/.SRCINFO b/extra/mysql-workbench/.SRCINFO index b8441f8e1..9eeb5cb98 100644 --- a/extra/mysql-workbench/.SRCINFO +++ b/extra/mysql-workbench/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = mysql-workbench pkgdesc = A cross-platform, visual database design tool developed by MySQL - pkgver = 8.0.34 - pkgrel = 2 + pkgver = 8.0.36 + pkgrel = 1 url = https://www.mysql.com/products/workbench/ arch = x86_64 license = GPL2 @@ -36,30 +36,32 @@ pkgbase = mysql-workbench depends = unixodbc depends = vsqlite++ depends = zstd - source = https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.34-src.tar.gz - source = https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.34-src.tar.gz.asc - source = https://cdn.mysql.com/Downloads/MySQL-8.1/mysql-8.1.0.tar.gz - source = https://cdn.mysql.com/Downloads/MySQL-8.1/mysql-8.1.0.tar.gz.asc - source = https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.1.0-src.tar.gz - source = https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.1.0-src.tar.gz.asc - source = https://download.osgeo.org/gdal/3.7.2/gdal-3.7.2.tar.xz + source = https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.36-src.tar.gz + source = https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.36-src.tar.gz.asc + source = https://cdn.mysql.com/Downloads/MySQL-8.3/mysql-8.3.0.tar.gz + source = https://cdn.mysql.com/Downloads/MySQL-8.3/mysql-8.3.0.tar.gz.asc + source = https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.3.0-src.tar.gz + source = https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-8.3.0-src.tar.gz.asc + source = https://download.osgeo.org/gdal/3.8.3/gdal-3.8.3.tar.xz source = https://downloads.sourceforge.net/project/boost/boost/1.77.0/boost_1_77_0.tar.bz2 source = 0001-mysql-workbench-no-check-for-updates.patch source = 0002-disable-unsupported-operating-system-warning.patch source = 0003-include-list.patch + source = 0004-libxml2.patch source = arch_linux_profile.xml - validpgpkeys = 859BE8D7C586F538430B19C2467B942D3A79BD29 - sha256sums = b9bfc3e8746d5cebd7fa56a2ef5b7552332633306ccf99630ab242b9ff5aabb5 + validpgpkeys = BCA43417C3B485DD128EC6D4B7B3B788A8D3785C + sha256sums = 634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c sha256sums = SKIP - sha256sums = 3dd017a940734aa90796a4c65e125e6712f64bbbbe3388d36469deaa87b599eb + sha256sums = 1f21495a0b7a82b24a453d52e2153a814b3ca704eccf999766d545bce52f386e sha256sums = SKIP - sha256sums = 2ee3c7d0d031ce581deeed747d9561d140172373592bed5d0630a790e6053dc1 + sha256sums = a17bf1fad12b1ab17f5f6c7766289fb87200e919453234c3ec1664d7734be8f8 sha256sums = SKIP - sha256sums = 40c0068591d2c711c699bbb734319398485ab169116ac28005d8302f80b923ad + sha256sums = ae2d160f65016e208eca34ff14490ec4511f1fa03fd386ac130449d15e82929d sha256sums = fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 sha256sums = cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f sha256sums = 2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18 sha256sums = e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53 + sha256sums = a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c sha256sums = d816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265 pkgname = mysql-workbench diff --git a/extra/mysql-workbench/0004-libxml2.patch b/extra/mysql-workbench/0004-libxml2.patch new file mode 100644 index 000000000..aa1f7aad9 --- /dev/null +++ b/extra/mysql-workbench/0004-libxml2.patch @@ -0,0 +1,39 @@ +From a9885c2feb3ec5addfd3d76928844042d014a595 Mon Sep 17 00:00:00 2001 +From: Anton Zhukharev +Date: Wed, 27 Dec 2023 16:15:23 +0300 +Subject: [PATCH] fix usage of libxml2 + +--- + mysql-workbench-community/library/grt/src/grt.h | 2 +- + mysql-workbench-community/library/grt/src/unserializer.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/library/grt/src/grt.h b/library/grt/src/grt.h +index 47bfd637..43c1e612 100644 +--- a/library/grt/src/grt.h ++++ b/library/grt/src/grt.h +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include "base/threading.h" + #include + #include +diff --git a/library/grt/src/unserializer.cpp b/library/grt/src/unserializer.cpp +index 6dda76d6..8f44c33a 100644 +--- a/library/grt/src/unserializer.cpp ++++ b/library/grt/src/unserializer.cpp +@@ -401,7 +401,7 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si + xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT); + + if (!doc) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + + if (error) + throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message)); +-- +2.42.1 + diff --git a/extra/mysql-workbench/PKGBUILD b/extra/mysql-workbench/PKGBUILD index e38623ba6..2013519ca 100644 --- a/extra/mysql-workbench/PKGBUILD +++ b/extra/mysql-workbench/PKGBUILD @@ -12,11 +12,11 @@ highmem=1 pkgname=mysql-workbench -pkgver=8.0.34 -pkgrel=2 -_mysql_version=8.1.0 -_connector_version=8.1.0 -_gdal_version=3.7.2 +pkgver=8.0.36 +pkgrel=1 +_mysql_version=8.3.0 +_connector_version=8.3.0 +_gdal_version=3.8.3 _boost_version=1.77.0 # bump the antlr4 version as required, this is to match the jar file name _antlr4_version=4.13.1 @@ -30,7 +30,7 @@ depends=('cairo' 'antlr4-runtime' 'curl' 'desktop-file-utils' 'freetype2' 'gifli 'vsqlite++' 'zstd') makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' "antlr4=${_antlr4_version}" "antlr4-runtime=${_antlr4_version}") -validpgpkeys=('859BE8D7C586F538430B19C2467B942D3A79BD29') # MySQL Release Engineering +validpgpkeys=('BCA43417C3B485DD128EC6D4B7B3B788A8D3785C') # MySQL Release Engineering 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} @@ -39,18 +39,20 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community '0001-mysql-workbench-no-check-for-updates.patch' '0002-disable-unsupported-operating-system-warning.patch' '0003-include-list.patch' + '0004-libxml2.patch' '0001-fix-buiild-for-32-bit.patch' 'atomic.patch' 'arch_linux_profile.xml') -sha256sums=('b9bfc3e8746d5cebd7fa56a2ef5b7552332633306ccf99630ab242b9ff5aabb5' +sha256sums=('634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c' 'SKIP' - '3dd017a940734aa90796a4c65e125e6712f64bbbbe3388d36469deaa87b599eb' + '1f21495a0b7a82b24a453d52e2153a814b3ca704eccf999766d545bce52f386e' 'SKIP' - '2ee3c7d0d031ce581deeed747d9561d140172373592bed5d0630a790e6053dc1' + 'a17bf1fad12b1ab17f5f6c7766289fb87200e919453234c3ec1664d7734be8f8' 'SKIP' - '40c0068591d2c711c699bbb734319398485ab169116ac28005d8302f80b923ad' + 'ae2d160f65016e208eca34ff14490ec4511f1fa03fd386ac130449d15e82929d' 'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854' 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f' + 'a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c' '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18' 'e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53' '719501bbd1de673767007c429feed2fc48d1176d456161c4ba69cf3165c0438a' @@ -70,6 +72,9 @@ prepare() { # add missing include patch -Np1 < "${srcdir}"/0003-include-list.patch + # fix build with libxml2 + patch -Np1 < "${srcdir}"/0004-libxml2.patch + # remove '-Werror' sed -i '/^\s*set/s| -Werror||' CMakeLists.txt @@ -132,7 +137,10 @@ build() { cmake -B build-gdal -S "${srcdir}/gdal-${_gdal_version}" \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DGDAL_USE_JASPER='OFF' \ - -DGDAL_USE_MYSQL='OFF' + -DGDAL_USE_MYSQL='OFF' \ + -DBUILD_CSHARP_BINDINGS='FALSE' \ + -DBUILD_JAVA_BINDINGS='FALSE' \ + -DBUILD_PYTHON_BINDINGS='FALSE' echo "Build gdal..." make LD_LIBRARY_PATH="${srcdir}/install-bundle/usr/lib/" -C build-gdal echo "Install gdal..." diff --git a/extra/mysql-workbench/keys/pgp/BCA43417C3B485DD128EC6D4B7B3B788A8D3785C.asc b/extra/mysql-workbench/keys/pgp/BCA43417C3B485DD128EC6D4B7B3B788A8D3785C.asc new file mode 100644 index 000000000..dc52c4919 --- /dev/null +++ b/extra/mysql-workbench/keys/pgp/BCA43417C3B485DD128EC6D4B7B3B788A8D3785C.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=h5nH +-----END PGP PUBLIC KEY BLOCK-----