[HarfBuzz] harfbuzz: Branch 'master' - 2 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Tue Jun 12 23:34:00 UTC 2018
RELEASING.md | 3 ++-
configure.ac | 1 -
docs/harfbuzz-sections.txt | 24 +++++++++++++++++++++++-
src/Makefile.am | 21 ++++++++++++++++-----
src/hb-version.h | 6 +++---
5 files changed, 44 insertions(+), 11 deletions(-)
New commits:
commit f3e58ab8a957cdf36bddef793c473664744885a7
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Tue Jun 12 19:32:04 2018 -0400
[docs] Enlist misc new symbols
diff --git a/RELEASING.md b/RELEASING.md
index b15e2980..0aef610b 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -7,7 +7,8 @@ HarfBuzz release walk-through checklist:
Document them in NEWS. All API and API semantic changes should be clearly
marked as API additions, API changes, or API deletions. Document
- deprecations.
+ deprecations. Ensure all new API / deprecations are in listed correctly in
+ docs/harfbuzz-sections.txt
If there's a backward-incompatible API change (including deletions for API
used anywhere), that's a release blocker. Do NOT release.
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index c837e6b0..5715d771 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -401,6 +401,26 @@ hb_icu_script_to_script
</SECTION>
<SECTION>
+<FILE>hb-map</FILE>
+HB_MAP_VALUE_INVALID
+hb_map_allocation_successful
+hb_map_clear
+hb_map_create
+hb_map_del
+hb_map_destroy
+hb_map_get
+hb_map_get_empty
+hb_map_get_population
+hb_map_get_user_data
+hb_map_has
+hb_map_is_empty
+hb_map_reference
+hb_map_set
+hb_map_set_user_data
+hb_map_t
+</SECTION>
+
+<SECTION>
<FILE>hb-ot</FILE>
<SUBSECTION Private>
HB_OT_H_IN
@@ -445,6 +465,7 @@ hb_ot_layout_language_get_feature_tags
hb_ot_layout_language_get_required_feature
hb_ot_layout_lookup_collect_glyphs
hb_ot_layout_lookup_substitute_closure
+hb_ot_layout_lookups_substitute_closure
hb_ot_layout_lookup_would_substitute
hb_ot_layout_script_find_language
hb_ot_layout_script_get_language_tags
@@ -529,9 +550,10 @@ hb_set_has
hb_set_intersect
hb_set_is_empty
hb_set_is_equal
+hb_set_is_subset
hb_set_next
-hb_set_previous
hb_set_next_range
+hb_set_previous
hb_set_previous_range
hb_set_reference
hb_set_set
commit f6893ef82c51a35dd075973b2041b1b19f81faff
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Tue Jun 12 19:20:20 2018 -0400
Move hb-version.h generation to Makefile
Fixes https://github.com/harfbuzz/harfbuzz/issues/864
Unfortunately 1.7.7 and 1.8.0 went out with the wrong hb-version.h contents.
diff --git a/configure.ac b/configure.ac
index 0061403c..6f5ae8f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,7 +506,6 @@ dnl ===========================================================================
AC_CONFIG_FILES([
Makefile
src/Makefile
-src/hb-version.h
src/harfbuzz-config.cmake
src/hb-ucdn/Makefile
util/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index be9cd73c..9d5662e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,6 +105,17 @@ endif
DIST_SUBDIRS += hb-ucdn
+BUILT_SOURCES += \
+ hb-version.h
+
+$(srcdir)/hb-version.h: hb-version.h.in $(top_srcdir)/configure.ac
+ $(AM_V_GEN) $(SED) \
+ -e 's/[@]HB_VERSION_MAJOR@/$(HB_VERSION_MAJOR)/' \
+ -e 's/[@]HB_VERSION_MINOR@/$(HB_VERSION_MINOR)/' \
+ -e 's/[@]HB_VERSION_MICRO@/$(HB_VERSION_MICRO)/' \
+ -e 's/[@]HB_VERSION@/$(HB_VERSION)/' \
+ "$<" > "$@" || ($(RM) "$@"; false)
+
# Put the library together
HBLIBS += $(HBNONPCLIBS)
@@ -147,7 +158,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = harfbuzz.pc
cmakedir = $(libdir)/cmake/harfbuzz
cmake_DATA = harfbuzz-config.cmake
-EXTRA_DIST += harfbuzz.pc.in harfbuzz-config.cmake.in
+EXTRA_DIST += hb-version.h.in harfbuzz.pc.in harfbuzz-config.cmake.in
lib_LTLIBRARIES += libharfbuzz-subset.la
libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources)
@@ -266,13 +277,13 @@ endif
check: $(DEF_FILES) # For check-symbols.sh
CLEANFILES += $(DEF_FILES)
harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS)
- $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py $@
+ $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py "$@"
harfbuzz-subset.def: $(HB_SUBSET_headers)
- $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py $@
+ $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py "$@"
harfbuzz-icu.def: $(HB_ICU_headers)
- $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py $@
+ $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py "$@"
harfbuzz-gobject.def: $(HB_GOBJECT_headers)
- $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py $@
+ $(AM_V_GEN) headers="$^" $(srcdir)/gen-def.py "$@"
GENERATORS = \
diff --git a/src/hb-version.h b/src/hb-version.h
index 27509326..f02e8078 100644
--- a/src/hb-version.h
+++ b/src/hb-version.h
@@ -37,10 +37,10 @@ HB_BEGIN_DECLS
#define HB_VERSION_MAJOR 1
-#define HB_VERSION_MINOR 7
-#define HB_VERSION_MICRO 6
+#define HB_VERSION_MINOR 8
+#define HB_VERSION_MICRO 0
-#define HB_VERSION_STRING "1.7.6"
+#define HB_VERSION_STRING "1.8.0"
#define HB_VERSION_ATLEAST(major,minor,micro) \
((major)*10000+(minor)*100+(micro) <= \
More information about the HarfBuzz
mailing list