summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-05 10:49:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-05 10:49:08 +0000
commite2edac0ed84ec187812ec48b16c9b46dd59afc8d (patch)
tree00858d178e01233e6e344c8e51f767759410d9aa /Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES
parentf16b5b43096696e1b07ea11a1b0acfca86a90e9d (diff)
libs/harfbuzz 0.9.8
git-svn-id: svn://tug.org/texlive/trunk@28449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog21
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/TL-Changes27
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-03-VOID57
3 files changed, 105 insertions, 0 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog
new file mode 100644
index 00000000000..111481cc2f4
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog
@@ -0,0 +1,21 @@
+2012-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported harfbuzz-0.9.8 source tree from:
+ http://cgit.freedesktop.org/harfbuzz/
+ * patch-01-Khaled (removed): Now distributed, with
+ hb_ot_layout_position_get_size() renamed into
+ hb_ot_layout_get_size_params().
+ * patch-02-oldmsvc (removed): Not needed.
+
+2012-12-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-02-oldmsvc (new): #error is not recognized by old msvcs.
+
+2012-11-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-Khaled (new): Partial update from git, from Khaled.
+
+2012-11-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported harfbuzz-0.9.7 source tree from:
+ http://cgit.freedesktop.org/harfbuzz/
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/TL-Changes
new file mode 100644
index 00000000000..aff826c111f
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/TL-Changes
@@ -0,0 +1,27 @@
+Changes applied to the harfbuzz-0.9.8/ tree as obtained from:
+ http://cgit.freedesktop.org/harfbuzz/
+
+Removed:
+ COPYING
+ INSTALL
+ compile
+ config.guess
+ config.sub
+ depcomp
+ install-sh
+ ltmain.sh
+ missing
+ Makefile.in
+ aclocal.m4
+ configure
+ src/Makefile.in
+
+Removed unused dirs:
+ contrib
+ m4
+ test
+ util
+ src/hb-icu-le
+ src/hb-old
+ src/hb-ucdn
+
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-03-VOID b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-03-VOID
new file mode 100644
index 00000000000..5472ee2dd69
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-03-VOID
@@ -0,0 +1,57 @@
+ Replace VOID by HB_VOID because winnt.h wants to '#define VOID void'
+
+diff -ur harfbuzz-0.9.8.orig/src/hb-ot-layout-gsubgpos-private.hh harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh
+--- harfbuzz-0.9.8.orig/src/hb-ot-layout-gsubgpos-private.hh 2012-12-04 21:43:38.000000000 +0100
++++ harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh 2012-12-05 11:03:08.000000000 +0100
+@@ -60,8 +60,8 @@
+ 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 HB_VOID; }
++ static return_t default_return_value (void) { return HB_VOID; }
+ bool stop_sublookup_iteration (const return_t r) const { return false; }
+ return_t recurse (unsigned int lookup_index)
+ {
+@@ -71,7 +71,7 @@
+ nesting_level_left--;
+ recurse_func (this, lookup_index);
+ nesting_level_left++;
+- return VOID;
++ return HB_VOID;
+ }
+
+ hb_face_t *face;
+@@ -148,8 +148,8 @@
+ 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 HB_VOID; }
++ static return_t default_return_value (void) { return HB_VOID; }
+ bool stop_sublookup_iteration (const return_t r) const { return false; }
+ return_t recurse (unsigned int lookup_index)
+ {
+@@ -161,7 +161,7 @@
+ 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 HB_VOID;
+ }
+
+ hb_face_t *face;
+diff -ur harfbuzz-0.9.8.orig/src/hb-private.hh harfbuzz-0.9.8/src/hb-private.hh
+--- harfbuzz-0.9.8.orig/src/hb-private.hh 2012-12-04 21:43:38.000000000 +0100
++++ harfbuzz-0.9.8/src/hb-private.hh 2012-12-05 11:03:12.000000000 +0100
+@@ -65,7 +65,7 @@
+ /* Void! */
+ struct _void_t;
+ typedef const _void_t &void_t;
+-#define VOID (* (const _void_t *) NULL)
++#define HB_VOID (* (const _void_t *) NULL)
+
+
+ /* Basics */