[packages/crossmingw32-harfbuzz] - updated to 0.9.9 - removed obsolete void patch

[qboosh]

commit 6b3eee43fe92b13a995c586619cc892966306629
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 8 22:08:57 2012 +0100

    - updated to 0.9.9
    - removed obsolete void patch

 crossmingw32-harfbuzz.spec | 10 ++++-----
 harfbuzz-void.patch        | 53 ----------------------------------------------
 2 files changed, 5 insertions(+), 58 deletions(-)
---
diff --git a/crossmingw32-harfbuzz.spec b/crossmingw32-harfbuzz.spec
index a1749d8..273251e 100644
--- a/crossmingw32-harfbuzz.spec
+++ b/crossmingw32-harfbuzz.spec
@@ -1,13 +1,12 @@
 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.8
+Version:	0.9.9
 Release:	1
 License:	MIT
 Group:		Development/Libraries
 Source0:	http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-# Source0-md5:	13b569f0acedbdb6ffe1fb8fbb4914cc
-Patch0:		harfbuzz-void.patch
+# Source0-md5:	e901ffe556d706b7d43b272f83be7f09
 URL:		http://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires:	crossmingw32-cairo >= 1.8.0
 BuildRequires:	crossmingw32-freetype >= 2.3.8
@@ -85,7 +84,6 @@ Biblioteka DLL harfbuzz dla Windows.
 
 %prep
 %setup -q -n harfbuzz-%{version}
-%patch0 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_pkgconfigdir}
@@ -101,7 +99,9 @@ export PKG_CONFIG_LIBDIR=%{_pkgconfigdir}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+# parallel install broken (hb-version.h both in pkginclude_HEADERS and
+# nodist_pkginclude_HEADERS)
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
diff --git a/harfbuzz-void.patch b/harfbuzz-void.patch
deleted file mode 100644
index 97ae054..0000000
--- a/harfbuzz-void.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- harfbuzz-0.9.8/src/hb-private.hh.orig	2012-11-23 23:33:08.000000000 +0100
-+++ harfbuzz-0.9.8/src/hb-private.hh	2012-12-06 18:21:40.215335229 +0100
-@@ -65,7 +65,7 @@
- /* Void! */
- struct _void_t;
- typedef const _void_t &void_t;
--#define VOID (* (const _void_t *) NULL)
-+#define HBVOID (* (const _void_t *) NULL)
- 
- 
- /* Basics */
---- harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh.orig	2012-11-30 07:38:20.000000000 +0100
-+++ harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh	2012-12-06 18:22:07.522001326 +0100
-@@ -60,8 +60,8 @@ struct hb_closure_context_t
-   typedef void_t return_t;
-   typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index);
-   template <typename T>
--  inline return_t process (const T &obj) { obj.closure (this); return VOID; }
--  static return_t default_return_value (void) { return VOID; }
-+  inline return_t process (const T &obj) { obj.closure (this); return HBVOID; }
-+  static return_t default_return_value (void) { return HBVOID; }
-   bool stop_sublookup_iteration (const return_t r) const { return false; }
-   return_t recurse (unsigned int lookup_index)
-   {
-@@ -71,7 +71,7 @@ struct hb_closure_context_t
-     nesting_level_left--;
-     recurse_func (this, lookup_index);
-     nesting_level_left++;
--    return VOID;
-+    return HBVOID;
-   }
- 
-   hb_face_t *face;
-@@ -148,8 +148,8 @@ struct hb_collect_glyphs_context_t
-   typedef void_t return_t;
-   typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index);
-   template <typename T>
--  inline return_t process (const T &obj) { obj.collect_glyphs (this); return VOID; }
--  static return_t default_return_value (void) { return VOID; }
-+  inline return_t process (const T &obj) { obj.collect_glyphs (this); return HBVOID; }
-+  static return_t default_return_value (void) { return HBVOID; }
-   bool stop_sublookup_iteration (const return_t r) const { return false; }
-   return_t recurse (unsigned int lookup_index)
-   {
-@@ -161,7 +161,7 @@ struct hb_collect_glyphs_context_t
-     hb_collect_glyphs_context_t new_c (this->face, NULL, NULL, NULL, &output, nesting_level_left);
-     recurse_func (&new_c, lookup_index);
-     nesting_level_left++;
--    return VOID;
-+    return HBVOID;
-   }
- 
-   hb_face_t *face;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-harfbuzz.git/commitdiff/6b3eee43fe92b13a995c586619cc892966306629