use libwps 0.4

5 files changed, 47 insertions, 4 deletions

diff --git a/changelog b/changelog
index 39d3792..dfe3e81 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:4.4.4-1) unstable; urgency=medium
   * debian/patches/fix-perl-deprecation-in-lo-xlate-lang.diff: fix
     "Can't use a hash as a reference" deprecation warning/error in
     lo-xlate-lang (closes: #788613)
+  * debian/patches/libwps-0.4.diff: backport from upstream; adapt for
+    libwps 0.4
 
   * debian/control{,.in}:
     - suggest openclipart2-libreoffice | openclipart-libreoffice
@@ -15,6 +17,9 @@ libreoffice (1:4.4.4-1) unstable; urgency=medium
   * debian/copyright:
     - remove long gone dmake (closes: #788311)
 
+  * debian/rules:
+    - build-depend on libwps >= 0.4
+
  -- Rene Engelhard <rene@debian.org>  Sun, 14 Jun 2015 21:31:33 +0200
 
 libreoffice (1:4.4.4~rc1-1) unstable; urgency=medium
diff --git a/control b/control
index 40f83a2..576f2cf 100644
--- a/control
+++ b/control
@@ -113,7 +113,7 @@ Build-Depends: ant (>= 1.7.0),
                libvlc5,
                libwpd-dev (>= 0.10),
                libwpg-dev (>= 0.3),
-               libwps-dev (>= 0.3),
+               libwps-dev (>= 0.4),
                libx11-dev,
                libxaw7-dev,
                libxext-dev,
@@ -4442,7 +4442,7 @@ Depends: ant (>= 1.7.0),
          libvlc5,
          libwpd-dev (>= 0.10),
          libwpg-dev (>= 0.3),
-         libwps-dev (>= 0.3),
+         libwps-dev (>= 0.4),
          libx11-dev,
          libxaw7-dev,
          libxext-dev,
diff --git a/patches/libwps-0.4.diff b/patches/libwps-0.4.diff
new file mode 100644
index 0000000..22697d1
--- /dev/null
+++ b/patches/libwps-0.4.diff
@@ -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))
+     {
diff --git a/patches/series b/patches/series
index a98767a..8868eb5 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ system-collada2gltf.diff
 libebook-1.2.so.16.diff
 rsc-no-error-about-unknown-switch.diff
 fix-perl-deprecation-in-lo-xlate-lang.diff
+libwps-0.4.diff
diff --git a/rules b/rules
index def36ef..d48d08d 100755
--- a/rules
+++ b/rules
@@ -632,7 +632,7 @@ endif
 # Debian Jessie
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "jessie-backports"
   BUGS=mailto:debian-backports@lists.debian.org
-  SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds,$(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds libwps,$(SYSTEM_STUFF))
   JESSIE_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -1091,7 +1091,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
 	BUILD_DEPS += , libmythes-dev (>= 2:1.2)
   endif
   ifneq (,$(filter libwps, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libwps-dev (>= 0.3)
+	BUILD_DEPS += , libwps-dev (>= 0.4)
   endif
   ifneq (,$(filter libwpg, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libwpg-dev (>= 0.3)