extra/mysql-workbench to 8.0.40-6

This commit is contained in:
Kevin Mihelich 2025-01-08 15:03:09 +00:00
parent eb33fcf1da
commit c5eaf110f0
3 changed files with 49 additions and 2 deletions

View file

@ -1,7 +1,7 @@
pkgbase = mysql-workbench
pkgdesc = A cross-platform, visual database design tool developed by MySQL
pkgver = 8.0.40
pkgrel = 5
pkgrel = 6
url = https://www.mysql.com/products/workbench/
arch = x86_64
license = GPL2
@ -103,6 +103,7 @@ pkgbase = mysql-workbench
source = 0001-mysql-workbench-no-check-for-updates.patch
source = 0002-disable-unsupported-operating-system-warning.patch
source = 0003-swig-4-3.patch
source = 0004-replace-deprecated-python-modules-pipes-with-shlex.patch
source = arch_linux_profile.xml
validpgpkeys = BCA43417C3B485DD128EC6D4B7B3B788A8D3785C
sha256sums = fc2ae31e067720516f501d48c5e51199ef19e81a19c746f4dcc5a4f1009ed128
@ -115,6 +116,7 @@ pkgbase = mysql-workbench
sha256sums = cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f
sha256sums = 2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18
sha256sums = fb0732919a15dc0b16f5ca104cac7be3edd92dc997fed879c23cd933a1f43367
sha256sums = 8a8a013ca0dad92e4859e2e9bc3ff73d018e2d8ecd9ca7a9c922a5ce2368e914
sha256sums = d816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265
pkgname = mysql-workbench

View file

@ -0,0 +1,40 @@
From 1d533e8422f7a79785c38dc237265454538b8d90 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 8 Jan 2025 15:14:39 +0100
Subject: [PATCH 1/1] replace deprecated python modules pipes with shlex
---
plugins/wb.admin/backend/wb_server_management.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin/backend/wb_server_management.py
index 40ed515d2..c89c98b6c 100644
--- a/plugins/wb.admin/backend/wb_server_management.py
+++ b/plugins/wb.admin/backend/wb_server_management.py
@@ -28,7 +28,7 @@ import errno
import threading
import tempfile
import io
-import pipes
+import shlex
import subprocess
import time
import inspect
@@ -511,7 +511,7 @@ class ProcessOpsLinuxLocal(ProcessOpsBase):
return 0
def list2cmdline(self, args):
- return " ".join([pipes.quote(a) or "''" for a in args])
+ return " ".join([shlex.quote(a) or "''" for a in args])
_process_ops_classes.append(ProcessOpsLinuxLocal)
@@ -592,7 +592,7 @@ class ProcessOpsLinuxRemote(ProcessOpsBase):
def list2cmdline(self, args):
- return " ".join([pipes.quote(a) or "''" for a in args])
+ return " ".join([shlex.quote(a) or "''" for a in args])
_process_ops_classes.append(ProcessOpsLinuxRemote)

View file

@ -12,7 +12,7 @@ buildarch=8
pkgname=mysql-workbench
pkgver=8.0.40
pkgrel=5
pkgrel=6
_mysql_version=8.4.3
_connector_version=8.4.0
_boost_version=1.77.0
@ -75,6 +75,7 @@ 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-swig-4-3.patch'
'0004-replace-deprecated-python-modules-pipes-with-shlex.patch'
'arch_linux_profile.xml')
sha256sums=('fc2ae31e067720516f501d48c5e51199ef19e81a19c746f4dcc5a4f1009ed128'
'SKIP'
@ -86,6 +87,7 @@ sha256sums=('fc2ae31e067720516f501d48c5e51199ef19e81a19c746f4dcc5a4f1009ed128'
'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
'2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
'fb0732919a15dc0b16f5ca104cac7be3edd92dc997fed879c23cd933a1f43367'
'8a8a013ca0dad92e4859e2e9bc3ff73d018e2d8ecd9ca7a9c922a5ce2368e914'
'd816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265')
prepare() {
@ -101,6 +103,9 @@ prepare() {
# fix build with swig 4.3.x - function SWIG_Python_AppendOutput has a 3rd parameter now
patch -Np1 < "${srcdir}"/0003-swig-4-3.patch
# replace deprecated python modules pipes with shlex
patch -Np1 < "${srcdir}"/0004-replace-deprecated-python-modules-pipes-with-shlex.patch
# remove '-Werror'
sed -i '/^\s*set/s| -Werror||' CMakeLists.txt