From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C7FC158528 for ; Mon, 29 Jan 2024 13:02:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C29FE2A0C; Mon, 29 Jan 2024 13:02:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23833E2A0C for ; Mon, 29 Jan 2024 13:02:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DC2B3434B3 for ; Mon, 29 Jan 2024 13:02:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B15DEC0 for ; Mon, 29 Jan 2024 13:02:42 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1706533335.d6c21bdac617b6b07cbeb7e8b17fa91ae90f0b55.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-workbench/files/, dev-db/mysql-workbench/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild X-VCS-Directories: dev-db/mysql-workbench/files/ dev-db/mysql-workbench/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: d6c21bdac617b6b07cbeb7e8b17fa91ae90f0b55 X-VCS-Branch: master Date: Mon, 29 Jan 2024 13:02:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84221e09-2bdf-4d75-8809-81d6b9e15b82 X-Archives-Hash: 3f1d6a4c06bd314908bd4682d2316c2b commit: d6c21bdac617b6b07cbeb7e8b17fa91ae90f0b55 Author: Alfred Wingate protonmail com> AuthorDate: Mon Jan 29 09:45:45 2024 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Mon Jan 29 13:02:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c21bda dev-db/mysql-workbench: fix build with >=libxml2-2.12 Closes: https://bugs.gentoo.org/923020 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Hans de Graaff gentoo.org> ...sql-workbench-8.0.36-libxml2-2.12-support.patch | 33 ++++++++++++++++++++++ .../mysql-workbench/mysql-workbench-8.0.36.ebuild | 1 + 2 files changed, 34 insertions(+) diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch new file mode 100644 index 000000000000..e3ee9aa099f0 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/923020 +https://github.com/mysql/mysql-workbench/pull/43 + +From 8f8917671ab5a06f842a340f31c6d4ec7634147a Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Sat, 27 Jan 2024 22:51:15 +0200 +Subject: [PATCH] Fix support for libxml2-2.12 with its api and header changes + +Signed-off-by: Alfred Wingate +--- a/library/grt/src/grt.h ++++ b/library/grt/src/grt.h +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include "base/threading.h" + #include +--- a/library/grt/src/unserializer.cpp ++++ b/library/grt/src/unserializer.cpp +@@ -401,7 +401,11 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si + xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT); + + if (!doc) { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* error = xmlGetLastError(); ++#else + xmlErrorPtr error = xmlGetLastError(); ++#endif + + if (error) + throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message)); diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild index c8e0352d19f7..2f2d812652f4 100644 --- a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild @@ -70,6 +70,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" "${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch" "${FILESDIR}/${PN}-8.0.33-gcc13.patch" + "${FILESDIR}/${PN}-8.0.36-libxml2-2.12-support.patch" ) src_unpack() {