[libmspub/f20] fdo#80661 fix crash on import of specific docs from libreoffice

[David Tardon]

commit c3232215b36a5b6d18746977e212888fed484fde
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jul 3 09:37:31 2014 +0200

    fdo#80661 fix crash on import of specific docs from libreoffice

 ...lash-with-a-global-symbol-from-libreoffic.patch |   38 ++++++++++++++++++++
 libmspub.spec                                      |    9 ++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch b/0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch
new file mode 100644
index 0000000..e01c380
--- /dev/null
+++ b/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 at 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 at 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/libmspub.spec b/libmspub.spec
index c76a03f..1728013 100644
--- a/libmspub.spec
+++ b/libmspub.spec
@@ -2,7 +2,7 @@
 
 Name: libmspub
 Version: 0.0.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A library providing ability to interpret and import Microsoft Publisher files
 
 Group: System Environment/Libraries
@@ -17,6 +17,8 @@ BuildRequires: libwpd-devel
 BuildRequires: libwpg-devel
 BuildRequires: zlib-devel
 
+Patch0: 0001-fdo-80661-clash-with-a-global-symbol-from-libreoffic.patch
+
 %description
 Libmspub is library providing ability to interpret and import Microsoft
 Publisher content into various applications. You can find it being used
@@ -50,7 +52,7 @@ Currently supported: XHTML, raw.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build
@@ -98,6 +100,9 @@ rm -rf %{buildroot}/%{_docdir}/%{name}
 
 
 %changelog
+* Thu Jul 03 2014 David Tardon <dtardon at redhat.com> - 0.0.6-5
+- fdo#80661 fix crash on import of specific docs from libreoffice
+
 * Fri Aug 30 2013 David Tardon <dtardon at redhat.com> - 0.0.6-4
 - Resolves: rhbz#1001245 duplicate documentation files / potentially conflicting