- build fix for libwps 0.4, patch from debian

diff --git a/libreoffice.spec b/libreoffice.spec
index 1a94dc6e2e658b7bbb0d8b363eb28eab0dadb2ae..f10ef7da76f2aee97c62165510d59c69a5a8d34c 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -88,6 +88,7 @@ Source28:     http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.b
 Patch1:                %{name}-build.patch
 Patch2:                liborcus-0.9.patch
 Patch3:                disable-failing-test.patch
+Patch4:                libwps-0.4.patch
 URL:           http://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
 BuildRequires: Firebird-devel
@@ -2813,6 +2814,7 @@ dialogs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 for dir in *-%{version}; do
        [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir

diff --git a/libwps-0.4.patch b/libwps-0.4.patch
new file mode 100644 (file)
index 0000000..22697d1
--- /dev/null
+++ b/libwps-0.4.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac-old 2015-06-16 18:09:30.351631561 +0200
++++ b/configure.ac     2015-06-16 18:09:46.000000000 +0200
+@@ -7604,7 +7645,7 @@
+ dnl ===================================================================
+ dnl Check for system libwps
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.3])
++libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
+ 
+ dnl ===================================================================
+ dnl Check for system libwpg
+--- a/writerperfect/source/writer/MSWorksImportFilter.cxx-old  2015-06-16 18:16:01.703195434 +0200
++++ b/writerperfect/source/writer/MSWorksImportFilter.cxx      2015-06-16 18:16:43.059571839 +0200
+@@ -39,7 +39,9 @@
+ bool MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
+ {
+     libwps::WPSKind kind = libwps::WPS_TEXT;
+-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind);
++    libwps::WPSCreator creator;
++    bool needsEncoding = false;
++    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needsEncoding);
+ 
+     if ((kind == libwps::WPS_TEXT) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT))
+     {
+--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx-old        2015-06-16 18:14:12.910205066 +0200
++++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx    2015-06-16 18:14:49.378537077 +0200
+@@ -32,7 +32,9 @@
+ bool MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
+ {
+     libwps::WPSKind kind = libwps::WPS_TEXT;
+-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind);
++    libwps::WPSCreator creator;
++    bool needsEncoding = false;
++    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needsEncoding);
+ 
+     if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT))
+     {