SHA256
1
0
forked from pool/libcdr
Fridrich Strba 2014-07-25 07:34:34 +00:00 committed by Git OBS Bridge
parent ad92295ce4
commit 177cff177b
8 changed files with 278 additions and 205 deletions

View File

@ -1,8 +0,0 @@
--- libcdr-0.1.0/libcdr.pc.in 2014-04-16 19:06:20.000000000 +0200
+++ libcdr-0.1.0/libcdr.pc.in 2014-07-25 09:14:23.096910474 +0200
@@ -9,5 +9,3 @@
Requires: librevenge-0.0 librevenge-stream-0.0
Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
-
-Requires.private: icu-i18n lcms2 zlib

View File

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

View File

@ -1,155 +0,0 @@
-------------------------------------------------------------------
Fri Jul 25 07:15:32 UTC 2014 - fstrba@suse.com
- Added patch: libcdr-0.1.0-pkgconfig.patch
* Remove the Requires.private which breaks SLE11 builds
-------------------------------------------------------------------
Mon May 26 09:30:13 UTC 2014 - fstrba@suse.com
- Upgrade to upstream version 0.1.0
* ABI change
* Remove dependency on libwpd-devel and libwpg-devel
* Add dependency on librevenge-devel
-------------------------------------------------------------------
Thu Apr 10 10:36:05 UTC 2014 - fstrba@suse.com
- Update to upstream version 0.0.16
* Brownbag release
* Upstream relicensing to MPL-2.0
-------------------------------------------------------------------
Thu Apr 10 09:51:43 UTC 2014 - fstrba@suse.com
- Fix mistake in licensing
* 0.0.x line is still tripple LGPL-2.0+ or GPL-2.0+ or MPL-1.1
-------------------------------------------------------------------
Tue Apr 8 07:42:45 UTC 2014 - fstrba@suse.com
- Update to upstream version 0.0.15
* Approximation of splines by cubic beziers
* Support CorelDraw x7 file-format
* Add a palette #0x03 for spot colours (0x19)
* first iteration of YIQ255 support
* hard-depend on libwpd >= 0.9.5
* settle license on MPL-2.0
- Removed unneeded patches:
* libcdr-0.0.14-pkgconfig.patch
* libcdr-0.0.14-wpx_seek_end.patch
-------------------------------------------------------------------
Sat Jan 25 21:27:54 UTC 2014 - tchvatal@suse.com
- Format with spec-cleaner and noarch documentation.
-------------------------------------------------------------------
Sat Jan 18 15:31:13 UTC 2014 - crrodriguez@opensuse.org
- build with -fvisibility-inlines-hidden, saving around 300
entries in the exported symbol table.
- build with --disable-werror, there are no warnings but werror
during deployment is undesirable.
-------------------------------------------------------------------
Fri Nov 1 09:09:17 UTC 2013 - tchvatal@suse.com
- Remove conditionals for docs and use verbose build.
-------------------------------------------------------------------
Tue Oct 8 14:59:07 UTC 2013 - fstrba@suse.com
- liblcms2 and zlib are compile-time dependencies only
* Add patch to remove the requirements from *.pc file
-------------------------------------------------------------------
Fri Jul 26 07:06:40 UTC 2013 - fstrba@suse.com
- Performance regression fix
* Add patch to unconditionally use WPX_SEEK_END
* Depend on libwpd-devel >= 0.9.5 that has WPX_SEEK_END
-------------------------------------------------------------------
Mon May 27 10:21:51 UTC 2013 - fridrich.strba@suse.com
- Update to upstream version 0.0.14
* Miscellaneous coverity fixes
* Be more gracious with broken documents
* Change source code layout in order to allow including
of headers from the tarball directly.
* Fix issues with angle units
-------------------------------------------------------------------
Mon Apr 22 13:25:32 UTC 2013 - fridrich.strba@suse.com
- Update to upstream version 0.0.13
* Extend text support to CDR versions 5 and 6
* Fix text parser for CDR version 13+
* Parse text format strings in CDR version 16
* Text colour support for CDR versions 5 - 16
* Add dependency on boost for both json property string
parser and for extraction of colour information
- Added build dependency on boost-devel
-------------------------------------------------------------------
Mon Apr 8 16:51:21 CEST 2013 - fridrich.strba@suse.com
- Update to upstream version 0.0.12
* rewrite of ellitical arc transforms, fixes a fdo#62538
* multiple fixes for text encondings
* added cdr2text and cmx2text tools in order to make string
encoding debugging easier
- Removed upstreamed patch
-------------------------------------------------------------------
Fri Mar 1 14:24:12 CET 2013 - fridrich.strba@suse.com
- Update to upstream version 0.0.11
* Fix positions of circles and their transformations
* Fix issues with large angle when the angles are negative
* Implement reading of multi-paragraph text
* Fix tranformation of bitmaps
* Miscellaneous coverity fixes
* Miscellaneous fixes of the SVG generator
- Upstream patch for text encoding overrides in styles
-------------------------------------------------------------------
Fri Jan 25 15:47:08 CET 2013 - fridrich.strba@suse.com
- Update to upstream version 0.0.10
* Fix wrong encoding of some text strings
* New dependency on libicu-devel
- Upstream patch fixing large-angle computation
-------------------------------------------------------------------
Tue Nov 13 07:58:32 UTC 2012 - cfarrell@suse.com
- license update: LGPL-2.0+ or GPL-2.0+ or MPL-1.1
Use either ^or^ or ^and^ to specify a license aggregation or compilation.
Semicolons and colons are ambigous and confusing
-------------------------------------------------------------------
Mon Nov 5 13:57:02 CET 2012 - fridrich.strba@suse.com
- Update to upstream version 0.0.9
* Fix wrong positions of grouped objects in newer
CorelDraw file-formats
-------------------------------------------------------------------
Mon Jun 11 13:09:23 UTC 2012 - jengelh@inai.de
- SPDX license field
-------------------------------------------------------------------
Mon Jun 11 14:32:55 CEST 2012 - fridrich.strba@suse.com
- Update to upstream version 0.0.8
* initial text support
- Remove upstreamed patch
-------------------------------------------------------------------
Fri Apr 27 08:48:31 CEST 2012 - fridrich.strba@suse.com
- Initial package of libcdr

View File

@ -0,0 +1,19 @@
--- 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;

View File

@ -0,0 +1,14 @@
--- 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
{

3
libvisio-0.0.30.tar.xz Normal file
View File

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

198
libvisio.changes Normal file
View File

@ -0,0 +1,198 @@
-------------------------------------------------------------------
Sat Jan 25 20:55:30 UTC 2014 - tchvatal@suse.com
- Cleanup with spec-cleaner and noarch the documentation.
-------------------------------------------------------------------
Sat Jan 18 14:14:24 UTC 2014 - crrodriguez@opensuse.org
- build with -fvisibility-inlines-hidden
-------------------------------------------------------------------
Fri Nov 1 09:05:03 UTC 2013 - tchvatal@suse.com
- Remove conditional for the doc building, use verbose build.
-------------------------------------------------------------------
Fri Jul 26 06:58:30 UTC 2013 - fridrich.strba@suse.com
- Performance regression fix
* Add patch to unconditionally use WPX_SEEK_END
* Depend on libwpd-devel >= 0.9.5 that has WPX_SEEK_END
-------------------------------------------------------------------
Wed Jul 10 16:54:11 UTC 2013 - fridrich.strba@suse.com
- Bump version to 0.0.30
* Fix building with older boosts
* Considerable performance improvement due to diminished
memory consumption.
* Implemented B-Spline conversion for xml-based formats
* For NURBS and B-Splines where it is possible, lossless
conversion to bezier segments.
* Coverity fixes.
-------------------------------------------------------------------
Tue Jul 2 13:59:58 UTC 2013 - fridrich.strba@suse.com
- Bump version to 0.0.29
* Avoid NAN in NURBS code - fixes some freehand curves
* Fix generation of doxygen documentation
* Fix several parser errors due to padding zeros after chunks
-------------------------------------------------------------------
Wed Jun 5 08:56:24 UTC 2013 - fridrich.strba@suse.com
- Bump version to 0.0.28
* Miscellaneous crash fixes revealed by fuzzer run.
* Miscellaneous coverity fixes.
* New layout of source code with public headers in inc/libvisio
directory.
-------------------------------------------------------------------
Mon Apr 22 09:42:12 UTC 2013 - fridrich.strba@suse.com
- Bump version to 0.0.26
* Fix missing WMFs in some Visio files
* Use ICU for text encoding conversions
* Honour the "HideText" property
* Don't truncate end of the text
* vsd2raw/vss2raw -add possibility to detect groups that are not
properly finished and indent raw output for easier detection of
problems
- Add dependency on libicu-devel
-------------------------------------------------------------------
Tue Feb 26 13:33:06 CET 2013 - fridrich.strba@suse.com
- Bump version to 0.0.25
* don't throw from parser to the outer world
* fix line height conversion with fixed line-height
* fix incorrect colour conversion in documents without cached hex value
* convert page names
* miscellaneous coverty fixes
-------------------------------------------------------------------
Mon Dec 3 10:03:31 CET 2012 - fridrich.strba@suse.com
- Bump version to 0.0.23
* Fixes fdo#48601 - wrong colours in some gradients
-------------------------------------------------------------------
Thu Nov 29 10:58:33 CET 2012 - fridrich.strba@suse.com
- Bump version to 0.0.22
-------------------------------------------------------------------
Wed Nov 21 12:52:09 UTC 2012 - tchvatal@suse.com
- Disable werror explicitely. Usefull for devel but not for pkg.
-------------------------------------------------------------------
Wed Nov 21 10:03:03 UTC 2012 - tchvatal@suse.com
- Bump version to 0.0.21
-------------------------------------------------------------------
Mon Nov 5 13:44:53 CET 2012 - fridrich.strba@suse.com
- Upgrade to upstream version 0.0.20
* Support of Visio XML Drawing file-format (*.vdx)
* Initial support of (not-yet-relesed) Visio 2013 file-formats
(*.vsdx and *.vsdm)
* Initial support of extracting of master shapes from Visio
documents.
-------------------------------------------------------------------
Wed Oct 31 21:05:31 UTC 2012 - asterios.dramis@gmail.com
- Changed license to "MPL-1.1 or GPL-2.0+ or LGPL-2.1+" (SPDX style).
- Install libvisio devel documentation in %{_docdir}/libvisio-devel/.
- Spec file cleanup based also on spec-cleaner run.
-------------------------------------------------------------------
Mon Aug 6 11:06:50 CEST 2012 - fridrich.strba@suse.com
- Upgrade to upstream version 0.0.19
* Several crashes fixed
* fix fdo#50990: import Visio documents generated by Visio SDK
* Correct filling / closing of paths
-------------------------------------------------------------------
Fri Apr 27 09:12:51 CEST 2012 - fridrich.strba@suse.com
- Upgrade to upstream version 0.0.16
- OLE objects in stencils
- More line end and start markers
- Fix closing of NURBS
- Regression and bug fixes.
-------------------------------------------------------------------
Tue Jan 24 09:40:42 UTC 2012 - jengelh@medozas.de
- Remove redundant tags/sections (see specfile guidelines)
- Adjust rpm group of -tools and (main) to match libwpd
-------------------------------------------------------------------
Sat Jan 21 21:00:29 CET 2012 - fridrich.strba@suse.com
- Upgrade to upstream version 0.0.14
- Embedded OLE objects
- Text rotations
- Rotations and flips of embedded objects
- Regression and bug fixes.
-------------------------------------------------------------------
Fri Dec 2 19:56:12 UTC 2011 - jengelh@medozas.de
- Remove redundant/unwanted tags/section (cf. specfile guidelines)
- Use %_smp_mflags for parallel building
-------------------------------------------------------------------
Fri Dec 2 17:08:00 CET 2011 - fridrich.strba@suse.com
- Upgrade to upstream version 0.0.9
- Emulate infinite lines
- Fix bug with group flips
- Implement paragraph properties in text
- Implement stencil text
- Initial implementation of text fields
- Initial implementation of line-ends
- Fix group text z-order
- Remove unnecessary patch
- Build dependency on boost-devel
-------------------------------------------------------------------
Tue Oct 4 17:04:22 CEST 2011 - fridrich.strba@suse.com
- Upgrade to upstream version 0.0.8
- Fix for "dereferencing type-puned pointer will break
strict-aliasing rules" with older compilers
- Make order with integer types
- Push dash array correctly to OdgGenerator
-------------------------------------------------------------------
Wed Sep 28 15:13:01 CEST 2011 - fridrich.strba@suse.com
- libvisio-0.0.7-strictaliasing.patch: fix "dereferencing
type-punned pointer will break strict-aliasing rules"
with older compilers
- libvisio-0.0.7-integermess.patch: fix warning about casting
double into integer and in the same token fix mess with integer
widths
-------------------------------------------------------------------
Fri Sep 9 14:57:47 CEST 2011 - fridrich.strba@suse.com
- Update to upstream version 0.0.7
- Fix a null-pointer crash with stencil geometries
- Improved text conversion
- Added support for uniform b-splines
- Fixed a problem with NURBS approximation algorithm
- Improved handling for stencils embedded raster images
-------------------------------------------------------------------
Thu Sep 1 12:38:42 CEST 2011 - fridrich.strba@suse.com
- Initial package of libvisio

View File

@ -1,5 +1,5 @@
#
# spec file for package libcdr
# spec file for package libvisio
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -16,87 +16,92 @@
#
%define libname libcdr-0_1-1
Name: libcdr
Version: 0.1.0
%define libname libvisio-0_0-0
Name: libvisio
Version: 0.0.30
Release: 0
Summary: Library for parsing the Corel Draw file format structure
License: MPL-2.0
Summary: Library for parsing the MS Visio file format structure
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Group: Productivity/Publishing/Word
Url: http://www.freedesktop.org/wiki/Software/libcdr
Source0: http://dev-www.libreoffice.org/src/libcdr-%{version}.tar.xz
# note: the main package is empty, it only sets a sane name for the source rpm
Patch0: libcdr-0.1.0-pkgconfig.patch
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: pkg-config
BuildRequires: libwpd-devel >= 0.9.5
BuildRequires: libwpg-devel >= 0.2.0
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
BuildRequires: xz
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(librevenge-generators-0.0)
BuildRequires: pkgconfig(librevenge-stream-0.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(zlib)
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
libcdr is a library for parsing the Corel Draw file format structure. It is
libvisio is a library for parsing the MS Visio file format structure. It is
cross-platform, at the moment it can be build on Microsoft Windows and Linux.
%package -n %{libname}
Summary: Library for parsing the Corel Draw file format structure
Summary: Library for parsing the MS Visio file format structure
Group: System/Libraries
%description -n %{libname}
libcdr is a library for parsing the Corel Draw file format structure. It is
libvisio is a library for parsing the MS Visio file format structure. It is
cross-platform, at the moment it can be build on Microsoft Windows and Linux.
%package devel
Summary: Files for Developing with libcdr
Summary: Files for Developing with libvisio
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: libwpd-devel
Requires: libwpg-devel
%description devel
libcdr is a library for parsing the Corel Draw file format structure. It is
libvisio is a library for parsing the MS Visio file format structure. It is
cross-platform, at the moment it can be build on Microsoft Windows and Linux.
This package contains the libcdr development files.
This package contains the libvisio development files.
%package devel-doc
Summary: Documentation for the libcdr API
Summary: Documentation for the libvisio API
Group: Documentation/HTML
%if 0%{?suse_version} > 1200
BuildArch: noarch
%endif
%description devel-doc
This package contains documentation for the libcdr API.
This package contains documentation for the libvisio API.
%package tools
Summary: Tools to work with documents in Corel Draw file-format
Summary: Tools to work with documents in MS Visio file-format
Group: Productivity/Publishing/Word
%description tools
Tools to work with documents in Corel Draw file-format.
This package contains tools to work with documents in MS Visio file-format.
%prep
%setup -q
%patch0 -p1
%patch0 -p1 -b .iterator_range
%patch1 -p1 -b .wpx_seek_end
%build
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"
%configure --disable-werror --disable-static --docdir=%{_docdir}/%{name}
%configure \
--disable-werror \
--disable-static \
--docdir=%{_docdir}/%{name}-devel/html
make %{?_smp_mflags} V=1
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
find %{buildroot} -type f -name "*.la" -delete -print
# documentation
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}
cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}-devel/
%fdupes -s %{buildroot}
@ -106,23 +111,23 @@ cp -p AUTHORS COPYING.* ChangeLog %{buildroot}%{_docdir}/%{name}
%files -n %{libname}
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_libdir}/*.so.0*
%files devel
%defattr(-,root,root)
%doc %dir %{_docdir}/%{name}-devel/
%doc %{_docdir}/%{name}-devel/[A-Z]*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libcdr*.pc
%{_includedir}/libcdr-*
%{_libdir}/pkgconfig/libvisio*.pc
%{_includedir}/libvisio-*
%files devel-doc
%defattr(-,root,root,-)
%doc %dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/html
%doc %{_docdir}/%{name}-devel/html/
%files tools
%defattr(-,root,root)
%doc AUTHORS COPYING.* ChangeLog
%{_bindir}/*
%doc %dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/[A-Z]*
%changelog