diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-09-13 11:36:09 +0200 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-09-13 19:33:13 +0000 |
| commit | ab5f16eb37d8fa2b7924f1e19f9fe8f373714adc (patch) | |
| tree | 1244fa9e89fd6d84516dca59e7ff5d531be317e4 /external | |
| parent | 0a95c78dca9018ae25e1993ea9b3a2160e8f0741 (diff) | |
libfreehand: FHTransform defined as a struct but declared as a class
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>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libfreehand/UnpackedTarball_libfreehand.mk | 5 | ||||
| -rw-r--r-- | external/libfreehand/replace_transform_class_with_struct.patch | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk index de07ef509b4e..c1abfa38a519 100644 --- a/external/libfreehand/UnpackedTarball_libfreehand.mk +++ b/external/libfreehand/UnpackedTarball_libfreehand.mk @@ -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, \ diff --git a/external/libfreehand/replace_transform_class_with_struct.patch b/external/libfreehand/replace_transform_class_with_struct.patch new file mode 100644 index 000000000000..b7deeea65957 --- /dev/null +++ b/external/libfreehand/replace_transform_class_with_struct.patch @@ -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 + { + |