Hello community,
here is the log from the commit of package webkitgtk for openSUSE:Factory
checked in at 2017-05-18 20:44:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old)
and /work/SRC/openSUSE:Factory/.webkitgtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webkitgtk"
Thu May 18 20:44:26 2017 rev:44 rq:495120 version:2.4.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes 2016-08-16
13:01:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes 2017-05-18
20:44:32.571244839 +0200
@@ -1,0 +2,6 @@
+Fri May 12 08:46:17 UTC 2017 - dims...@opensuse.org
+
+- Add webkitgtk-icu59.patch: Fix build against icu 5.9. Patch
+ ported from Arch.
+
+-------------------------------------------------------------------
webkitgtk3.changes: same change
New:
----
webkitgtk-icu59.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webkitgtk.spec ++++++
--- /var/tmp/diff_new_pack.kBbZ9o/_old 2017-05-18 20:44:35.678806284 +0200
+++ /var/tmp/diff_new_pack.kBbZ9o/_new 2017-05-18 20:44:35.682805720 +0200
@@ -1,7 +1,7 @@
#
# spec file for package webkitgtk
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -69,6 +69,8 @@
Patch10: webkitgtk-ppc32.patch
# PATCH-FIX-UPSTREAM webkitgtk-abs_to_fabs.patch dims...@opensuse.org -- Use
fabs() instead of abs() on floating point values
Patch11: webkitgtk-abs_to_fabs.patch
+# PATCH-FIx-UPSTREAM webkitgtk-icu59.patch dims...@opensuse.org -- Fix build
against icu 5.9
+Patch12: webkitgtk-icu59.patch
BuildRequires: Mesa-devel
BuildRequires: bison
BuildRequires: chrpath
@@ -158,9 +160,9 @@
%if %{_withwk2}
%package -n libwebkit2gtk%{_wk2sover}
Summary: Library for rendering web content, GTK+ Port
-Group: System/Libraries
# this will install the non-webkit2 library too; at some point, we should move
# the Provides for %%{_pkgname_no_slpp} here
+Group: System/Libraries
Recommends: %{_pkgname_no_slpp}-lang = %{version}
# Recommend the injected bundles
Recommends: webkit2gtk-3_0-injected-bundles
@@ -327,6 +329,9 @@
%patch10 -p1
%endif
%patch11 -p1
+if pkg-config --atleast-version=59 icu-i18n; then
+%patch12 -p1
+fi
# FIXME: workaround needed in > 1.7.90 to fix build
mkdir -p DerivedSources/webkit
mkdir -p DerivedSources/WebCore
++++++ webkitgtk3.spec ++++++
--- /var/tmp/diff_new_pack.kBbZ9o/_old 2017-05-18 20:44:35.702802897 +0200
+++ /var/tmp/diff_new_pack.kBbZ9o/_new 2017-05-18 20:44:35.706802334 +0200
@@ -1,7 +1,7 @@
#
# spec file for package webkitgtk3
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -69,6 +69,8 @@
Patch10: webkitgtk-ppc32.patch
# PATCH-FIX-UPSTREAM webkitgtk-abs_to_fabs.patch dims...@opensuse.org -- Use
fabs() instead of abs() on floating point values
Patch11: webkitgtk-abs_to_fabs.patch
+# PATCH-FIx-UPSTREAM webkitgtk-icu59.patch dims...@opensuse.org -- Fix build
against icu 5.9
+Patch12: webkitgtk-icu59.patch
BuildRequires: Mesa-devel
BuildRequires: bison
BuildRequires: chrpath
@@ -158,9 +160,9 @@
%if %{_withwk2}
%package -n libwebkit2gtk%{_wk2sover}
Summary: Library for rendering web content, GTK+ Port
-Group: System/Libraries
# this will install the non-webkit2 library too; at some point, we should move
# the Provides for %%{_pkgname_no_slpp} here
+Group: System/Libraries
Recommends: %{_pkgname_no_slpp}-lang = %{version}
# Recommend the injected bundles
Recommends: webkit2gtk-3_0-injected-bundles
@@ -327,6 +329,9 @@
%patch10 -p1
%endif
%patch11 -p1
+if pkg-config --atleast-version=59 icu-i18n; then
+%patch12 -p1
+fi
# FIXME: workaround needed in > 1.7.90 to fix build
mkdir -p DerivedSources/webkit
mkdir -p DerivedSources/WebCore
++++++ webkitgtk-icu59.patch ++++++
Index: webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.h
===================================================================
--- webkitgtk-2.4.11.orig/Source/JavaScriptCore/API/JSStringRef.h
+++ webkitgtk-2.4.11/Source/JavaScriptCore/API/JSStringRef.h
@@ -32,6 +32,7 @@
#include <stdbool.h>
#endif
#include <stddef.h> /* for size_t */
+#include <uchar.h>
#ifdef __cplusplus
extern "C" {
@@ -43,7 +44,7 @@ extern "C" {
@typedef JSChar
@abstract A Unicode character.
*/
- typedef unsigned short JSChar;
+ typedef char16_t JSChar;
#else
typedef wchar_t JSChar;
#endif
Index: webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.h
===================================================================
--- webkitgtk-2.4.11.orig/Source/WebKit2/Shared/API/c/WKString.h
+++ webkitgtk-2.4.11/Source/WebKit2/Shared/API/c/WKString.h
@@ -28,6 +28,7 @@
#include <WebKit2/WKBase.h>
#include <stddef.h>
+#include <uchar.h>
#ifndef __cplusplus
#include <stdbool.h>
@@ -39,7 +40,7 @@ extern "C" {
#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
