[packages/gtk-webkit4] - added icu59 patch (fixes build with icu >= 59) - release 2 (rebuild with icu 59 and libwebp 0.6)
qboosh
qboosh at pld-linux.org
Sat Apr 22 20:09:24 CEST 2017
commit 9a072c002ee2eb4e0a6551b52cd11d27da1cdd25
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 22 20:09:39 2017 +0200
- added icu59 patch (fixes build with icu >= 59)
- release 2 (rebuild with icu 59 and libwebp 0.6)
gtk-webkit4-icu59.patch | 38 ++++++++++++++++++++++++++++++++++++++
gtk-webkit4.spec | 6 ++++--
2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index bfe4ea0..bc28276 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -19,12 +19,13 @@ Summary: Port of WebKit embeddable web component to GTK+ 3
Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3
Name: gtk-webkit4
Version: 2.16.1
-Release: 1
+Release: 2
License: BSD-like
Group: X11/Libraries
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
# Source0-md5: d3bcf995a667fd9febb9ab991acf0ca7
Patch0: x32.patch
+Patch1: %{name}-icu59.patch
URL: https://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -56,7 +57,7 @@ BuildRequires: gtk-doc >= 1.10
BuildRequires: harfbuzz-devel >= 0.9.7
BuildRequires: harfbuzz-icu-devel >= 0.9.7
BuildRequires: hyphen-devel
-BuildRequires: libicu-devel >= 4.2.1
+BuildRequires: libicu-devel >= 59
BuildRequires: libjpeg-devel
BuildRequires: libnotify-devel
BuildRequires: libpng-devel
@@ -149,6 +150,7 @@ Dokumentacja API WebKita.
%prep
%setup -q -n webkitgtk-%{version}
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/gtk-webkit4-icu59.patch b/gtk-webkit4-icu59.patch
new file mode 100644
index 0000000..39ff89e
--- /dev/null
+++ b/gtk-webkit4-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-webkit4.git/commitdiff/9a072c002ee2eb4e0a6551b52cd11d27da1cdd25
More information about the pld-cvs-commit
mailing list