gentoo-overlay/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch

Last-Update: 2015-06-17
Forwarded: no
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
From: David Tardon <dtardon@redhat.com>
Description: adapt to libwps 0.4

--- a/cmake/modules/FindLibWps.cmake
+++ b/cmake/modules/FindLibWps.cmake
@@ -9,18 +9,18 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 
 include(LibFindMacros)
 libfind_package(LIBWPS LibWpd)
-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
 
 find_path(LIBWPS_INCLUDE_DIR
     NAMES libwps/libwps.h
     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
-    PATH_SUFFIXES libwps-0.3
+    PATH_SUFFIXES libwps-0.4
 )
 
 find_library(LIBWPS_LIBRARY
-    NAMES wps wps-0.3
+    NAMES wps wps-0.4
     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
 )
 
 set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
--- a/filters/words/works/import/WPSImport.cpp
+++ b/filters/words/works/import/WPSImport.cpp
@@ -90,9 +90,11 @@
     }
     bool isSupportedFormat(librevenge::RVNGInputStream &input)
     {
         WPSKind kind = WPS_TEXT;
-        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
+        WPSCreator creator = WPS_MSWORKS;
+        bool needsEncoding = false;
+        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
         if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
             return false;
         return true;
     }