[HarfBuzz] harfbuzz: Branch 'master' - 4 commits

[Behdad Esfahbod]

 NEWS                     |   12 ++++++++++++
 configure.ac             |    4 ++--
 git.mk                   |    2 +-
 test/shaping/Makefile.am |   19 ++++++++++++++-----
 util/view-cairo.hh       |    3 ++-
 5 files changed, 31 insertions(+), 9 deletions(-)

New commits:
commit 860fc9aa7b4c49a1d50e64cfdf4d4dffadb7aa8f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 4 20:06:59 2013 -0500

    0.9.25

diff --git a/NEWS b/NEWS
index df28c85..0a24772 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Overview of changes leading to 0.9.25
+Wednesday, December 4, 2013
+=====================================
+
+- Myanmar shaper improvements.
+- Avoid font fallback in CoreText backend.
+- Additional OpenType language tag mappiongs.
+- More aggressive shape-plan caching.
+- Build with / require automake 1.13.
+- Build with libtool 2.4.2.418 alpha to support ppc64le.
+
+
 Overview of changes leading to 0.9.24
 Tuesday, November 13, 2013
 =====================================
diff --git a/configure.ac b/configure.ac
index 93b3bca..42b8b5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [0.9.24],
+        [0.9.25],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
commit adb039554de0c98a4121f26423bec8df09a62e61
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 4 20:10:02 2013 -0500

    Minor

diff --git a/util/view-cairo.hh b/util/view-cairo.hh
index 7fe217c..9dea06e 100644
--- a/util/view-cairo.hh
+++ b/util/view-cairo.hh
@@ -36,7 +36,8 @@ struct view_cairo_t
   view_cairo_t (option_parser_t *parser)
 	       : output_options (parser, helper_cairo_supported_formats),
 		 view_options (parser),
-		 lines (0), scale (1.0), direction (HB_DIRECTION_INVALID) {}
+		 direction (HB_DIRECTION_INVALID),
+		 lines (0), scale (1.0) {}
   ~view_cairo_t (void) {
     if (debug)
       cairo_debug_reset_static_data ();
commit 95d18a7cab480712d8c95a587ac2a8fdcbec5e71
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 4 20:01:22 2013 -0500

    [git.mk] Update

diff --git a/git.mk b/git.mk
index b19bd33..18c07f6 100644
--- a/git.mk
+++ b/git.mk
@@ -273,7 +273,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
 			$(filter %_vala.stamp,$(DIST_COMMON)) \
 			$(filter %.vapi,$(DIST_COMMON)) \
-			$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
+			$(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \
 			Makefile \
 			Makefile.in \
 			"*.orig" \
commit d913f98d88098fc0f4163dfbc54d8ca9ebe9dd81
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 4 19:59:48 2013 -0500

    Require automake 1.13
    
    Fix tests build.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=71353

diff --git a/configure.ac b/configure.ac
index 7b804b2..93b3bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/harfbuzz.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.11.1 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
+AM_INIT_AUTOMAKE([1.13 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
 AM_SILENT_RULES([yes])
 
 # Initialize libtool
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 42c37c3..3d3943a 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -35,13 +35,22 @@ CLEANFILES += \
 	$(NULL)
 
 TESTS = tests/context-matching.tests
-TESTS_ENVIRONMENT = \
-	EXEEXT="$(EXEEXT)" \
-	srcdir="$(srcdir)" \
-	builddir="$(builddir)" \
-	$(srcdir)/run-tests.sh \
+
+TEST_EXTENSIONS = \
+	.tests \
+	$(NULL)
+
+AM_TESTS_ENVIRONMENT = \
+	EXEEXT="$(EXEEXT)"; \
+	export EXEECT; \
+	srcdir="$(srcdir)"; \
+	export srcdir; \
+	builddir="$(builddir)"; \
+	export builddir; \
 	$(NULL)
 
+TESTS_LOG_COMPILER = sh $(srcdir)/run-tests.sh
+
 .PHONY: manifests
 
 -include $(top_srcdir)/git.mk