From 15a364e670ae224a258850e9dba9f2273c62fe86 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 6 Jun 2013 09:19:13 +0200
Subject: [PATCH] - updated to 0.9.18 - added noicu patch to fix build without
 ICU library

---
 crossmingw32-harfbuzz.spec | 27 ++++++++++++++++++++-------
 harfbuzz-noicu.patch       | 17 +++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 harfbuzz-noicu.patch

diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index 2cc9f1d..65416ad 100644
--- a/crossmingw32-harfbuzz.spec
+++ b/crossmingw32-harfbuzz.spec
@@ -1,18 +1,22 @@
 Summary:	HarfBuzz - internationalized text shaping library - MinGW32 cross version
 Summary(pl.UTF-8):	Rasteryzer fontów TrueType - wersja skrośna dla MinGW32
 Name:		crossmingw32-harfbuzz
-Version:	0.9.17
+Version:	0.9.18
 Release:	1
 License:	MIT
 Group:		Development/Libraries
 Source0:	http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5:	c48827713e93539dc7285f9e86ffbdc5
+# Source0-md5:	0bff05fafef4894031b2b64a65ac1899
 Patch0:		harfbuzz-mingw32.patch
+Patch1:		harfbuzz-noicu.patch
 URL:		http://www.freedesktop.org/wiki/HarfBuzz
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.11.1
 BuildRequires:	crossmingw32-cairo >= 1.8.0
 BuildRequires:	crossmingw32-freetype >= 2.3.8
 BuildRequires:	crossmingw32-glib2 >= 2.16
 BuildRequires:	crossmingw32-gcc-c++
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig >= 1:0.20
 Requires:	crossmingw32-cairo >= 1.8.0
 Requires:	crossmingw32-freetype >= 2.3.8
@@ -88,25 +92,34 @@ Biblioteka DLL harfbuzz dla Windows.
 %prep
 %setup -q -n harfbuzz-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 export PKG_CONFIG_LIBDIR=%{_pkgconfigdir}
 %configure \
-	ICU_CONFIG=/none \
 	--target=%{target} \
 	--build=i686-pc-linux-gnu \
 	--host=%{target} \
 	--disable-silent-rules \
-	--enable-static
+	--enable-static \
+	--with-cairo \
+	--with-freetype \
+	--with-glib \
+	--without-graphite2 \
+	--without-icu \
+	--with-uniscribe
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# parallel install broken (hb-version.h both in pkginclude_HEADERS and
-# nodist_pkginclude_HEADERS)
-%{__make} -j1 install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
diff --git a/harfbuzz-noicu.patch b/harfbuzz-noicu.patch
new file mode 100644
index 0000000..602ea62
--- /dev/null
+++ b/harfbuzz-noicu.patch
@@ -0,0 +1,17 @@
+--- harfbuzz-0.9.18/test/api/Makefile.am.orig	2013-05-28 21:26:21.000000000 +0200
++++ harfbuzz-0.9.18/test/api/Makefile.am	2013-06-06 09:11:36.923683118 +0200
+@@ -28,12 +28,13 @@
+ 	$(NULL)
+ 
+ test_unicode_CPPFLAGS = $(AM_CPPFLAGS)
++test_unicode_LDADD = $(LDADD)
+ if HAVE_GLIB
+ test_unicode_CPPFLAGS += $(GLIB_CFLAGS)
+ endif
+ if HAVE_ICU
+ test_unicode_CPPFLAGS += $(ICU_CFLAGS)
+-test_unicode_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-icu.la
++test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la
+ endif
+ 
+ 
-- 
2.44.0