ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

upload libfreehand 0.1.2

Browse Source 
Change-Id: I5d31cbfe8a71f95ca748303d83fd5838ebae92ef
Reviewed-on: https://gerrit.libreoffice.org/42353
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
2017-09-16 20:30:55 +02:00
parent 3128668599
commit a90a331a87
5 changed files with 5 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -73,8 +73,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc
export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
export FREEHAND_SHA256SUM := 45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877
export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM := a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b
export FREETYPE_TARBALL := freetype-2.8.tar.bz2
export GLM_SHA256SUM := d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
external/libfreehand/ExternalProject_libfreehand.mk
Vendored
+3
View File
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libfreehand,\
))
$(eval $(call gb_ExternalProject_use_externals,libfreehand,\
boost_headers \
icu \
lcms2 \
revenge \
@@ -31,11 +32,13 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) :
--enable-static \
--disable-shared \
--without-docs \
--disable-tests \
--disable-tools \
--disable-debug \
--disable-werror \
--disable-weffc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
external/libfreehand/UnpackedTarball_libfreehand.mk
Vendored
-9
View File
@@ -13,11 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libfreehand,0))
# Was already fixed upstream: d9b10697f3984e51d3870e049b99488d94ee735e
$(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\
external/libfreehand/replace_transform_class_with_struct.patch \
))
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \
@@ -26,8 +21,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \
endif
endif
$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \
external/libfreehand/iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:
external/libfreehand/iOS.patch.0
Vendored
-20
View File
@@ -1,20 +0,0 @@
--- config.sub 2015-06-11 16:52:21.000000000 +0200
+++ config.sub 2017-06-13 13:21:15.000000000 +0200
@@ -253,7 +253,7 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
| avr | avr32 \
| be32 | be64 \
| bfin \
@@ -374,7 +374,7 @@
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
external/libfreehand/replace_transform_class_with_struct.patch
Vendored
-23
View File
@@ -1,23 +0,0 @@
Due to class/struct mismatch, MSVC 14.0 is issuing linkage error.
This was already fixed upstream, and can be removed after bumping
libfreehand version.
author David Tardon <dtardon@redhat.com>
Thu, 11 Jun 2015 17:13:57 +0200 (17:13 +0200)
committer David Tardon <dtardon@redhat.com>
commit d9b10697f3984e51d3870e049b99488d94ee735e
WaE: 'FHTransform' defined as a struct here but previously declared as a class
diff -ru libfreehand/src/lib/FHPath.h libfreehand.orig/src/lib/FHPath.h
--- src/lib/FHPath.h 2015-09-13 11:25:46.523925800 +0200
+++ src/lib/FHPath.h 2015-05-18 06:50:01.000000000 +0200
@@ -16,7 +16,7 @@
namespace libfreehand
{
-class FHTransform;
+struct FHTransform;
class FHPathElement
{