[webkitgtk3] Fix the build with new icu 50

Kalev Lember kalev at fedoraproject.org
Sun Jan 27 17:02:15 UTC 2013


commit 2f8221cc722471698e2372a9344c1f2fee1f6eb2
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Jan 27 18:01:25 2013 +0100

    Fix the build with new icu 50

 webkitgtk-1.11.4-icu-cppflags.patch |   26 ++++++++++++++++++++++++++
 webkitgtk3.spec                     |    7 +++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/webkitgtk-1.11.4-icu-cppflags.patch b/webkitgtk-1.11.4-icu-cppflags.patch
new file mode 100644
index 0000000..83c6295
--- /dev/null
+++ b/webkitgtk-1.11.4-icu-cppflags.patch
@@ -0,0 +1,26 @@
+From 00593fa55c16deb22304bbe7316911570e7c33b9 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Sun, 27 Jan 2013 16:15:01 +0100
+Subject: [PATCH] [GTK] Pass ICU cppflags to libWebCoreSVG.la build
+
+---
+ Source/WebCore/GNUmakefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
+index 95a23ed..d3463ca 100644
+--- a/Source/WebCore/GNUmakefile.am
++++ b/Source/WebCore/GNUmakefile.am
+@@ -253,7 +253,8 @@ libWebCoreSVG_la_CPPFLAGS = \
+ 	-fno-strict-aliasing \
+ 	$(CAIRO_CFLAGS) \
+ 	$(FREETYPE_CFLAGS) \
+-	$(LIBSOUP_CFLAGS)
++	$(LIBSOUP_CFLAGS) \
++	$(UNICODE_CFLAGS)
+ 
+ feature_defines_overrides += ENABLE_SVG=1
+ WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in
+-- 
+1.8.1
+
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 6fb7841..f250b83 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -27,6 +27,8 @@ Patch5:         webkit-1.11.2-includes.patch
 Patch6:         webkit-1.11.2-Double2Ints.patch
 # https://bugs.webkit.org/show_bug.cgi?id=107261
 Patch7:         webkitgtk-1.11.4-AccessibilityTableCell-crash.patch
+# https://bugs.webkit.org/show_bug.cgi?id=108032
+Patch8:         webkitgtk-1.11.4-icu-cppflags.patch
 
 BuildRequires:  bison
 BuildRequires:  cairo-devel
@@ -94,6 +96,11 @@ This package contains developer documentation for %{name}.
 %patch5 -p1 -b .includes
 %patch6 -p1 -b .double2ints
 %patch7 -p1 -b .AccessibilityTableCell
+%patch8 -p1 -b .icu_cppflags
+
+# For patch8
+autoreconf --verbose --install -I Source/autotools
+
 
 %build
 %ifarch s390 %{arm} ppc


More information about the scm-commits mailing list