Accepting request 236745 from home:fstrba

Upgrade to librevenge-based libvisio

OBS-URL: https://build.opensuse.org/request/show/236745
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libvisio?expand=0&rev=18

libvisio-0.0.30-iterator_range.patch

@@ -1,19 +0,0 @@
---- a/src/lib/libvisio_utils.cpp
-+++ b/src/lib/libvisio_utils.cpp
-@@ -35,6 +35,7 @@
- #include <boost/archive/iterators/binary_from_base64.hpp>
- #include <boost/archive/iterators/remove_whitespace.hpp>
- #include <boost/archive/iterators/transform_width.hpp>
-+#include <boost/range/iterator_range.hpp>
- 
- uint8_t libvisio::readU8(WPXInputStream *input)
- {
-@@ -125,7 +126,7 @@ double libvisio::readDouble(WPXInputStream *input)
- 
- void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char *base64Data, size_t base64DataLength)
- {
--  std::string base64String((const char *)base64Data, base64DataLength);
-+  boost::iterator_range<const char *> base64String((const char *)base64Data, (const char *)base64Data + base64DataLength);
-   typedef boost::archive::iterators::transform_width<
-   boost::archive::iterators::binary_from_base64<
-   boost::archive::iterators::remove_whitespace< std::string::const_iterator > >, 8, 6 > base64_decoder;

libvisio-0.0.30-wpx_seek_end.patch

@@ -1,14 +0,0 @@
---- a/src/lib/VSDZipStream.cpp
-+++ b/src/lib/VSDZipStream.cpp
-@@ -161,11 +161,7 @@ WPXInputStream *libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
- 
- bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd()
- {
--#if defined(LIBWPD_STREAM_VERSION_MAJOR) && defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION) \
--  && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 && (LIBWPD_STREAM_VERSION_MINOR > 9 \
--  || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >= 5))))
-   if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END))
--#endif
-     m_input->seek(m_cdir_offset, WPX_SEEK_SET);
-   try
-   {

libvisio-0.0.30.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7be89fdef23483deea53a557fe023c9f6b59e0f7bb5ba4f42b5909c86cc11f9
-size 384508

libvisio-0.1.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e4f1d49b7cd01173f846995655f2175bbdbde4eac05697bd28667723d176d6f
+size 362740

libvisio.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon May 26 09:23:52 UTC 2014 - fstrba@suse.com
+
+- Upgrade to upstream version 0.1.0
+  * ABI change
+- Remove unneeded patches:
+  * libvisio-0.0.30-iterator_range.patch
+  * libvisio-0.0.30-wpx_seek_end.patch
+- Change in dependencies:
+  * Remove dependency on libwpg-devel and libwpd-devel
+  * Add dependency on librevenge-devel
+- License change
+  * Released under MPL-2.0 only
+
 -------------------------------------------------------------------
 Sat Jan 25 20:55:30 UTC 2014 - tchvatal@suse.com
 

libvisio.spec

@@ -16,27 +16,24 @@
 #
 
 
-%define libname libvisio-0_0-0
+%define libname libvisio-0_1-1
 Name:           libvisio
-Version:        0.0.30
+Version:        0.1.0
 Release:        0
 Summary:        Library for parsing the MS Visio file format structure
-License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
+License:        MPL-2.0
 Group:          Productivity/Publishing/Word
 Url:            http://www.freedesktop.org/wiki/Software/libvisio
 Source0:        http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.xz
-Patch0:         libvisio-0.0.30-iterator_range.patch
-Patch1:         libvisio-0.0.30-wpx_seek_end.patch
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gperf
 BuildRequires:  libicu-devel
-BuildRequires:  libwpd-devel >= 0.9.5
+BuildRequires:  librevenge-devel >= 0.0.0
-BuildRequires:  libwpg-devel >= 0.2.0
 BuildRequires:  libxml2-devel
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
 BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -57,8 +54,6 @@ cross-platform, at the moment it can be build on Microsoft Windows and Linux.
 Summary:        Files for Developing with libvisio
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
-Requires:       libwpd-devel
-Requires:       libwpg-devel
 
 %description devel
 libvisio is a library for parsing the MS Visio file format structure. It is
@@ -85,8 +80,6 @@ This package contains tools to work with documents in MS Visio file-format.
 
 %prep
 %setup -q
-%patch0 -p1 -b .iterator_range
-%patch1 -p1 -b .wpx_seek_end
 
 %build
 export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
@@ -111,7 +104,7 @@ cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}-devel/
 
 %files -n %{libname}
 %defattr(-,root,root)
-%{_libdir}/*.so.0*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)