commit 6228add62ea363a4d971240a0374967ee24d09ed
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Feb 11 12:23:07 2018 +0100
- up to 0.9.6
libgsf-build.patch | 11 +++++++++++
writerperfect.spec | 17 ++++++++++-------
2 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/writerperfect.spec b/writerperfect.spec
index f4e110c..92584f3 100644
--- a/writerperfect.spec
+++ b/writerperfect.spec
@@ -1,12 +1,13 @@
Summary: Converting WordPerfect(TM) documents into OpenOffice.org formats
Summary(pl.UTF-8): Konwersja dokumentów WordPerfecta(TM) na formaty
OpenOffice.org
Name: writerperfect
-Version: 0.9.5
+Version: 0.9.6
Release: 1
License: GPL v2
Group: Applications/Publishing
Source0:
http://downloads.sourceforge.net/libwpd/%{name}-%{version}.tar.xz
-# Source0-md5: d7f1faa71bc0278d68ba0cf24dadfcdf
+# Source0-md5: 9b554883621a9a1809c2582a6d2febd4
+Patch0: libgsf-build.patch
URL: http://libwpd.sourceforge.net/
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: libabw-devel >= 0.1
@@ -26,9 +27,9 @@ BuildRequires: librvngabw-devel >= 0.0
BuildRequires: libstaroffice-devel >= 0.0
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libvisio-devel >= 0.1
-BuildRequires: libwpd-devel >= 0.10
-BuildRequires: libwpg-devel >= 0.3
-BuildRequires: libwps-devel >= 0.4
+BuildRequires: libwpd-devel >= 0.10.2
+BuildRequires: libwpg-devel >= 0.3.2
+BuildRequires: libwps-devel >= 0.4.8
BuildRequires: pkgconfig >= 1:0.20
BuildRequires: tar >= 1:1.22
BuildRequires: xz
@@ -65,12 +66,14 @@ Narzędzia do konwertowania dokumentów:
%prep
%setup -q
+%patch0 -p1
%build
%configure \
--disable-silent-rules \
- --with-libgsf \
- --with-sharedptr=c++11
+ --disable-werror \
+ --with-libgsf
+
%{__make}
%install
diff --git a/libgsf-build.patch b/libgsf-build.patch
new file mode 100644
index 0000000..975ebf2
--- /dev/null
+++ b/libgsf-build.patch
@@ -0,0 +1,11 @@
+--- writerperfect-0.9.6/src/lib/OutputFileHelper.cxx~ 2017-05-03
20:55:03.000000000 +0200
++++ writerperfect-0.9.6/src/lib/OutputFileHelper.cxx 2018-02-11
10:48:16.155693729 +0100
+@@ -57,7 +57,7 @@
+ OutputFileHelperImpl::~OutputFileHelperImpl()
+ {
+ #ifdef USE_GSF_OUTPUT
+- if (mpOutfile && !gsf_output_close((GsfOutput *) mpOutfile.get()))
++ if (mpOutfile && !gsf_output_close((GsfOutput *) mpOutfile))
+ fprintf(stderr, "ERROR : Couldn't close outfile\n");
+
+ if (mpOutfile)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/writerperfect.git/commitdiff/6228add62ea363a4d971240a0374967ee24d09ed
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
