Merge pull request #17 from maandree/master

Update webkitgtk (didn't build)

4 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 520202061b6e..d56948d1282e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -36,8 +36,8 @@ pkgbase = webkitgtk
 	source = pkgconfig-enchant-2.patch
 	sha256sums = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
 	sha256sums = ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70
-	sha256sums = eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d
-	sha256sums = 81a4ad1c921bece16edb9a3cb187096fd8f336db8b89114356119a86f26e3d6d
+	sha256sums = a1118b3c9317806438c1e2f46f17e15556aae34665f739ca72b94b10b16ae422
+	sha256sums = 8db282f3b7f0e21ff51121c2579466c3194475a20d35c4fbd0e53f35b5639919
 	sha256sums = df8284004f25d189184aab1009df696c915212e0e439a555dbd0dbec06111e2e
 
 pkgname = webkitgtk
diff --git a/PKGBUILD b/PKGBUILD
index e53b735c3e63..8802d93aa2b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,8 +24,8 @@ source=(https://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
         pkgconfig-enchant-2.patch)
 sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
             'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70'
-            'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d'
-            '81a4ad1c921bece16edb9a3cb187096fd8f336db8b89114356119a86f26e3d6d'
+            'a1118b3c9317806438c1e2f46f17e15556aae34665f739ca72b94b10b16ae422'
+            '8db282f3b7f0e21ff51121c2579466c3194475a20d35c4fbd0e53f35b5639919'
             'df8284004f25d189184aab1009df696c915212e0e439a555dbd0dbec06111e2e')
 
 prepare() {
diff --git a/enchant-2.x.patch b/enchant-2.x.patch
index e65c5b88971f..9e31a896390b 100644
--- a/enchant-2.x.patch
+++ b/enchant-2.x.patch
@@ -1,11 +1,11 @@
---- webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp.orig	2017-12-06 14:59:40.768262788 -0500

-+++ webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp	2017-12-06 15:03:10.000000000 -0500

-@@ -128,7 +128,7 @@

-         for (i = 0; i < numberOfSuggestions; i++)

-             guesses.append(String::fromUTF8(suggestions[i]));

- 

--        enchant_dict_free_suggestions(*iter, suggestions);

-+        enchant_dict_free_string_list(*iter, suggestions);

-     }

- 

-     return guesses;
\ No newline at end of file
+--- webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp.orig	2017-12-06 14:59:40.768262788 -0500
++++ webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp	2017-12-06 15:03:10.000000000 -0500
+@@ -128,7 +128,7 @@
+         for (i = 0; i < numberOfSuggestions; i++)
+             guesses.append(String::fromUTF8(suggestions[i]));
+ 
+-        enchant_dict_free_suggestions(*iter, suggestions);
++        enchant_dict_free_string_list(*iter, suggestions);
+     }
+ 
+     return guesses;
diff --git a/icu59.patch b/icu59.patch
index 39ff89ee63d3..05cf5ebee221 100644
--- a/icu59.patch
+++ b/icu59.patch
@@ -8,10 +8,7 @@
  
  #ifdef __cplusplus
  extern "C" {
-@@ -46,7 +47,7 @@
-  character. As with all scalar types, endianness depends on the underlying
-  architecture.
- */
+@@ -46,4 +47,4 @@
 -    typedef unsigned short JSChar;
 +    typedef char16_t JSChar;
  #else
@@ -21,7 +18,7 @@
 +++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h	2017-04-22 14:35:56.853196170 +0200
 @@ -28,6 +28,7 @@
  
- #include <WebKit/WKBase.h>
+ #include <WebKit2/WKBase.h>
  #include <stddef.h>
 +#include <uchar.h>