From nobody Sat Feb 24 20:26:00 2024 X-Original-To: dev-commits-ports-main@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 4Thz0m6vmCz5BXWD; Sat, 24 Feb 2024 20:26:00 +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 4Thz0m4hDxz4JcD; Sat, 24 Feb 2024 20:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708806360; 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=nq1lfRn9GKagkZmrX7qvl20IXE87aeLH2mzoAk+6zvE=; b=Ui5eofaWfp4ZXmARRSVz0JsVySuzgL44vYVUdLIycT1JKx5YmyI2t7FcHMfpyJYWVzJaZN ijA6YnEDyHVabLQqMa0CpiKtqefURdZzBUU4mBkg6HY5dxdd1lTioIcy0gwhaOZguEfM+r HvJ1TWYM7lL5Ph2Z/9EoYywISUhPr2+RtEwFBRaiEKKidRJxhFYIXCjBat/ld8Zo7Zdvlg x59pNW3eIXExNzWQ9hcYXBHcGLp8fcjzWY5rpoAJxCGr82m8Q26UeAFtglenBzQhk7XC3g vHOi46xi+y4lzeGU6+9TZGdG5IGzqTJmYZQVf71Sz9VwVOgS/RXTS1hXs3ZIMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708806360; a=rsa-sha256; cv=none; b=Hom5TNyZGdcIGXdWel7/NxVzZ6Gbjz54tZKjEpYhcJq4XY94Us/MnL+hNB8SVF73CGs5cu g4xjtijAY/K8o+XnJ2j3a+Pbq9SF0BmBQuKHAhZ4kxCykVRNYNsl8o/PJjrhSStKs9eBgx fCrCr+OiomtLfQ4vLRljK0g7rjwDiPqVTvvYAwGWpF/W0D3wXKSjx5ywv0Xpw6RPnG2WNs nAznnU5dzO9fmp1UOzJR/KorSixIogfffst1PcPIeYIEI4znAY84Bj1+RZ6ynLQ7WCVj0I fb1NEXMd7LsYWMp0xFYaV2U+kpxaWb5AXgKZ8tg/mYNpiNPnK+YdTcvipRXB4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708806360; 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=nq1lfRn9GKagkZmrX7qvl20IXE87aeLH2mzoAk+6zvE=; b=hEYl90dkywCK3qqxZ+kTTVxW+KGI0qpok9OggdimUBd2MMe6ucg8M7tHhkI0KesA+x6/SV /INV7/0QxvZROnt4i6R6S623FTF//g01Jw/l352ddjr88yUs0UP4eO+xSJvltn6q2AqxnM JL8MI4Hp2ATjILTo1A4m0F7QZBc+gm5BpJMyxCbOuVYycHL0M7kqvRJDbYnq9+uZOso6v/ +p7CJWdzjXpwrZFE8bOvzKcFgn5JpdpVChEgI82bEjnGtYsM6p/PhZKuXwdNWcI41kabD0 sZv6CgjsobC8HPXaHj2r1cYLyKt2n6F0a7DcoF6VWEWFwMiOBhYXKRco/swGNQ== 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 4Thz0m3fCmz1Cm1; Sat, 24 Feb 2024 20:26:00 +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 41OKQ0ji020913; Sat, 24 Feb 2024 20:26:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OKQ0qY020910; Sat, 24 Feb 2024 20:26:00 GMT (envelope-from git) Date: Sat, 24 Feb 2024 20:26:00 GMT Message-Id: <202402242026.41OKQ0qY020910@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: cbdd4c93d916 - main - www/chromium: revert to previous libxml version check List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: cbdd4c93d916be35e31fa9d5ef86e10d677cef87 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbdd4c93d916be35e31fa9d5ef86e10d677cef87 commit cbdd4c93d916be35e31fa9d5ef86e10d677cef87 Author: Robert Nagy AuthorDate: 2024-02-24 20:25:30 +0000 Commit: Robert Nagy CommitDate: 2024-02-24 20:25:30 +0000 www/chromium: revert to previous libxml version check --- .../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +- ...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +- 2 files changed, 2 insertions(+), 2 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 702f8c29c936..a085ea4a2ab0 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 301753e59466..9e11b5e7bdcc 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) {