extra/webkit2gtk: fix

extra/webkit2gtk/PKGBUILD

@@ -3,7 +3,6 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - do not use LLINT assembly for v5/v6
-#  - patch from Fedora to fix ARM FTBFS
 
 highmem=1
 
@@ -21,18 +20,15 @@ optdepends=('gtk2: Netscape plugin support'
             'gst-plugins-base: free media decoding'
             'gst-plugins-good: media decoding'
             'gst-libav: nonfree media decoding')
-source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
-        webkit-jsc-use-ternary-operator.patch)
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc})
 sha256sums=('051794adb25c1d5f7cb24b84ef0f1b04d9030441a8a708282f53539752007a12'
-            'SKIP'
-            'f96413b556f66bd456e21e272d3cee18cb3e98a69953d76d7137a1c38b6b517d')
+            'SKIP')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
 
 prepare() {
   mkdir build
   cd webkitgtk-$pkgver
   sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
-  patch -p1 -i ../webkit-jsc-use-ternary-operator.patch
 }
 
 build() {

extra/webkit2gtk/webkit-jsc-use-ternary-operator.patch

@@ -1,25 +0,0 @@
-From 9154ea477728797b9d33b32fb36940485f6927fa Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Thu, 30 Aug 2018 07:04:58 +0200
-Subject: [PATCH] Use ternary operator instead of std::max
-
----
- Source/JavaScriptCore/heap/RegisterState.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h
-index baaef4c7..b3037dba 100644
---- a/Source/JavaScriptCore/heap/RegisterState.h
-+++ b/Source/JavaScriptCore/heap/RegisterState.h
-@@ -166,7 +166,7 @@ using RegisterState = jmp_buf;
- #pragma warning(disable: 4611)
- #endif
- #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
--    alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \
-+    alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \
-     setjmp(registers)
- 
- #if COMPILER(MSVC)
--- 
-2.17.1
-