diff options
| author | David Tardon <dtardon@redhat.com> | 2014-07-01 15:00:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-01 14:03:12 +0000 |
| commit | d57fa7b9d5462eb67827d8eb977e5c6e152c1cb9 (patch) | |
| tree | 96c70c7d72fc571426c62041426d003a7e6ddb42 | |
| parent | 1ad76412e3fa74f2b7547d7cc283933775b2760e (diff) | |
fdo#80661 clash with a global symbol from libreoffice
Change-Id: I422a8c246f93101008dca59a5fd17810a4155c16
Reviewed-on: https://gerrit.libreoffice.org/10018
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | external/libmspub/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch | 38 | ||||
| -rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk | 6 |
2 files changed, 44 insertions, 0 deletions
diff --git a/external/libmspub/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch b/external/libmspub/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch new file mode 100644 index 000000000000..e01c38029560 --- /dev/null +++ b/external/libmspub/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch @@ -0,0 +1,38 @@ +From aedff4411981ed73bdd077ebad66abdf03a172df Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Tue, 1 Jul 2014 10:10:01 +0200 +Subject: [PATCH] fdo#80661 clash with a global symbol from libreoffice + +Change-Id: I7d556a5a207b055342a0b369cc0cb800b60014df +(cherry picked from commit 50e45a89147807dadb301cc7b6ba934806ae269a) +Signed-off-by: David Tardon <dtardon@redhat.com> +--- + src/lib/PolygonUtils.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp +index bd79064..54f800a 100644 +--- a/src/lib/PolygonUtils.cpp ++++ b/src/lib/PolygonUtils.cpp +@@ -5715,6 +5715,9 @@ Coordinate libmspub::CustomShape::getTextRectangle(double x, double y, double wi + return Coordinate(startX, startY, endX, endY); + } + ++namespace ++{ ++ + struct LineInfo + { + WPXPropertyListVector m_vertices; +@@ -5736,6 +5739,8 @@ struct LineInfo + private: + }; + ++} ++ + void drawEmulatedLine(boost::shared_ptr<const CustomShape> shape, ShapeType shapeType, const std::vector<Line> &lines, + Vector2D center, VectorTransformation2D transform, + double x, double y, double scaleX, double scaleY, +-- +1.9.3 + diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 044ce9656c49..0ac2dacd071f 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmspub)) $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ + external/libmspub/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch \ +)) + # vim: set noet sw=4 ts=4: |