From nobody Sat Jan 14 16:18:02 2023 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 4NvNk23Nbzz2r9r6; Sat, 14 Jan 2023 16:18:02 +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 4NvNk22tJpz3ph9; Sat, 14 Jan 2023 16:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673713082; 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=QqLAkqtgMn4Vpwcz8KnP5L+Nl+9EWXhxybwf41D1blE=; b=QUjDR+AXaOoeWTeXALk+RtqLwBXz+0Rl98Q2DJr9sbDKhLIVajD7o+58EmgR3QjXHdQfDe sYW0ZgL8mVoJdH0KuUNTK9fue4WA9SRlrUQVXW5zlZIGotE7m5yknaXkUam/wEba8qs9tP OCGUGm+1tt36i7X+NHgu0YjvT9vVSQGXYBn2HhMwhP5tTxwcdkid0cf+52N34FQwlLOw8p dnhIhPtxfBo8mPThzvAgoKCTYtuXYxS+l4cL7vU0aagzmn8o7Px3ukDZH2m7yQ+Hzi/FAT mNPV/y4aA3o1gRJ1NGqCWBWtmfADxsP+4LGrDaO98wYEi38K5pBb5rMwI3Gpyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673713082; 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=QqLAkqtgMn4Vpwcz8KnP5L+Nl+9EWXhxybwf41D1blE=; b=eO0JNnCQ9kkGjEoI8YSJGA3obCgk2J4NGeaOH4PPPFWO0VEsYV3RcLXbC4ULDLFjvc2k+g TfMFvg0dGxERt1p7ZydOvHRoo1cKzPefS3XJ9YuQ29TKsXQrBHTzQcdNFTKZVtmolM6jhz 3pJZvIWD9k+OXQnvK/1JbzcaanQI4c+yJd2ZG8RSdK7CmMgQc1tm5GUThWqCtydWSsGHeZ p4ga8yT5tKzjz8zyeaoJn4lrWERQCPjTEAp/9hr+DGoIOit8opF7NgIJsql3VE7k+vkfs/ P53DeuJ2Xc6eBsN1CWQvgwwPQr0HIE+GFK9BvdmC3Oxvfa+YREK6azIKVZo8ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673713082; a=rsa-sha256; cv=none; b=I3/qBpLz+Li/t51sO+9sUmRAPvh+KHXyKFs2YQK5kle+SloXjqoeHB0eTOr1x6geR31cvl COKeacjB2AhikDwlwXEphyjkWzfALD4zqUxxyKOZtDOnyW1k3wlxP0WOrXqGxbe3IkVkRa zVM2Fi/EwxJ59Rj7vYgk1WCod4hCwXD7KkT1k5B01zTwUb+TbAoskCpEOx4Tm3hl2+hATQ vXT1jQh8wVhn4PfCW5mF9M8mckRq4ED0HfL8AkkNmI6ZKT0Lv2VLU13Itq9DXbTr1IErOA xgMzqPJIqvtfJnfO3G8C7VjgKvgQDvmRj2FnVjHlKQ770RtOYBE+Q0BYr4G3VQ== 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 4NvNk21y2hztjb; Sat, 14 Jan 2023 16:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30EGI2VS061455; Sat, 14 Jan 2023 16:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30EGI2ZO061454; Sat, 14 Jan 2023 16:18:02 GMT (envelope-from git) Date: Sat, 14 Jan 2023 16:18:02 GMT Message-Id: <202301141618.30EGI2ZO061454@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: a66b53754035 - 2023Q1 - www/{chromium,ungoogled-chromium}: unbreak tests by using FC_CACHE_VERSION instead of hardcoding the version 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: a66b53754035c0e4f0c0a99a7972366c15163ab8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=a66b53754035c0e4f0c0a99a7972366c15163ab8 commit a66b53754035c0e4f0c0a99a7972366c15163ab8 Author: Robert Nagy AuthorDate: 2023-01-14 16:11:06 +0000 Commit: Rene Ladan CommitDate: 2023-01-14 16:17:59 +0000 www/{chromium,ungoogled-chromium}: unbreak tests by using FC_CACHE_VERSION instead of hardcoding the version (cherry picked from commit 36e349bf592cf1c3a25d0f75bc83e90ae7779686) --- ...rty_test__fonts_fontconfig_generate__fontconfig__caches.cc | 11 +++++++++++ ...rty_test__fonts_fontconfig_generate__fontconfig__caches.cc | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/www/chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc new file mode 100644 index 000000000000..535576512526 --- /dev/null +++ b/www/chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc @@ -0,0 +1,11 @@ +--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2023-01-14 16:09:37 UTC ++++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc +@@ -56,7 +56,7 @@ int main() { + FcFini(); + + // Check existence of intended fontconfig cache file. +- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-7"; ++ auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION; + bool cache_exists = access(cache.c_str(), F_OK) == 0; + return !cache_exists; + } diff --git a/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc new file mode 100644 index 000000000000..535576512526 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc @@ -0,0 +1,11 @@ +--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2023-01-14 16:09:37 UTC ++++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc +@@ -56,7 +56,7 @@ int main() { + FcFini(); + + // Check existence of intended fontconfig cache file. +- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-7"; ++ auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION; + bool cache_exists = access(cache.c_str(), F_OK) == 0; + return !cache_exists; + }