extra/webkit2gtk to 2.22.2-1

extra/webkit2gtk/PKGBUILD

@@ -3,12 +3,11 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - do not use LLINT assembly for v5/v6
-#  - patch from Fedora to fix ARM FTBFS
 
 highmem=1
 
 pkgname=webkit2gtk
-pkgver=2.22.1
+pkgver=2.22.2
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(x86_64)
@@ -21,18 +20,16 @@ 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}
-        armv7-build-fix.patch)
-sha256sums=('051794adb25c1d5f7cb24b84ef0f1b04d9030441a8a708282f53539752007a12'
-            'SKIP'
-            'd8a3c330f3ac3a28d7947d557a2bfbb1f723644a991bb4dc817b3e8009251146')
-validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc})
+sha256sums=('345487d4d1896e711683f951d1e09387d3b90d7cf59295c0e634af7f515e99ba'
+            'SKIP')
+validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'
+              '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B')
 
 prepare() {
   mkdir build
   cd webkitgtk-$pkgver
   sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
-  patch -p1 -i ../armv7-build-fix.patch
 }
 
 build() {

extra/webkit2gtk/armv7-build-fix.patch

@@ -1,18 +0,0 @@
-diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
-index 266a818f570..fa4df51734a 100644
---- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
-+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
-@@ -981,6 +981,13 @@ public:
-         return PatchableJump(m_assembler.jmp(ARMAssembler::AL, 1));
-     }
- 
-+    PatchableJump patchableBranch8(RelationalCondition cond, Address address, TrustedImm32 imm)
-+    {
-+        TrustedImm32 imm8 = MacroAssemblerHelpers::mask8OnCondition(*this, cond, imm);
-+        MacroAssemblerHelpers::load8OnCondition(*this, cond, address, dataTempRegister);
-+        return patchableBranch32(cond, dataTempRegister, imm8);
-+    }
-+
-     PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
-     {
-         internalCompare32(reg, imm);