[pkgsrc/pkgsrc-2021Q2]: pkgsrc/x11/qt5-qtwebkit Pullup ticket #6475 - request...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67e76a7dad6a
branches:  pkgsrc-2021Q2
changeset: 455435:67e76a7dad6a
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Jul 04 18:57:57 2021 +0000

description:
Pullup ticket #6475 - requested by nia
x11/qt5-qtwebkit: arm build fix

Revisions pulled up:
- x11/qt5-qtwebkit/distinfo                                     1.20
- x11/qt5-qtwebkit/patches/patch-CMakeLists.txt                 1.2

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Thu Jun 24 14:38:09 UTC 2021

   Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
        pkgsrc/x11/qt5-qtwebkit/patches: patch-CMakeLists.txt

   Log Message:
   qt5-qtwebkit: recognize netbsd/arm

diffstat:

 x11/qt5-qtwebkit/distinfo                     |   4 ++--
 x11/qt5-qtwebkit/patches/patch-CMakeLists.txt |  13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r de94e8d31e70 -r 67e76a7dad6a x11/qt5-qtwebkit/distinfo
--- a/x11/qt5-qtwebkit/distinfo Tue Jun 29 12:44:06 2021 +0000
+++ b/x11/qt5-qtwebkit/distinfo Sun Jul 04 18:57:57 2021 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2021/06/23 08:33:03 nia Exp $
+$NetBSD: distinfo,v 1.19.2.1 2021/07/04 18:57:57 bsiegert Exp $
 
 SHA1 (qtwebkit-5.212.0-alpha4.tar.xz) = a2e2840cd751013f6e9fd0d15601d1ea4beb81d5
 RMD160 (qtwebkit-5.212.0-alpha4.tar.xz) = af000947daa429945d80e3c23e5cfd0eb13793be
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
 Size (qtwebkit-5.212.0-alpha4.tar.xz) = 12528508 bytes
-SHA1 (patch-CMakeLists.txt) = 270ad649dcbebe582aeea74cfd0a40e5e73e8330
+SHA1 (patch-CMakeLists.txt) = 6b0d295ed4ec40c6364b0a86c94d19966977f7d7
 SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 8b502d6960e5b52000dd6e67f65c2fbaf6e9d1f2
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
diff -r de94e8d31e70 -r 67e76a7dad6a x11/qt5-qtwebkit/patches/patch-CMakeLists.txt
--- a/x11/qt5-qtwebkit/patches/patch-CMakeLists.txt     Tue Jun 29 12:44:06 2021 +0000
+++ b/x11/qt5-qtwebkit/patches/patch-CMakeLists.txt     Sun Jul 04 18:57:57 2021 +0000
@@ -1,12 +1,21 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/06/23 08:33:03 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.1.2.1 2021/07/04 18:57:57 bsiegert Exp $
 
 Recognize "powerpc" as a valid variant of "ppc" so configure
-works on NetBSD/macppc.
+works on NetBSD/macppc, and "earm*" so it works on NetBSD/arm.
 
 Maybe this should be normalized in CMake...
 
 --- CMakeLists.txt.orig        2020-03-04 17:16:37.000000000 +0000
 +++ CMakeLists.txt
+@@ -57,7 +57,7 @@ if (MSVC_CXX_ARCHITECTURE_ID)
+ else ()
+     string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+ endif ()
+-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|earm)")
+     set(WTF_CPU_ARM 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+     set(WTF_CPU_ARM64 1)
 @@ -71,11 +71,11 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
      set(WTF_CPU_X86_64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")