[packages/gtk-webkit3] - added icu59 patch (fix build with icu >= 59) - release 4 (rebuild with icu 59 and libwebp 0.6)
qboosh
qboosh at pld-linux.org
Sun Apr 23 21:24:06 CEST 2017
commit fd74ebf6d7b414b3cdf79d997d1cb3e5173e1295
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 23 21:24:14 2017 +0200
- added icu59 patch (fix build with icu >= 59)
- release 4 (rebuild with icu 59 and libwebp 0.6)
gtk-webkit3-icu59.patch | 38 ++++++++++++++++++++++++++++++++++++++
gtk-webkit3.spec | 6 ++++--
2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 7de581a..4fbd2b5 100644
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3
Name: gtk-webkit3
# note: for 2.6.x series see gtk-webkit4
Version: 2.4.11
-Release: 3
+Release: 4
License: BSD-like
Group: X11/Libraries
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
@@ -19,6 +19,7 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Patch0: atomic-ops.patch
Patch1: x32.patch
Patch2: abs.patch
+Patch3: %{name}-icu59.patch
URL: http://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -51,7 +52,7 @@ BuildRequires: harfbuzz-icu-devel >= 0.9.7
%ifarch i386 i486
BuildRequires: libatomic-devel
%endif
-BuildRequires: libicu-devel >= 4.2.1
+BuildRequires: libicu-devel >= 59
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libsecret-devel
@@ -142,6 +143,7 @@ Dokumentacja API WebKita.
%endif
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/gtk-webkit3-icu59.patch b/gtk-webkit3-icu59.patch
new file mode 100644
index 0000000..39ff89e
--- /dev/null
+++ b/gtk-webkit3-icu59.patch
@@ -0,0 +1,38 @@
+--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -46,7 +47,7 @@
+ character. As with all scalar types, endianness depends on the underlying
+ architecture.
+ */
+- typedef unsigned short JSChar;
++ typedef char16_t JSChar;
+ #else
+ typedef wchar_t JSChar;
+ #endif
+--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
++++ 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 <stddef.h>
++#include <uchar.h>
+
+ #ifndef __cplusplus
+ #include <stdbool.h>
+@@ -39,7 +40,7 @@
+
+ #if !defined(WIN32) && !defined(_WIN32) \
+ && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+- typedef unsigned short WKChar;
++ typedef char16_t WKChar;
+ #else
+ typedef wchar_t WKChar;
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit3.git/commitdiff/fd74ebf6d7b414b3cdf79d997d1cb3e5173e1295
More information about the pld-cvs-commit
mailing list