From nobody Sat Jan 14 16:17:22 2023 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 4NvNjH1Y0cz2r9fx; Sat, 14 Jan 2023 16:17:23 +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 4NvNjH13t2z3pd4; Sat, 14 Jan 2023 16:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673713043; 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=0xczLld6OPEvg88PfJwK3POyzYyYTC1rNfM1aKuSjYc=; b=Dont7+5JAlCsJHnSif0bXpUykPU6+IDjnAdkde3Km+iduutlsxmBAsMJYhdYGCqjFpZOqy CF5laIZILMEeEeyLR76H8GaMsAdah/Nj+XmZWIMBxHbrlrBm8g2EBbmh3G2GcEw9yXDLIG MUWZq7fypTimkk+v95JxWLcexRiUQIVoxxud6t1kAGidoA95nHA/HXR3MiwmhKTUGwe2+5 TvLDLx3110sCUrdzfPUVEmHFUTGg8PWtr4cb3qeflitY4A/PhCvdyUVH/fULwsPRmJHtfB yroFUvgKtvouxWxn9LBXBrDwEHHFkJb12bS7DNpGOqIh4Ndk4oVEzqM4pRuqIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673713043; 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=0xczLld6OPEvg88PfJwK3POyzYyYTC1rNfM1aKuSjYc=; b=IFPQ5HBl0l81rlKKq96PDA/OxG7CyTvsPF4yfydX2IIEV41wJnHYKzK/HV3opPuIcIJYMK VwfDtJn7iYbVPWMY51jOvTaDo73xibphMc6a7+3CbCWoGvNJ3bwWlehFEsRbJqCVntTiIO ewnZXDXuoPePyK3+rQDE9JXPOG3JLp2yaNnNh2fRL8rF1sn4ixK41zJmZ0OP/7GAMLrbc1 d3l9zlFzUy8nD4hYjVIki3gISDDTzxc8KpkAuw4EhFNQ1lxoG8EI4OMR1cL3EPdrqRjNQD IVDZ/KaL0q/cidwJ8IBpJZ4e1YHW2G6O0jhi/56T7dMLg9pSk8AacGn0PgPL/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673713043; a=rsa-sha256; cv=none; b=ew0NJr3m0l3jLGISjo4usf+arIRStwbtiBS2/6Gbm/IV9d8JMMiPApSJ64lb+BDN4GFplq 8XNA2hoATz4XtHPHQlCHvMdrCMtJDdezbS6sSlww77U8Inc/7xZR4/XJmuF+1Hp4vlcO1z JVHWlLXbCtohaaa+ePsVVn6fmS7RA9uCbvM0vfvPp4K7Q0KHBiA+3SyWYDOtA9meTF+eL+ Gt9V2LAcPto7IJ7mSmmc+mE5OmaW0crebMWvO5e/VSKS20d4m2bGXfoxmgwBJqi8tRp4/z prrCmseUdQsK/ew23bn5Euv8rms5TjxhZG4gG8DRjgEzd+ylVdb48SqaI6FXFw== 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 4NvNjG6z9fztKT; Sat, 14 Jan 2023 16:17:22 +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 30EGHMog061262; Sat, 14 Jan 2023 16:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30EGHMGZ061261; Sat, 14 Jan 2023 16:17:22 GMT (envelope-from git) Date: Sat, 14 Jan 2023 16:17:22 GMT Message-Id: <202301141617.30EGHMGZ061261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 36e349bf592c - main - www/{chromium,ungoogled-chromium}: unbreak tests by using FC_CACHE_VERSION instead of hardcoding the version 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36e349bf592cf1c3a25d0f75bc83e90ae7779686 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=36e349bf592cf1c3a25d0f75bc83e90ae7779686 commit 36e349bf592cf1c3a25d0f75bc83e90ae7779686 Author: Robert Nagy AuthorDate: 2023-01-14 16:11:06 +0000 Commit: Rene Ladan CommitDate: 2023-01-14 16:17:15 +0000 www/{chromium,ungoogled-chromium}: unbreak tests by using FC_CACHE_VERSION instead of hardcoding the version --- ...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; + }