Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
mysql-workbench
Commits:
68d3fb4b by Christian Hesse at 2024-01-17T01:21:10+01:00
upgpkg: 8.0.36-1: new upstream release
- - - - -
3 changed files:
- .SRCINFO
- + 0004-libxml2.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = mysql-workbench
pkgdesc = A cross-platform, visual database design tool developed by
MySQL
pkgver = 8.0.36
- pkgrel = 0
+ pkgrel = 1
url = https://www.mysql.com/products/workbench/
arch = x86_64
license = GPL2
@@ -47,6 +47,7 @@ pkgbase = mysql-workbench
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 = BCA43417C3B485DD128EC6D4B7B3B788A8D3785C
sha256sums =
634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c
@@ -60,6 +61,7 @@ pkgbase = mysql-workbench
sha256sums =
cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f
sha256sums =
2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18
sha256sums =
e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53
+ sha256sums =
a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c
sha256sums =
d816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265
pkgname = mysql-workbench
=====================================
0004-libxml2.patch
=====================================
@@ -0,0 +1,39 @@
+From a9885c2feb3ec5addfd3d76928844042d014a595 Mon Sep 17 00:00:00 2001
+From: Anton Zhukharev <[email protected]>
+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 <vector>
+ #include <stdexcept>
+ #include <boost/function.hpp>
+-#include <libxml/xmlmemory.h>
++#include <libxml/tree.h>
+ #include "base/threading.h"
+ #include <string>
+ #include <gmodule.h>
+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
+
=====================================
PKGBUILD
=====================================
@@ -6,7 +6,7 @@
pkgname=mysql-workbench
pkgver=8.0.36
-pkgrel=0
+pkgrel=1
_mysql_version=8.3.0
_connector_version=8.3.0
_gdal_version=3.8.3
@@ -32,6 +32,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-include-list.patch'
+ '0004-libxml2.patch'
'arch_linux_profile.xml')
sha256sums=('634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c'
'SKIP'
@@ -44,6 +45,7 @@
sha256sums=('634d8a66b6c2777491058a60aba8187e947e4c49a0e7ae83df312fa70714637c'
'cdf687f23bc6e8d52dbee9fa02b23d755e80f88476f0fc2e7c4c71cdfed3792f'
'2d0f6dcf38f22e49ef7ab9de0230484f1ffac41b7ac40feaf5ef4538ae2f7a18'
'e7e66ba68a21a0da87f0513f2b9550359c923a94aa7d16afe6ead063322e3d53'
+ 'a9f1d3262350b22850f9720647c806be8959f2ed387d0095e6134b7f3251363c'
'd816164098c90c432b4fe590708c14f95ab137abfe16ad1b7d498b2e83c0e265')
prepare() {
@@ -59,6 +61,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
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mysql-workbench/-/commit/68d3fb4b283fb001d70120164cfc205764716bc7
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/mysql-workbench/-/commit/68d3fb4b283fb001d70120164cfc205764716bc7
You're receiving this email because of your account on gitlab.archlinux.org.
