From nobody Thu Jul 04 18:52:44 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 4WFQkj17hvz5PBQ4; Thu, 04 Jul 2024 18:52:45 +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 4WFQkj0GlVz47G8; Thu, 4 Jul 2024 18:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720119165; 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=81Qp2TwQKBHO449QH0nCjTJUySzcJhwSj7KgcfIPtF4=; b=L8lMlwAWHqakkEfOYDJCchG357nGOWVKNalF0SR9i879NqyAbsu0WXNZgeH2nejypTfQa+ F2XYQ7UDCOYckLju/tNpmJT8wXIURBMc+wNvcMtxGODu6DOZjQ6+Mq9D3HV+Uqe6jSDYuN sL7JjamfqdUe8pfhArs5J8mDsbMNU86RaVzn9YPwP+D4rIbegbGYbdl+EtkAMnI81GMzZu cT6WJ//4c54ZaNIAKBvEtybMjlFOzKa9Jevnc/ZAUbWFQK+eDMaiIgsMQ0YRcrzcpwk6IC 7h10eKlgexjBfvmzS6B83NwydoBnolwGTJOAKaTbuwPREjdWvTLjqiHbdu+30Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720119165; a=rsa-sha256; cv=none; b=MaBGmLqnL54j3iSGjd+9oyNp/wJakC6l+SpcIcPXgadj1+GsgDG3Ve0+sPQCA0/tPCYeLP GuT3vSgKRoTr9B11AFY2QMaVAjaKKz7zMYJ9+nrss0OrPIksEUTc5P0cA7QvlPMYKb1f29 af/6lRzQvLXMD8q+n26j5dhsmvh16S4MIwxaK5J32x/dH8Hcp0D+Ag9MmGIi/duskfR55l qTbjxkEXpu7TgbYgyliFI9VKXju0scOiqQO6oybF9Wba40y31kWeVIIKpX0hODvRbZhrmf zeL354P9MgTuUNFu+4AoJex3LGGa6x7KYifSD1r920HhtlFWs9bHsZ9YNpp5dg== 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=1720119165; 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=81Qp2TwQKBHO449QH0nCjTJUySzcJhwSj7KgcfIPtF4=; b=Zp8MBEzt9NrHGEko6BjRh/Cb6XWHXZJgSX7O8FjcOnAazoeTrl3oyyUPp+s/CHgH/k3Iad QJmXjmul1verDoNFTj41yBAiO5UcHdmtc/sBTRxaNqvAGv4okRLBXsk8rDnBAIdxpo5Inr FXcbgCXrcojdYQYcdpq4afzUZiGhGcxGfddFjkYaQKIJPXldIzN3ij9x04l7We0fxNgT0V r/fE2PM1o6vwPL1qQjGQjoOZ8UntsrO6a4k7e9VPf0Z88eRj4fgbqqmS+2ODx/uTXFV9kE bbGG9eyK479IlrXPKn9T6GdTbqwQ9hQzvndUplkwYnKGIhF7Tc/tBV4TOtN/qQ== 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 4WFQkh6xLyzQ80; Thu, 4 Jul 2024 18:52:44 +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 464IqieR038094; Thu, 4 Jul 2024 18:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464Iqi99038091; Thu, 4 Jul 2024 18:52:44 GMT (envelope-from git) Date: Thu, 4 Jul 2024 18:52:44 GMT Message-Id: <202407041852.464Iqi99038091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: b3cb5f53ad6f - 2024Q3 - 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/2024Q3 X-Git-Reftype: branch X-Git-Commit: b3cb5f53ad6fbd9445a8b6666c8a14a44c0b00b1 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3cb5f53ad6fbd9445a8b6666c8a14a44c0b00b1 commit b3cb5f53ad6fbd9445a8b6666c8a14a44c0b00b1 Author: Christoph Moench-Tegeder AuthorDate: 2024-07-04 18:48:51 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-07-04 18:52:18 +0000 www/firefox: fix botched patch this fixes build on non-amd64 PR: 280120 Reported by: eduardo@ (cherry picked from commit 3e71978b0790b191fe9324fdd31bd618054a8fde) --- 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