Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jul 2024 18:50:05 GMT
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3e71978b0790 - main - www/firefox: fix botched patch
Message-ID:  <202407041850.464Io5oL023954@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e71978b0790b191fe9324fdd31bd618054a8fde

commit 3e71978b0790b191fe9324fdd31bd618054a8fde
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: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 <machine/armreg.h>
 +    #ifndef ID_AA64ISAR0_CRC32_VAL
 +    #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407041850.464Io5oL023954>