[Libreoffice-commits] core.git: download.lst external/libfreehand

[Fridrich Štrba]

 download.lst                                        |    4 ++--
 external/libfreehand/ExternalProject_libfreehand.mk |    2 ++
 external/libfreehand/UnpackedTarball_libfreehand.mk |    4 ----
 external/libfreehand/libfreehand_quote.patch.1      |   11 -----------
 4 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit a952bf824ee1e79d9405072ae17dcc3cd3f27af2
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Thu Jun 11 17:03:13 2015 +0200

    Upload libfreehand 0.1.1
    
    Change-Id: I1534a0f43201a594b727ee8b42b697c8c1b5e224

diff --git a/download.lst b/download.lst
index fdb4d5c..22fe74c 100644
--- a/download.lst
+++ b/download.lst
@@ -54,8 +54,8 @@ export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-
 export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz
 export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz
 export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
-export FREEHAND_MD5SUM := 5f029fef73e42a2c2ae4524a7513f97d
-export FREEHAND_TARBALL := libfreehand-0.1.0.tar.bz2
+export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7
+export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
 export GLEW_TARBALL := 594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
 export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk
index c2620c6..4cc232f 100644
--- a/external/libfreehand/ExternalProject_libfreehand.mk
+++ b/external/libfreehand/ExternalProject_libfreehand.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libfreehand,\
 ))
 
 $(eval $(call gb_ExternalProject_use_externals,libfreehand,\
+	icu \
+	lcms2 \
 	revenge \
 	zlib \
 ))
diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk
index c79b5ef..a6cf1c7 100644
--- a/external/libfreehand/UnpackedTarball_libfreehand.mk
+++ b/external/libfreehand/UnpackedTarball_libfreehand.mk
@@ -11,8 +11,4 @@ $(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
deleted file mode 100644
index 08328bc..0000000
--- a/external/libfreehand/libfreehand_quote.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 \