summaryrefslogtreecommitdiff
path: root/nonprism/webkit2gtk
diff options
context:
space:
mode:
authorJesús Eduardo <heckyel@openmailbox.org>2017-05-24 14:19:04 -0500
committerJesús Eduardo <heckyel@openmailbox.org>2017-05-24 14:19:04 -0500
commitcf644deca7bb4b5afbcd71d4d7696aa2e2a0bd8c (patch)
treecfa2ec52155502ab7cc6c3c061845b6319b2862c /nonprism/webkit2gtk
parentdc841e0294f664b7c90d7ffed5ce9779e91a3d7c (diff)
downloadabslibre-cf644deca7bb4b5afbcd71d4d7696aa2e2a0bd8c.tar.gz
abslibre-cf644deca7bb4b5afbcd71d4d7696aa2e2a0bd8c.tar.bz2
abslibre-cf644deca7bb4b5afbcd71d4d7696aa2e2a0bd8c.zip
webkit2gtk: update in [nonprism]
Diffstat (limited to 'nonprism/webkit2gtk')
-rw-r--r--nonprism/webkit2gtk/PKGBUILD10
-rw-r--r--nonprism/webkit2gtk/icu59.patch16
2 files changed, 16 insertions, 10 deletions
diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD
index 8c2a5de9c..318504f1d 100644
--- a/nonprism/webkit2gtk/PKGBUILD
+++ b/nonprism/webkit2gtk/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Luke R. <g4jc@openmailbox.org>
pkgname=webkit2gtk
-pkgver=2.17.2
+pkgver=2.17.3
pkgrel=2.nonprism1
pkgdesc="GTK+ Web content engine library, without geoclue2 support"
arch=(i686 x86_64)
@@ -18,10 +18,11 @@ optdepends=('gtk2: Netscape plugin support'
'gst-plugins-good: media decoding'
'gst-libav: nonfree media decoding')
options=(!emptydirs)
-source=("https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz" #{,.sig}
+source=("https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz"{,.asc}
'icu59.patch')
-sha256sums=('7ad9d11fe247100f476fc70bc9e425306cf56aa97b399dce52964493a9c666e0'
- 'SKIP')
+sha256sums=('79f168c30953dbd273f984d3cc85482169e6822fcf7cf0031c86cf8aa1816b35'
+ 'SKIP'
+ '249de46d5b665e57f0ba245197bda7da6383bdfb597020aba3cdedbe36eadd21')
validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
prepare() {
@@ -31,6 +32,7 @@ prepare() {
sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
rm -r Source/ThirdParty/gtest/
#rm -r Source/ThirdParty/qunit/
+ #patch -Np1 -i ../isnan.patch Unnecessary already fixed.
patch -Np1 -i ../icu59.patch
}
diff --git a/nonprism/webkit2gtk/icu59.patch b/nonprism/webkit2gtk/icu59.patch
index 1f4de2cbf..0b7a2354f 100644
--- a/nonprism/webkit2gtk/icu59.patch
+++ b/nonprism/webkit2gtk/icu59.patch
@@ -1,5 +1,7 @@
---- webkitgtk-2.17.2/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-01-18 02:06:54.000000000 -0500
-+++ webkitgtk-2.17.2/Source/JavaScriptCore/API/JSStringRef.h 2017-05-14 15:44:49.756359140 -0500
+diff --git a/Source/JavaScriptCore/API/JSStringRef.h b/Source/JavaScriptCore/API/JSStringRef.h
+index bc03ed7..3e51af8 100644
+--- a/Source/JavaScriptCore/API/JSStringRef.h
++++ b/Source/JavaScriptCore/API/JSStringRef.h
@@ -32,6 +32,7 @@
#include <stdbool.h>
#endif
@@ -8,7 +10,7 @@
#ifdef __cplusplus
extern "C" {
-@@ -46,7 +47,7 @@
+@@ -46,7 +47,7 @@ extern "C" {
character. As with all scalar types, endianness depends on the underlying
architecture.
*/
@@ -17,8 +19,10 @@
#else
typedef wchar_t JSChar;
#endif
---- webkitgtk-2.17.2/Source/WebKit2/Shared/API/c/WKString.h.orig 2016-09-16 04:56:48.000000000 -0500
-+++ webkitgtk-2.17.2/Source/WebKit2/Shared/API/c/WKString.h 2017-05-14 15:47:03.846355158 -0500
+diff --git a/Source/WebKit2/Shared/API/c/WKString.h b/Source/WebKit2/Shared/API/c/WKString.h
+index 4c6a204..a8f5647 100644
+--- a/Source/WebKit2/Shared/API/c/WKString.h
++++ b/Source/WebKit2/Shared/API/c/WKString.h
@@ -28,6 +28,7 @@
#include <WebKit/WKBase.h>
@@ -27,7 +31,7 @@
#ifndef __cplusplus
#include <stdbool.h>
-@@ -39,7 +40,7 @@
+@@ -39,7 +40,7 @@ extern "C" {
#if !defined(WIN32) && !defined(_WIN32) \
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */