mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libabw,libfreehand,libvisio: avoid some quoting issues

Browse Source 
With Win32 make there are problems with the sed expression.

Change-Id: I6d7fe52a233ef88a43ee1b6e3378fcb7b0792d07
This commit is contained in:
Michael Stahl
2014-06-02 00:12:34 +02:00
parent 548da05c53
commit f5111df1f4
7 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/libabw/UnpackedTarball_libabw.mk vendored
View File

@@ -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:

11
external/libabw/libabw_quote.patch.1 vendored Normal file
View File

@@ -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 \

4
external/libfreehand/UnpackedTarball_libfreehand.mk vendored
View File

@@ -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:

11
external/libfreehand/libfreehand_quote.patch.1 vendored Normal file
View File

@@ -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 \

4
external/libvisio/UnpackedTarball_libvisio.mk vendored
View File

@@ -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:

11
external/libvisio/libvisio_quote.patch.1 vendored Normal file
View File

@@ -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 \

2
vcl/CustomTarget_afm_hash.mk
View File

@@ -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: