From ecaebb9ffa9c7750b01b87ca76aa0c90fe586fa7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 Mar 2019 22:32:47 +0000 Subject: ZLIB_INCLUDES in AM_CFLAGS for ff-woff git-svn-id: svn://tug.org/texlive/trunk@50610 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/ChangeLog | 4 ++++ Build/source/texk/dvisvgm/TLpatches/ChangeLog | 5 +++++ Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib | 13 +++++++++++++ .../texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am | 2 +- .../texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in | 2 +- 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib (limited to 'Build') diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index aae082ba430..4e17053571f 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2019-03-26 Karl Berry + + * dvisvgm-src/libs/ff-woff/Makefile.am (AM_CFLAGS): add ZLIB_INCLUDES. + 2019-01-31 Karl Berry * Makefile.am (man_MANS): install dvisvgm.1. diff --git a/Build/source/texk/dvisvgm/TLpatches/ChangeLog b/Build/source/texk/dvisvgm/TLpatches/ChangeLog index 7da16e3f69f..4ca80090ce2 100644 --- a/Build/source/texk/dvisvgm/TLpatches/ChangeLog +++ b/Build/source/texk/dvisvgm/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2019-03-26 Karl Berry + + * patch-09-woff-zlib: new file. From Mojca and Martin, + tlbuild 25 Mar 2019 21:03:53. + 2019-02-25 Karl Berry * patch-08-makefiles (AM_CXXFLAGS): use WARNING_CXXFLAGS, diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib b/Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib new file mode 100644 index 00000000000..6066a1b1454 --- /dev/null +++ b/Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib @@ -0,0 +1,13 @@ + tlbuild mail from Martin, 25 Mar 2019 21:03:53. + +--- dvisvgm-src/libs/ff-woff/Makefile.am (revision 50601) ++++ dvisvgm-src/libs/ff-woff/Makefile.am (working copy) +@@ -83,7 +83,7 @@ + + EXTRA_DIST = LICENSE + +-AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge ++AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_INCLUDES) + + @CODE_COVERAGE_RULES@ + diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am index 41ecdbadbdd..9165717ca5d 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am @@ -83,7 +83,7 @@ libfontforge_a_SOURCES = \ EXTRA_DIST = LICENSE -AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge +AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_INCLUDES) @CODE_COVERAGE_RULES@ diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in index 118ac7872d0..b5e64259c1b 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in @@ -502,7 +502,7 @@ libfontforge_a_SOURCES = \ inc/utype.h EXTRA_DIST = LICENSE -AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge +AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_INCLUDES) CLEANFILES = *.gcda *.gcno all: all-am -- cgit v1.2.3