From nobody Thu Jul 4 18:50:05 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 4WFQgd6zBdz5PBSv; Thu, 04 Jul 2024 18:50:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFQgd6Ffxz46Rs; Thu, 4 Jul 2024 18:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720119005; 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=0uuWGFN7gK2hh+pW3BCdQ/lT/766TMjvcjr2q/wsmbg=; b=bq0nVHw852j7wt86/2PDaI9UZfpZO2w3hf0wdQ+prSoWJ1d8XVtCUNaNM/nM1btxyat8+g v5aze5aGqt0qaNH3E9uBfluXRnVZMINxJozIkP8vovP10Ihrnp/SxdqhXQcm5Lk1qddcpZ 9MXnI5O2Nx4mIs0S7tsvUY1Bg3uajFm6r0co0/oKp3ohZqwt80m/MMf/5Av/ntzM1Xrx47 4bgImB7jnMyRBAt+Orf4No3BFdFkSAxm5tx/Y60ErVJEuPimKgZKPhBOfunt0B8A5pjQ+J j5Or/QDGv4BGpSFH2qnQeOVCV40+clI/n5z8LwEc5FCjiTAkfDKfFzJAERlFXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720119005; a=rsa-sha256; cv=none; b=MNlctixwmUDgnP1pVPcaQka+rY+OZs8D41COLYlVj6JqYEpIhj2RxcWjhTkGDzvgNG0Pqf mOmvfik9GeI/NQwfq+fJsPb1XuCbVlXVQBBApYI6Sb119nRGEI3Y31nURcivvjjkaO8S05 K1qd0QePM/UwBeeb6imqf0Y0gepYUsnFsVIGZ8ePVWdrmz1RpQRxgCYiZxS9IHHByRqV48 t/rSVas/VlaMHZz6ejn/dQXhMPjPhF3y5EZtVcK3fWTwdBEsqEuUuudGu1AimxiIBbtS6m RJHN0svA98NOIhdKDWHdidiq7Gbv/IYz00LaDyj0AQW8y7UXaTbW4HFR9QkxEQ== 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=1720119005; 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=0uuWGFN7gK2hh+pW3BCdQ/lT/766TMjvcjr2q/wsmbg=; b=MLtcASyWkAxetPoaEeV4J69xxpWSYQhy6KqjO5787gJ+QCqUZLKYLCUnM2W4mHXx8Se0xX yVfe9Zwzr9tT6eUV3HV08q1ryldnC+FAMZTAu8QblyiMN9VmNvtzPEjRPLq9iR/rOxOeRy 7oBB2inoW3FhfLaNX59WC5lwdexgd1maVPJvKFAiDBLyIg7vlNzihnZBAF2TUrQja+C58g f7qpUkicMi3CKXQPimC58859wRgct8Ic9jmaihniGwF84LOCzm0QjOVMVzqg73MoczvAmW bbw7gSccoXhzRca3nA8DBaFDDQDw34y9CwN5vMiW1cg2h9AJYX9h3TKrn1MeRw== 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 4WFQgd5sjTzQ02; Thu, 4 Jul 2024 18:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 464Io5po023958; Thu, 4 Jul 2024 18:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464Io5oL023954; Thu, 4 Jul 2024 18:50:05 GMT (envelope-from git) Date: Thu, 4 Jul 2024 18:50:05 GMT Message-Id: <202407041850.464Io5oL023954@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 3e71978b0790 - main - www/firefox: fix botched patch 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e71978b0790b191fe9324fdd31bd618054a8fde Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e71978b0790b191fe9324fdd31bd618054a8fde commit 3e71978b0790b191fe9324fdd31bd618054a8fde Author: Christoph Moench-Tegeder AuthorDate: 2024-07-04 18:48:51 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-07-04 18:48:51 +0000 www/firefox: fix botched patch this fixes build on non-amd64 PR: 280120 Reported by: eduardo@ --- www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp index e23f0eb4f904..fe73016d6618 100644 --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp @@ -5,7 +5,7 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get ^ diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.cpp -index cdac7db2be2c..4da2ee4bd4b4 100644 +index cdac7db2be2c..88391138880a 100644 --- gfx/skia/skia/src/core/SkCpu.cpp +++ gfx/skia/skia/src/core/SkCpu.cpp @@ -81,6 +81,22 @@ @@ -14,7 +14,7 @@ index cdac7db2be2c..4da2ee4bd4b4 100644 + return features; + } -+#elif ++#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) + #include + #ifndef ID_AA64ISAR0_CRC32_VAL + #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32