From e24d1ef906999d9a02cfff09d619fb50b5304c37 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 27 Apr 2024 15:41:49 +0000 Subject: [PATCH] extra/mysql-workbench to 8.0.36-3 --- extra/marisa/.SRCINFO | 35 ++++++++++++++++++++ extra/mysql-workbench/.SRCINFO | 5 +-- extra/mysql-workbench/0005-python-3-12.patch | 12 +++++++ extra/mysql-workbench/PKGBUILD | 9 ++++- 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 extra/marisa/.SRCINFO create mode 100644 extra/mysql-workbench/0005-python-3-12.patch diff --git a/extra/marisa/.SRCINFO b/extra/marisa/.SRCINFO new file mode 100644 index 000000000..2a686a8aa --- /dev/null +++ b/extra/marisa/.SRCINFO @@ -0,0 +1,35 @@ +pkgbase = marisa + pkgver = 0.2.6 + pkgrel = 12 + url = https://github.com/s-yata/marisa-trie + arch = x86_64 + license = BSD + license = LGPL + makedepends = python + makedepends = ruby + makedepends = perl + makedepends = swig + makedepends = python-setuptools + source = marisa-trie-0.2.6.tar.gz::https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz + source = fix-format-security.patch + sha512sums = c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d + sha512sums = 3583f23c55ccd46cefbd757ef3f82dc7a90f14c64ecf69a99ab3467ca1e6aeddf9822be4c4dffcdbb8841d79fe116cfb8eff0e9b44abaadbcbf8d50a10ab1ec9 + +pkgname = marisa + pkgdesc = Static and space-efficient trie data structure library + depends = gcc-libs + +pkgname = perl-marisa + pkgdesc = Perl language binding for marisa + depends = perl + depends = marisa + +pkgname = python-marisa + pkgdesc = Python language binding for marisa + depends = python + depends = marisa + +pkgname = ruby-marisa + pkgdesc = Ruby language binding for marisa + depends = ruby + depends = marisa diff --git a/extra/mysql-workbench/.SRCINFO b/extra/mysql-workbench/.SRCINFO index f4f02026d..d68a7a4c7 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.36 - pkgrel = 2 + pkgrel = 3 url = https://www.mysql.com/products/workbench/ arch = x86_64 license = GPL2 @@ -11,7 +11,6 @@ pkgbase = mysql-workbench makedepends = swig makedepends = java-runtime makedepends = imagemagick - makedepends = gcc12 makedepends = antlr4=4.13.1 makedepends = antlr4-runtime=4.13.1 depends = cairo @@ -47,6 +46,7 @@ pkgbase = mysql-workbench source = 0002-disable-unsupported-operating-system-warning.patch source = 0003-include-list.patch source = 0004-libxml2.patch + source = 0005-python-3-12.patch source = arch_linux_profile.xml validpgpkeys = BCA43417C3B485DD128EC6D4B7B3B788A8D3785C sha256sums = 634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c @@ -61,6 +61,7 @@ pkgbase = mysql-workbench sha256sums = 2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18 sha256sums = e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53 sha256sums = a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c + sha256sums = e596ef8ed8479c5052c78fe17139309182d22bfd5765f32866367fd3e787277d sha256sums = d816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265 pkgname = mysql-workbench diff --git a/extra/mysql-workbench/0005-python-3-12.patch b/extra/mysql-workbench/0005-python-3-12.patch new file mode 100644 index 000000000..e31816e31 --- /dev/null +++ b/extra/mysql-workbench/0005-python-3-12.patch @@ -0,0 +1,12 @@ +diff --git a/library/grt/src/python_context.cpp b/library/grt/src/python_context.cpp +index b1e1f5d..65514d1 100644 +--- a/library/grt/src/python_context.cpp ++++ b/library/grt/src/python_context.cpp +@@ -33,7 +33,6 @@ + // python internals + #include + #include +-#include + #include + + #include "python_grtobject.h" diff --git a/extra/mysql-workbench/PKGBUILD b/extra/mysql-workbench/PKGBUILD index 3cd5a7cf3..e4ad65572 100644 --- a/extra/mysql-workbench/PKGBUILD +++ b/extra/mysql-workbench/PKGBUILD @@ -13,7 +13,7 @@ highmem=1 pkgname=mysql-workbench pkgver=8.0.36 -pkgrel=2 +pkgrel=3 _mysql_version=8.3.0 _connector_version=8.3.0 _gdal_version=3.8.4 @@ -40,6 +40,7 @@ source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community '0002-disable-unsupported-operating-system-warning.patch' '0003-include-list.patch' '0004-libxml2.patch' + '0005-python-3-12.patch' '0001-fix-buiild-for-32-bit.patch' 'atomic.patch' 'arch_linux_profile.xml') @@ -53,6 +54,7 @@ sha256sums=('634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c' 'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854' 'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f' 'a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c' + 'e596ef8ed8479c5052c78fe17139309182d22bfd5765f32866367fd3e787277d' '2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18' 'e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53' '719501bbd1de673767007c429feed2fc48d1176d456161c4ba69cf3165c0438a' @@ -75,6 +77,9 @@ prepare() { # fix build with libxml2 patch -Np1 < "${srcdir}"/0004-libxml2.patch + # fix build with python 3.12 + patch -Np1 < "${srcdir}"/0005-python-3-12.patch + # remove left over requirement on PCRE sed -i '/PCRE REQUIRED/d' CMakeLists.txt @@ -151,6 +156,8 @@ build() { ln -s '.' "${srcdir}/install-bundle/usr/include/gdal" # Build MySQL Workbench itself with bundled libs + # include cstdint to fix building with gcc 13 + # TODO: remove when fixed upstream mkdir "${srcdir}/mysql-workbench-community-${pkgver}-src-build" cd "${srcdir}/mysql-workbench-community-${pkgver}-src-build" echo "Configure mysql-workbench..."