From nobody Fri Feb 09 14:23:09 2024 X-Original-To: dev-commits-ports-branches@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 4TWbg20T6Wz59mhr; Fri, 9 Feb 2024 14:23:10 +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 4TWbg16hXPz49LJ; Fri, 9 Feb 2024 14:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707488589; 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=sZRRS3rULukoPAmrRp/kbe3RsCGEPqJblv3ErGS5r8Y=; b=G0BdO9DjT219kL+lyT/sQEsbBZ4iAr4dohTbNTBXmLqk0ns7qBCNNnnXVbViHW6M8CbBNC Mx859oM18XuyE3yOr3J8CT8ZqIot+UvCVPriXDOAKp+ywW4HEzPBtgmbP0DfKzPOIpGUcW IILVaNGceg5xe6zdhRWySy+/uxyrtcQoqPeMxNkPoXWKwdZjG1xLGGszRoWNhc5VLMzey3 1HCpeGuUUGivvglqkjcpi6S4CR0rYveamxWbJ3Bj6IhSB4B+wdDD2FIHG1Ls644ouHcC9/ nj+sv6F/WrMDb22Y3DLFnh4d0dLZ4YxH0U9qZQ7gpwxSsRDD7G7Qo055/v2bnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707488589; 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=sZRRS3rULukoPAmrRp/kbe3RsCGEPqJblv3ErGS5r8Y=; b=rJmr2dNwM6MSJtzOhqEuk96VeIr3aFmgybhNJNP7qITOcMlBeCBzbgOjqfN6LsyiD2QMXA hO7s+tcbfXJSp3Ne79wGhYyC5rZQXT7/WjLAr1qTbVvDpGMz6TaIw36ub6d10Gexh4mrId M9N2X5NGA51AVUSlmvEEg0EDjSgu4HTlfYdQ8AgozUcytdACB+C/fk6aORb397XPKXmalH uyRE9R8IJEUi5gL6t2BJYNZqN7rljiJXYTMvzir17puIg2laX1iu4xr2Bvf2vG0F/2ogDo ep9DV7nMJhLI6BSUT4TIfTCMej+XBiKiB5qKD3QKnvsR8Um3h9ezjoMhvi3k4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707488589; a=rsa-sha256; cv=none; b=LV/S3+aIku6PMwwWgQ/XFHW/PaROblveifCHegMpx2JaphnkVP1EMVoandHZlThcs9IKP+ riT6MLso3c177j2P2Q2AAg/E02FkmxGqRJq6H1CcPTzP7boZWJJNlT5m4tMDW2MtlbnXSq RE+cNhlqIqyF4bFDSCRtL5M/zaiPTnnefCSBuSjTmNI1QyTOO/134XaArFR3SOBLKGrGvK 9FG/HUqwC1/V14+++vyzgnbUAmfG5AfnAtwwDzo05n0ne87XyIY2KwaQgAVjMPidWtitzq wm4AGfTsUcK34boLgbK6PeCvtvBqC4WTYWTQevYfFbitz72K72dorLKcNIiF5g== 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 4TWbg15kyyzcW6; Fri, 9 Feb 2024 14:23:09 +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 419EN9hS017968; Fri, 9 Feb 2024 14:23:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419EN9Ie017965; Fri, 9 Feb 2024 14:23:09 GMT (envelope-from git) Date: Fri, 9 Feb 2024 14:23:09 GMT Message-Id: <202402091423.419EN9Ie017965@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 29209339c35d - 2024Q1 - www/{*chromium,iridium}: xmlError is only a const since version 2.12 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 29209339c35ddb4e9ec7a62acbd3cebaa6ad4a19 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=29209339c35ddb4e9ec7a62acbd3cebaa6ad4a19 commit 29209339c35ddb4e9ec7a62acbd3cebaa6ad4a19 Author: Robert Nagy AuthorDate: 2024-02-09 14:19:47 +0000 Commit: Robert Nagy CommitDate: 2024-02-09 14:23:04 +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@ (cherry picked from commit 1e1b3d42f560254a9c6e533d20e1c081c184cf5b) --- .../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) {