dtardon pushed to calligra (master). "adapt to libwps 0.4"

[notifications at fedoraproject.org]

From 124c28df44584e08b00d4dbb859362af73c41070 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Sat, 6 Jun 2015 18:31:48 +0200
Subject: adapt to libwps 0.4


diff --git a/0001-adapt-to-libwps-0.4.patch b/0001-adapt-to-libwps-0.4.patch
new file mode 100644
index 0000000..b4494b3
--- /dev/null
+++ b/0001-adapt-to-libwps-0.4.patch
@@ -0,0 +1,52 @@
+From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sat, 6 Jun 2015 18:27:24 +0200
+Subject: [PATCH] adapt to libwps 0.4
+
+---
+ cmake/modules/FindLibWps.cmake           | 6 +++---
+ filters/words/works/import/WPSImport.cpp | 4 +++-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
+index f8c8225..58ef2b5 100644
+--- a/cmake/modules/FindLibWps.cmake
++++ b/cmake/modules/FindLibWps.cmake
+@@ -10,16 +10,16 @@
+ 
+ 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}
+ )
+ 
+diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
+index eea2cc9..94b859d 100644
+--- a/filters/words/works/import/WPSImport.cpp
++++ b/filters/words/works/import/WPSImport.cpp
+@@ -91,7 +91,9 @@ public:
+     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;
+-- 
+2.4.2
+
diff --git a/calligra.spec b/calligra.spec
index f8b5ff1..292e4f5 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -45,6 +45,7 @@ Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{versio
 # support disabling products we don't package yet
 # fedora lacks mpxj runtime dep for plan import filter, omit until available
 Patch2: calligra-2.9.0-disable_products.patch
+Patch3: 0001-adapt-to-libwps-0.4.patch
 
 ## upstream patches
 
@@ -87,7 +88,7 @@ BuildRequires: pkgconfig(libodfgen-0.1)
 BuildRequires: pkgconfig(librevenge-0.0)
 BuildRequires: pkgconfig(libwpd-0.10)
 BuildRequires: pkgconfig(libwpg-0.3)
-BuildRequires: pkgconfig(libwps-0.3)
+BuildRequires: pkgconfig(libwps-0.4)
 %endif
 BuildRequires: pkgconfig(OpenColorIO)
 BuildRequires: pkgconfig(poppler-qt4)
@@ -502,6 +503,7 @@ Requires: %{name}-core = %{version}-%{release}
 %setup -q
 
 %patch2 -p1 -b .disable_products
+%patch3 -p1 -b .libwps-0.4
 
 ## kdchart munging begin
 pushd 3rdparty/kdchart
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=master&id=124c28df44584e08b00d4dbb859362af73c41070