From nobody Fri Feb 09 14:22:53 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TWbfj5jqQz59mTh; Fri, 9 Feb 2024 14:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TWbfj5Bncz48l4; Fri, 9 Feb 2024 14:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707488573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9Mf5rSvRispXrAhQgzoBF9AvvMWipDgQhk9joPkVYc=; b=mwPbMZDUOfwVS09v8LN6Xn7x2+n3T6dDzgAWAfbz03kbKw3zxEdgS2PV5KkP1d7cR0+xM8 EXOUD3bEqZTGU6/fRgTKktwBXBLWGqCyDVzhj/2V5PGGt2V2iwjBp8RX7rCkgmzI9hSdtM 4i9/mx4k0ox0/2QP5po9HopsL+uU+E+3Gzn5jZmhkbeS/bwvIYOwUhqLo1pL1YYkqKu+8d F54m95TE5LvaRl5aTcnimMqLKVgfIJZTEwmVsacWouUq7wDudV1oQbqJRtYf49EXd3F2MC ilNzU8ZglUpPRKTp3v54fC5a+Q8vY0ZlB7jLH31I8Zam60/TycMun4qKqwzCdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707488573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9Mf5rSvRispXrAhQgzoBF9AvvMWipDgQhk9joPkVYc=; b=Fum8jw7MksQG15RBIfjODdjT/cMMcE0V5ZYUuBMgedSdxhuhcvjZn0xYiUSttNswoeyY63 QT7/rtGdfOJ5pnWrycw7UtiteDCAE4YE/3HEJ5GHZ/aiRiERg6mQH/HBLvZQJDz1s6gTBF PYJBMBXrD24zkX06L5uEi/JAmt+tvVxN/oeuk+3x7J8h//ZW5QvsLOUhktrHtZ+vqEv5EE hOVrWjVjGO6uTq87kW55+jwtjOWh8q6IDOTPuLDEMQz+Zkg4C2lfN9tDSURXQLFstybQip liguYf7iB9Iyg0MPgHgx3xEuC2wr2GVMW8FfeYZFwLQKm7hGmrX6QJZPfL3qpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707488573; a=rsa-sha256; cv=none; b=xqKOvMbEB8Ik5MgsmG3vTqjUGAxwIZOHgOXOSjbv5Mf4kBjaEmaxjkjz4daV1iayHmb+6R wFx7VgJgrvttMlALbQUy6RUNgFmROF8OpBdjGgk9cJOo68MNXZzXf7s3Bt1+qQ3EFjOmFc GLL9vgvXvC15BdUYaX97GkMtO7zhlH6lODK/NaiZt3n0mHU5pL+LvHVENIb6ZQKN+DOUuJ PYk4UTfcNBgOaILqe2cX5WBy3WmfmLCr49O8JnZbJCSoHzI2kVc7t1CH/1e6LJUrHHrtrl Typ0oG2aOZG2mUMlMFPFSLXPwgSOcORu8ArxRTE5Js69iAZIPrNp1RY35w5ebg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TWbfj4J4BzcW3; Fri, 9 Feb 2024 14:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 419EMrT4017746; Fri, 9 Feb 2024 14:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419EMrrG017743; Fri, 9 Feb 2024 14:22:53 GMT (envelope-from git) Date: Fri, 9 Feb 2024 14:22:53 GMT Message-Id: <202402091422.419EMrrG017743@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: 1e1b3d42f560 - main - www/{*chromium,iridium}: xmlError is only a const since version 2.12 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e1b3d42f560254a9c6e533d20e1c081c184cf5b Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e1b3d42f560254a9c6e533d20e1c081c184cf5b commit 1e1b3d42f560254a9c6e533d20e1c081c184cf5b Author: Robert Nagy AuthorDate: 2024-02-09 14:19:47 +0000 Commit: Robert Nagy CommitDate: 2024-02-09 14:22:45 +0000 www/{*chromium,iridium}: xmlError is only a const since version 2.12 the previous patches were checking if libxml is older than 2.11.6, but that breaks builds with 2.11.7 as xmlError has been changed to a const at 2.12 PR: 276901, 276902, 276903 Reported by: diizzy@ --- .../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +- ...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +- .../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +- ...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +- .../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +- ...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h index d2cf5dab1c60..c7f635ce4a7e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h +++ b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h @@ -4,7 +4,7 @@ void reset(); -+#if (LIBXML_VERSION > 21106) ++#if (LIBXML_VERSION >= 21200) static void ParseErrorFunc(void* user_data, const xmlError*); +#else + static void ParseErrorFunc(void* user_data, xmlError*); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc index 1f01a503d293..b87237b27ed9 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc @@ -4,7 +4,7 @@ // It would be nice to do something with this error message. } -+#if (LIBXML_VERSION > 21106) ++#if (LIBXML_VERSION >= 21200) void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { +#else +void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h index 2edb2287f6f0..a1a326e2f41e 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h +++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h @@ -4,7 +4,7 @@ void reset(); -+#if (LIBXML_VERSION > 21106) ++#if (LIBXML_VERSION >= 21200) + static void ParseErrorFunc(void* user_data, const xmlError*); +#else static void ParseErrorFunc(void* user_data, xmlError*); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc index 083d02b21347..d9539fd1c05c 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc @@ -4,7 +4,7 @@ // It would be nice to do something with this error message. } -+#if (LIBXML_VERSION > 21106) ++#if (LIBXML_VERSION >= 21200) +void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { +#else void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h index c3359d6b9be6..fe0402779151 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h @@ -4,7 +4,7 @@ void reset(); -+#if (LIBXML_VERSION > 21106) ++#if (LIBXML_VERSION >= 21200) static void ParseErrorFunc(void* user_data, const xmlError*); +#else + static void ParseErrorFunc(void* user_data, xmlError*); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc index 5af5353c3fcc..e7186fa96e7c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc @@ -4,7 +4,7 @@ // It would be nice to do something with this error message. } -+#if (LIBXML_VERSION > 21106) ++#if (LIBXML_VERSION >= 21200) void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { +#else +void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {