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

libfreehand: FHTransform defined as a struct but declared as a class

Browse Source 
MSVC 14.0 is failing to link with unresolved external symbol, because
of struct/class mismatch: [1].

* [1] http://paste.openstack.org/show/447780

Change-Id: I67093550d89b323914ae42014d55e89a38adec8c
Reviewed-on: https://gerrit.libreoffice.org/18528
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky 2015-09-13 11:36:09 +02:00
parent 0a95c78dca
commit ab5f16eb37
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/libfreehand/UnpackedTarball_libfreehand.mk vendored
View File

@ -13,6 +13,11 @@ $(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_GCC_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \

23
external/libfreehand/replace_transform_class_with_struct.patch vendored Normal file
View File

@ -0,0 +1,23 @@
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
{