[mingw-webkitgtk: 29/36] Build with ICU unicode backend

[Kalev Lember]

commit 8e59b72a36c479a2487428cc0950b4c5454bae41
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Feb 10 18:41:01 2012 +0200

    Build with ICU unicode backend
    
    ... as advised by upstream.

 ...dd-missing-pango-include-dir-to-fix-build.patch |   53 ++++++++++++++++++++
 mingw32-webkitgtk.spec                             |   15 +++++-
 webkitgtk-1.7.5-icu.patch                          |   11 ++++
 3 files changed, 77 insertions(+), 2 deletions(-)
---
diff --git a/0002-GTK-Add-missing-pango-include-dir-to-fix-build.patch b/0002-GTK-Add-missing-pango-include-dir-to-fix-build.patch
new file mode 100644
index 0000000..0882e9a
--- /dev/null
+++ b/0002-GTK-Add-missing-pango-include-dir-to-fix-build.patch
@@ -0,0 +1,53 @@
+From 0ce6c228fd5eace7c8a4b1238ef9218d0f5fdf9a Mon Sep 17 00:00:00 2001
+From: "commit-queue at webkit.org"
+ <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Mon, 6 Feb 2012 21:59:08 +0000
+Subject: [PATCH] [GTK] Add missing pango include dir to fix build
+ https://bugs.webkit.org/show_bug.cgi?id=77832
+
+Patch by Kalev Lember <kalevlember at gmail.com> on 2012-02-06
+Reviewed by Martin Robinson.
+
+Source/WebCore:
+
+* GNUmakefile.am: Added $(PANGO_CFLAGS) to libWebCore_la_CPPFLAGS.
+
+Tools:
+
+* GNUmakefile.am: Added $(PANGO_CFLAGS) to libWebCoreInternals_la_CPPFLAGS.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebCore/ChangeLog      |    9 +++++++++
+ Source/WebCore/GNUmakefile.am |    1 +
+ Tools/ChangeLog               |    9 +++++++++
+ Tools/GNUmakefile.am          |    1 +
+ 4 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
+index f7e73c5..fe5ccb9 100644
+--- a/Source/WebCore/GNUmakefile.am
++++ b/Source/WebCore/GNUmakefile.am
+@@ -835,6 +835,7 @@ libWebCore_la_CPPFLAGS = \
+ 	$(LIBSOUP_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(LIBXSLT_CFLAGS) \
++	$(PANGO_CFLAGS) \
+ 	$(SQLITE3_CFLAGS) \
+ 	$(UNICODE_CFLAGS) \
+ 	$(XRENDER_CFLAGS) \
+diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
+index a676abc..23d8112 100644
+--- a/Tools/GNUmakefile.am
++++ b/Tools/GNUmakefile.am
+@@ -65,6 +65,7 @@ libWebCoreInternals_la_CPPFLAGS = \
+ 	$(javascriptcore_cppflags) \
+ 	$(CAIRO_CFLAGS) \
+ 	$(LIBSOUP_CFLAGS) \
++	$(PANGO_CFLAGS) \
+ 	-I$(top_builddir)/DerivedSources \
+ 	-I$(top_builddir)/DerivedSources/WebCore
+ 
+-- 
+1.7.7.6
+
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index e239701..f29c623 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -45,7 +45,7 @@
 
 Name:		mingw32-webkitgtk
 Version:	1.7.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	MinGW Windows web content engine library
 
 Group:		Development/Libraries
@@ -71,6 +71,11 @@ Patch3:		webkitgtk-1.7.5-gmodule.patch
 # Upstream patch, fixes WebKitWebView not drawing initially on win32
 Patch4:		0001-GTK-WebKitWebView-does-a-lot-of-work-during-size_all.patch
 
+# Upstream patch, fixes missing pango includes with ICU backend enabled
+Patch5:		0002-GTK-Add-missing-pango-include-dir-to-fix-build.patch
+# Use correct ICU import library name, fixed upstream as well
+Patch6:		webkitgtk-1.7.5-icu.patch
+
 BuildArch:	noarch
 
 BuildRequires:	bison
@@ -90,6 +95,7 @@ BuildRequires:	mingw32-gcc
 BuildRequires:	mingw32-gcc-c++
 BuildRequires:	mingw32-binutils
 BuildRequires:	mingw32-gtk2
+BuildRequires:	mingw32-icu
 BuildRequires:	mingw32-libxml2
 BuildRequires:	mingw32-libsoup
 BuildRequires:	mingw32-libidn
@@ -131,6 +137,8 @@ Static version of the MinGW Windows WebKitGTK+ library.
 %patch2 -p0 -b .dumprendertree
 %patch3 -p1 -b .gmodule
 %patch4 -p1 -b .webview_map
+%patch5 -p1 -b .pango_includes
+%patch6 -p1 -b .icu
 
 autoreconf --verbose --install -I Source/autotools
 
@@ -143,7 +151,7 @@ autoreconf --verbose --install -I Source/autotools
 			--with-target=win32			\
 			--with-gtk=2.0				\
 			--with-font-backend=pango		\
-			--with-unicode-backend=glib		\
+			--with-unicode-backend=icu		\
 			--disable-video				\
 			--disable-fullscreen-api		\
 			--enable-static --enable-shared		\
@@ -216,6 +224,9 @@ fi
 
 
 %changelog
+* Wed Feb 08 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.5-2
+- Build with ICU unicode backend
+
 * Tue Feb 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.5-1
 - Update to 1.7.5
 - Drop upstreamed patches
diff --git a/webkitgtk-1.7.5-icu.patch b/webkitgtk-1.7.5-icu.patch
new file mode 100644
index 0000000..0eb0f76
--- /dev/null
+++ b/webkitgtk-1.7.5-icu.patch
@@ -0,0 +1,11 @@
+--- a/Source/autotools/webkit.m4
++++ b/Source/autotools/webkit.m4
+@@ -140,7 +140,7 @@ if test "$with_unicode_backend" = "icu"; then
+                 ;;
+             *-*-mingw*)
+ 		UNICODE_CFLAGS=""
+-		UNICODE_LIBS="-licuin -licuuc"
++		UNICODE_LIBS="-licui18n -licuuc"
+                 ;;
+             *)
+ 		AC_PATH_PROG(icu_config, icu-config, no)