From 90fedcc9e0e75ea25c13a2d1731903d49f10e4ef Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 25 Jul 2015 12:48:52 +0200 Subject: [PATCH] new upstream release 0.1.3 --- .gitignore | 1 + 0001-add-missing-breaks.patch | 49 ------------------------ 0001-define-more-needed-namespaces.patch | 27 ------------- libvisio.spec | 10 ++--- sources | 2 +- 5 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 0001-add-missing-breaks.patch delete mode 100644 0001-define-more-needed-namespaces.patch diff --git a/.gitignore b/.gitignore index 46c41e5..938ae54 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /libvisio-0.0.31.tar.xz /libvisio-0.1.0.tar.xz /libvisio-0.1.1.tar.xz +/libvisio-0.1.3.tar.xz diff --git a/0001-add-missing-breaks.patch b/0001-add-missing-breaks.patch deleted file mode 100644 index 81cc687..0000000 --- a/0001-add-missing-breaks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e39b9f080b9cd7ed0e64a43a4c6a053c1dd67718 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 4 May 2015 17:16:50 +0200 -Subject: [PATCH] add missing breaks - -Change-Id: I200b80dca1db001d49fb97326345539c02c66b90 ---- - src/lib/VSDXParser.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp -index f11d778..b8669dd 100644 ---- a/src/lib/VSDXParser.cpp -+++ b/src/lib/VSDXParser.cpp -@@ -1047,6 +1047,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_txtxform = new XForm(); - ret = readDoubleData(m_shape.m_txtxform->angle, reader); - } -+ break; - case XML_BEGINX: - if (XML_READER_TYPE_ELEMENT == tokenType) - { -@@ -1054,6 +1055,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_xform1d = new XForm1D(); - ret = readDoubleData(m_shape.m_xform1d->beginX, reader); - } -+ break; - case XML_BEGINY: - if (XML_READER_TYPE_ELEMENT == tokenType) - { -@@ -1061,6 +1063,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_xform1d = new XForm1D(); - ret = readDoubleData(m_shape.m_xform1d->beginY, reader); - } -+ break; - case XML_ENDX: - if (XML_READER_TYPE_ELEMENT == tokenType) - { -@@ -1068,6 +1071,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_xform1d = new XForm1D(); - ret = readDoubleData(m_shape.m_xform1d->endX, reader); - } -+ break; - case XML_ENDY: - if (XML_READER_TYPE_ELEMENT == tokenType) - { --- -2.3.5 - diff --git a/0001-define-more-needed-namespaces.patch b/0001-define-more-needed-namespaces.patch deleted file mode 100644 index d4c8b23..0000000 --- a/0001-define-more-needed-namespaces.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 886221dccacd69d7dc7155fa42d3dd902286b846 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 2 Jan 2015 22:21:41 +0100 -Subject: [PATCH] define more needed namespaces - -Change-Id: I83ada29e6bc89d8f045cfbe7c099ca5ec6553645 ---- - src/test/xmldrawinggenerator.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/test/xmldrawinggenerator.cpp b/src/test/xmldrawinggenerator.cpp -index 78484e0..771caff 100644 ---- a/src/test/xmldrawinggenerator.cpp -+++ b/src/test/xmldrawinggenerator.cpp -@@ -33,6 +33,9 @@ void XmlDrawingGenerator::startDocument(const librevenge::RVNGPropertyList &prop - - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:dc"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:meta:1.0")); - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:draw"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0")); -+ xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:fo"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0")); -+ xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:librevenge"), BAD_CAST("urn:x-documentliberation:xmlns:librevenge:0.0")); -+ xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:style"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:style:1.0")); - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:svg"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0")); - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:meta"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:meta:1.0")); - --- -2.3.5 - diff --git a/libvisio.spec b/libvisio.spec index 1f4d389..57df481 100644 --- a/libvisio.spec +++ b/libvisio.spec @@ -1,8 +1,8 @@ %global apiversion 0.1 Name: libvisio -Version: 0.1.1 -Release: 5%{?dist} +Version: 0.1.3 +Release: 1%{?dist} Summary: A library for import of Microsoft Visio diagrams License: MPLv2.0 @@ -20,9 +20,6 @@ BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(zlib) -Patch0: 0001-add-missing-breaks.patch -Patch1: 0001-define-more-needed-namespaces.patch - %description %{name} is library providing ability to interpret and import Microsoft Visio diagrams into various applications. You can find it @@ -117,6 +114,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/vss2xhtml.1* %changelog +* Sat Jul 25 2015 David Tardon - 0.1.3-1 +- new upstream release + * Wed Jul 22 2015 David Tardon - 0.1.1-5 - rebuild for Boost 1.58 diff --git a/sources b/sources index f16f92c..b34835d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -299c02fa08a1b9dc2be8ffa9deb0457a libvisio-0.1.1.tar.xz +fda521a18bbfccc5f034ea02119e7998 libvisio-0.1.3.tar.xz