From 1a80748dda7d7b9459321cee3e2429c6683391689524c487e58bf48e916963b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 28 Aug 2015 07:49:42 +0000 Subject: [PATCH 1/2] - Version bump to 0.1.3: * Fix build on old compilers - Add patch from upstream git to build with new libxml2: * 0001-fix-test.patch - Version bump to 0.1.2: - Fix several build problems with different compilers. - Import more metadata properties. - Fix theme color import (tdf#92270). - Fix a bunch of crashes and hangs when reading broken documents, found with the help of american-fuzzy-lop. - Fix several memory leaks. - Ignore errors when parsing metadata. This makes some documents readable again. - Fix handling of character background (tdf#92271). OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libvisio?expand=0&rev=29 --- 0001-fix-test.patch | 34 ++++++++++++++++++++++++++++++++++ libvisio-0.1.1.tar.xz | 3 --- libvisio-0.1.3.tar.xz | 3 +++ libvisio.changes | 22 ++++++++++++++++++++++ libvisio.spec | 6 ++++-- 5 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 0001-fix-test.patch delete mode 100644 libvisio-0.1.1.tar.xz create mode 100644 libvisio-0.1.3.tar.xz diff --git a/0001-fix-test.patch b/0001-fix-test.patch new file mode 100644 index 0000000..3ad232d --- /dev/null +++ b/0001-fix-test.patch @@ -0,0 +1,34 @@ +From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sat, 25 Jul 2015 15:11:19 +0200 +Subject: [PATCH] fix test + +The previous version only worked with libxml2 < 2.9.2, because of a bug +in handling nested elements of the same name. + +Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f +--- + configure.ac | 4 ++++ + src/test/importtest.cpp | 6 +++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp +index 8554309..0296380 100644 +--- a/src/test/importtest.cpp ++++ b/src/test/importtest.cpp +@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme() + void ImportTest::testVsdxCharBgColor() + { + m_doc = parse("bgcolor.vsdx", m_buffer); +- assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color"); +- assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); +- assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); ++ assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color"); ++ assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); ++ assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61"); + } + + CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest); +-- +2.1.0 + diff --git a/libvisio-0.1.1.tar.xz b/libvisio-0.1.1.tar.xz deleted file mode 100644 index 8624411..0000000 --- a/libvisio-0.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b510168d1465516fdf6e57c01e2f9eae1fc0ae232c74e44e70693bbc49227f1 -size 412752 diff --git a/libvisio-0.1.3.tar.xz b/libvisio-0.1.3.tar.xz new file mode 100644 index 0000000..0c5a5c4 --- /dev/null +++ b/libvisio-0.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8 +size 479592 diff --git a/libvisio.changes b/libvisio.changes index 4f6935c..d8bd63f 100644 --- a/libvisio.changes +++ b/libvisio.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Aug 28 07:46:16 UTC 2015 - tchvatal@suse.com + +- Version bump to 0.1.3: + * Fix build on old compilers +- Add patch from upstream git to build with new libxml2: + * 0001-fix-test.patch + +------------------------------------------------------------------- +Fri Aug 28 07:39:59 UTC 2015 - tchvatal@suse.com + +- Version bump to 0.1.2: + - Fix several build problems with different compilers. + - Import more metadata properties. + - Fix theme color import (tdf#92270). + - Fix a bunch of crashes and hangs when reading broken documents, found + with the help of american-fuzzy-lop. + - Fix several memory leaks. + - Ignore errors when parsing metadata. This makes some documents readable + again. + - Fix handling of character background (tdf#92271). + ------------------------------------------------------------------- Tue Jan 6 13:01:37 UTC 2015 - tchvatal@suse.com diff --git a/libvisio.spec b/libvisio.spec index a965dbd..d6979fd 100644 --- a/libvisio.spec +++ b/libvisio.spec @@ -1,7 +1,7 @@ # # spec file for package libvisio # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,14 @@ %define libname libvisio-0_1-1 Name: libvisio -Version: 0.1.1 +Version: 0.1.3 Release: 0 Summary: Library for parsing the MS Visio file format structure License: MPL-2.0 Group: Productivity/Publishing/Word Url: http://www.freedesktop.org/wiki/Software/libvisio Source0: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz +Patch0: 0001-fix-test.patch BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: doxygen @@ -81,6 +82,7 @@ This package contains tools to work with documents in MS Visio file-format. %prep %setup -q +%patch0 -p1 %build export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" From 7dcdd888a20e1a8755c28c76f0e2250c07602d5ba1ac0c2ae48bd8f1e3f3422a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 28 Aug 2015 07:59:01 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libvisio?expand=0&rev=30 --- libvisio.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvisio.spec b/libvisio.spec index d6979fd..a4e9751 100644 --- a/libvisio.spec +++ b/libvisio.spec @@ -82,7 +82,9 @@ This package contains tools to work with documents in MS Visio file-format. %prep %setup -q +%if 0%{?suse_version} > 1320 %patch0 -p1 +%endif %build export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"