git: b3cb5f53ad6f - 2024Q3 - www/firefox: fix botched patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Jul 2024 18:52:44 UTC
The branch 2024Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3cb5f53ad6fbd9445a8b6666c8a14a44c0b00b1 commit b3cb5f53ad6fbd9445a8b6666c8a14a44c0b00b1 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2024-07-04 18:48:51 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> 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 <machine/armreg.h> + #ifndef ID_AA64ISAR0_CRC32_VAL + #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32