summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-06-24 14:38:09 +0000
committernia <nia@pkgsrc.org>2021-06-24 14:38:09 +0000
commit1eed24c6a1f7ab22c2356df55a74691bae5c5b74 (patch)
tree9b1a8c4413f8ee6e08d58898556882d09e0cb6af /x11
parent7a624c7321c6a1b4d30775b78b1a7d2a100e5d4e (diff)
downloadpkgsrc-1eed24c6a1f7ab22c2356df55a74691bae5c5b74.tar.gz
qt5-qtwebkit: recognize netbsd/arm
Diffstat (limited to 'x11')
-rw-r--r--x11/qt5-qtwebkit/distinfo4
-rw-r--r--x11/qt5-qtwebkit/patches/patch-CMakeLists.txt13
2 files changed, 13 insertions, 4 deletions
diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo
index 0d2e0c018b6..6a41935b19c 100644
--- a/x11/qt5-qtwebkit/distinfo
+++ b/x11/qt5-qtwebkit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2021/06/23 08:33:03 nia Exp $
+$NetBSD: distinfo,v 1.20 2021/06/24 14:38:09 nia 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 --git a/x11/qt5-qtwebkit/patches/patch-CMakeLists.txt b/x11/qt5-qtwebkit/patches/patch-CMakeLists.txt
index 9b7b471188f..3b93fd9a77c 100644
--- a/x11/qt5-qtwebkit/patches/patch-CMakeLists.txt
+++ b/x11/qt5-qtwebkit/patches/patch-CMakeLists.txt
@@ -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.2 2021/06/24 14:38:09 nia 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)")