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

[notifications at fedoraproject.org]

From 1482cf1f893b6378f6c868a1f999912b7bd366d6 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Sat, 6 Jun 2015 21:49:18 +0200
Subject: adapt to libwps 0.4


diff --git a/abiword-3.0.1-libwps-0.4.patch b/abiword-3.0.1-libwps-0.4.patch
new file mode 100644
index 0000000..292f681
--- /dev/null
+++ b/abiword-3.0.1-libwps-0.4.patch
@@ -0,0 +1,54 @@
+From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sat, 6 Jun 2015 21:48:02 +0200
+Subject: [PATCH] adapt to libwps 0.4
+
+---
+ plugin-configure.m4                           | 2 +-
+ plugins/wordperfect/plugin.m4                 | 2 +-
+ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/plugin-configure.m4 b/plugin-configure.m4
+index 2757f4a..093fbcb 100644
+--- a/plugin-configure.m4
++++ b/plugin-configure.m4
+@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS])
+ 
+ 
+ wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.3'
++wordperfect_wps_pkgs='libwps-0.4'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
+index 0aadbaf..bc32d48 100644
+--- a/plugins/wordperfect/plugin.m4
++++ b/plugins/wordperfect/plugin.m4
+@@ -1,6 +1,6 @@
+ 
+ wordperfect_pkgs="libwpd-0.10 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.3'
++wordperfect_wps_pkgs='libwps-0.4'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+index bd19971..3e69f79 100644
+--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+ 	libwps::WPSKind kind;
+-	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
++        libwps::WPSCreator creator;
++        bool needsEncoding = false;
++	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
+ 	
+ 	if (kind != libwps::WPS_TEXT)
+ 		confidence = libwps::WPS_CONFIDENCE_NONE;
+-- 
+2.4.2
+
diff --git a/abiword.spec b/abiword.spec
index 2850085..db824b1 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -24,6 +24,7 @@ Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.0-link-grammar-5.patch
 Patch5: abiword-3.0.0-link-grammar-5-second.patch
 Patch6: abiword-3.0.0-libwp.patch
+Patch7: abiword-3.0.1-libwps-0.4.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -55,7 +56,7 @@ BuildRequires: libxslt-devel
 BuildRequires: link-grammar-devel
 BuildRequires: loudmouth-devel
 BuildRequires: ots-devel
-BuildRequires: pkgconfig(libwps-0.3)
+BuildRequires: pkgconfig(libwps-0.4)
 BuildRequires: poppler-devel
 BuildRequires: popt-devel
 BuildRequires: pygobject3
@@ -113,6 +114,7 @@ Python bindings for developing with libabiword
 %patch4 -p1 -b .link-grammar-5
 %patch5 -p1 -b .link-grammar-5-second
 %patch6 -p1 -b .libwp
+%patch7 -p1 -b .libwps-0.4
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/abiword.git/commit/?h=master&id=1482cf1f893b6378f6c868a1f999912b7bd366d6