From 1fc30a25e2c69fe8b365300b0784f3a282183e80 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 2 Jan 2015 19:07:35 +0000
Subject: workaround error C2589: ´(´ : illegal token on right side of ´::´
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I3654a4eb4caa3a987f6d797c9bcb577c6fd6b426
---
external/libvisio/UnpackedTarball_libvisio.mk | 4 ++++
external/libvisio/vsd-msvc-max.patch.1 | 19 +++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 external/libvisio/vsd-msvc-max.patch.1
(limited to 'external')
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index e4c0561f72f8..31908332a43f 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
+ external/libvisio/vsd-msvc-max.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/vsd-msvc-max.patch.1 b/external/libvisio/vsd-msvc-max.patch.1
new file mode 100644
index 000000000000..7d22ea1999ad
--- /dev/null
+++ b/external/libvisio/vsd-msvc-max.patch.1
@@ -0,0 +1,19 @@
+--- a/src/lib/VSDContentCollector.cpp
++++ b/src/lib/VSDContentCollector.cpp
+@@ -2256,14 +2256,14 @@
+ styleProps.insert("draw:marker-start-viewbox", _linePropertiesMarkerViewbox(style.startMarker));
+ styleProps.insert("draw:marker-start-path", _linePropertiesMarkerPath(style.startMarker));
+ double w = m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+- styleProps.insert("draw:marker-start-width", std::max(w, 0.05));
++ styleProps.insert("draw:marker-start-width", (std::max)(w, 0.05));
+ }
+ if (style.endMarker > 0)
+ {
+ styleProps.insert("draw:marker-end-viewbox", _linePropertiesMarkerViewbox(style.endMarker));
+ styleProps.insert("draw:marker-end-path", _linePropertiesMarkerPath(style.endMarker));
+ double w = m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+- styleProps.insert("draw:marker-end-width", std::max(w, 0.05));
++ styleProps.insert("draw:marker-end-width", (std::max)(w, 0.05));
+ }
+
+ int dots1 = 0;
--
cgit