harfbuzz 1.4.3

git-svn-id: svn://tug.org/texlive/trunk@43343 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 2 insertions, 26 deletions

diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index 6cbd6a44c82..a2ad0914253 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -40,7 +40,6 @@ libharfbuzz_a_SOURCES =  \
 	@HARFBUZZ_TREE@/src/hb-common.cc \
 	@HARFBUZZ_TREE@/src/hb-face-private.hh \
 	@HARFBUZZ_TREE@/src/hb-face.cc \
-	@HARFBUZZ_TREE@/src/hb-fallback-shape.cc \
 	@HARFBUZZ_TREE@/src/hb-font-private.hh \
 	@HARFBUZZ_TREE@/src/hb-font.cc \
 	@HARFBUZZ_TREE@/src/hb-mutex-private.hh \
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index fff7ec5f910..129d4e7f002 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -123,7 +123,6 @@ am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-buffer.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-common.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-face.$(OBJEXT) \
-	@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-font.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-ot-tag.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-set.$(OBJEXT) \
@@ -654,7 +653,6 @@ libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-atomic-private.hh \
 	@HARFBUZZ_TREE@/src/hb-common.cc \
 	@HARFBUZZ_TREE@/src/hb-face-private.hh \
 	@HARFBUZZ_TREE@/src/hb-face.cc \
-	@HARFBUZZ_TREE@/src/hb-fallback-shape.cc \
 	@HARFBUZZ_TREE@/src/hb-font-private.hh \
 	@HARFBUZZ_TREE@/src/hb-font.cc \
 	@HARFBUZZ_TREE@/src/hb-mutex-private.hh \
@@ -828,9 +826,6 @@ clean-noinstLIBRARIES:
 @HARFBUZZ_TREE@/src/hb-face.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-fallback-shape.$(OBJEXT):  \
-	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
-	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
 @HARFBUZZ_TREE@/src/hb-font.$(OBJEXT):  \
 	@HARFBUZZ_TREE@/src/$(am__dirstamp) \
 	@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
@@ -945,7 +940,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-face.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-icu.Po@am__quote@
diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog
index 47bd4a9a055..fd5b26cd274 100644
--- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog
+++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog
@@ -2,7 +2,6 @@
 
 	Imported harfbuzz-1.4.3 source tree from:
 	  http://www.freedesktop.org/software/harfbuzz/release/
-	  Add patch-01-HAVE_FALLBACK.
 
 2017-01-25  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
diff --git a/Build/source/libs/harfbuzz/TLpatches/patch-01-HAVE_FALLBACK b/Build/source/libs/harfbuzz/TLpatches/patch-01-HAVE_FALLBACK
deleted file mode 100644
index bb8ab1f5a19..00000000000
--- a/Build/source/libs/harfbuzz/TLpatches/patch-01-HAVE_FALLBACK
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur harfbuzz-1.4.3.orig/src/hb-fallback-shape.cc harfbuzz-1.4.3/src/hb-fallback-shape.cc
---- harfbuzz-1.4.3.orig/src/hb-fallback-shape.cc	Sat Feb 04 09:37:28 2017
-+++ harfbuzz-1.4.3/src/hb-fallback-shape.cc	Sun Feb 26 08:53:22 2017
-@@ -27,10 +27,10 @@
- #define HB_SHAPER fallback
- #include "hb-shaper-impl-private.hh"
- 
--
-+#if HAVE_FALLBACK
- HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face)
- HB_SHAPER_DATA_ENSURE_DEFINE(fallback, font)
--
-+#endif
- 
- /*
-  * shaper face data
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc
index 556dfcb1ff1..4b60c6c3491 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-fallback-shape.cc
@@ -27,10 +27,10 @@
 #define HB_SHAPER fallback
 #include "hb-shaper-impl-private.hh"
 
-#if HAVE_FALLBACK
+
 HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face)
 HB_SHAPER_DATA_ENSURE_DEFINE(fallback, font)
-#endif
+
 
 /*
  * shaper face data