diff options
| -rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 4 | ||||
| -rw-r--r-- | external/libabw/libabw_quote.patch.1 | 11 | ||||
| -rw-r--r-- | external/libfreehand/UnpackedTarball_libfreehand.mk | 4 | ||||
| -rw-r--r-- | external/libfreehand/libfreehand_quote.patch.1 | 11 | ||||
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 4 | ||||
| -rw-r--r-- | external/libvisio/libvisio_quote.patch.1 | 11 | ||||
| -rw-r--r-- | vcl/CustomTarget_afm_hash.mk | 2 |
7 files changed, 46 insertions, 1 deletions
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index 6288b0ef83aa..70ac11fae7ce 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw)) $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libabw,\ + external/libabw/libabw_quote.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libabw/libabw_quote.patch.1 b/external/libabw/libabw_quote.patch.1 new file mode 100644 index 000000000000..619351fcd517 --- /dev/null +++ b/external/libabw/libabw_quote.patch.1 @@ -0,0 +1,11 @@ +--- libabw/src/lib/Makefile.in.orig 2014-06-01 21:15:14.647200000 +0200 ++++ libabw/src/lib/Makefile.in 2014-06-01 21:15:24.865200000 +0200 +@@ -716,7 +716,7 @@ + + $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf + $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \ +- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h ++ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h + + $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl + perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \ diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk index a6cf1c790f32..c79b5efb9e16 100644 --- a/external/libfreehand/UnpackedTarball_libfreehand.mk +++ b/external/libfreehand/UnpackedTarball_libfreehand.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libfreehand)) $(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\ + external/libfreehand/libfreehand_quote.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/libfreehand_quote.patch.1 b/external/libfreehand/libfreehand_quote.patch.1 new file mode 100644 index 000000000000..08328bcc3d57 --- /dev/null +++ b/external/libfreehand/libfreehand_quote.patch.1 @@ -0,0 +1,11 @@ +--- libfreehand/src/lib/Makefile.in.orig 2014-06-01 22:07:48.468000000 +0200 ++++ libfreehand/src/lib/Makefile.in 2014-06-01 22:08:06.642000000 +0200 +@@ -709,7 +709,7 @@ + + $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf + $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \ +- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h ++ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h + + $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl + perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \ diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index e4c0561f72f8..1626dbb780d2 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio)) $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ + external/libvisio/libvisio_quote.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libvisio/libvisio_quote.patch.1 b/external/libvisio/libvisio_quote.patch.1 new file mode 100644 index 000000000000..ec3cc1ee817a --- /dev/null +++ b/external/libvisio/libvisio_quote.patch.1 @@ -0,0 +1,11 @@ +--- libvisio/src/lib/Makefile.in.orig 2014-06-01 22:54:30.212400000 +0200 ++++ libvisio/src/lib/Makefile.in 2014-06-01 22:54:34.112400000 +0200 +@@ -776,7 +776,7 @@ + + $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf + $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \ +- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h ++ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h + + $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl + perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \ diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk index 18ea9c17f730..44b2073c2599 100644 --- a/vcl/CustomTarget_afm_hash.mk +++ b/vcl/CustomTarget_afm_hash.mk @@ -15,6 +15,6 @@ $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp : \ $(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list \ | $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1) - $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@ + $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e 's/(char\*)0/(char\*)0, NOPE/g' | grep -v '^#line' > $@ # vim: set noet sw=4: |