Hello community,
here is the log from the commit of package abiword for openSUSE:Factory checked
in at 2016-05-16 12:03:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/abiword (Old)
and /work/SRC/openSUSE:Factory/.abiword.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abiword"
Changes:
--------
--- /work/SRC/openSUSE:Factory/abiword/abiword.changes 2015-02-27
11:00:28.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.abiword.new/abiword.changes 2016-05-16
12:03:45.000000000 +0200
@@ -1,0 +2,14 @@
+Mon May 9 13:35:56 UTC 2016 - dims...@opensuse.org
+
+- Re-add abiword-librevenge.patch that was wrongly dropped when
+ upgrading to Abiword 3.0.1.
+- Add libtool BuildRequires and an injected copy of abiword's
+ autogen.sh, as above patch touches the build system.
+- Add abiword-libwps-0.4.patch: Port to libwps 0.4.
+- Change pkgconfig(libwps-0.3) BuildRequires to
+ pkgconfig(libwps-0.4) in order to enable Microsoft Works Document
+ support again.
+- Drop explicit libabiword-3_0 and link-grammar Requires: they are
+ auto-detected.
+
+-------------------------------------------------------------------
New:
----
abiword-librevenge.patch
abiword-libwps-0.4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ abiword.spec ++++++
--- /var/tmp/diff_new_pack.fLf442/_old 2016-05-16 12:03:46.000000000 +0200
+++ /var/tmp/diff_new_pack.fLf442/_new 2016-05-16 12:03:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package abiword
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,10 @@
Source1: abiword.appdata.xml
# PATCH-FIX-UPSTREAM abiword-3.0.0-linkgrammar.patch fst...@suse.com --
Upstream patch to build with newer linkgrammar (svn rev 34627)
Patch4: abiword-3.0.0-linkgrammar.patch
+# PATCH-FIX-UPSTREAM abiword-librevenge.patch fst...@suse.com -- Fix build
against librevenge-based libraries (svn revs 34461, 34462, 34463, 34464 and
34468)
+Patch5: abiword-librevenge.patch
+# PATCH-FIX-UPSTREAM abiword-libwps-0.4.patch dims...@opensuse.org -- Port to
libwps-0.4; patch taken from Fedora.
+Patch6: abiword-libwps-0.4.patch
BuildRequires: asio-devel
BuildRequires: bison
BuildRequires: boost-devel
@@ -39,6 +43,7 @@
BuildRequires: libgcrypt-devel
BuildRequires: librsvg-devel
BuildRequires: libsoup-devel
+BuildRequires: libtool
BuildRequires: libwmf-devel
BuildRequires: link-grammar-devel
BuildRequires: readline-devel
@@ -52,10 +57,9 @@
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)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(wv-1.0) >= 1.2.0
-Requires: libabiword-3_0
# FIXME: requires libgda >= 1.2.0 libgnomedb >= 1.2.0 and we have
# libgda-[34].0.pc
#BuildRequires: libgda-4_0-devel
@@ -74,7 +78,6 @@
%package -n libabiword-3_0
Summary: A Multiplatform Word Processor - Library files
Group: System/Libraries
-Requires: link-grammar
%description -n libabiword-3_0
AbiWord is a multiplatform word processor with a GTK+ interface on the
@@ -104,8 +107,27 @@
%prep
%setup -q
%patch4
+%patch5
+%patch6
%build
+# We modified plugin configuration and thus we need to regenerate the whole
build system
+# The following script is lifted from upstream autogen-common.sh file that is
not
+# distributed in the release tarball.
+rm -rf plugins/aiksaurus
+find plugins -name Makefile.am | sed 's|.am$||g' > plugin-makefiles.m4
+find plugins -maxdepth 1 -type d | grep -v -e '^\.$' -e '\./\.' | sed
's|plugins/||g' | xargs echo > plugin-list.m4
+(for plugin in `cat plugin-list.m4`; do
+ u=`echo $plugin | tr '[:lower:]' '[:upper:]'`
+ echo 'AM_CONDITIONAL(['$u'_BUILTIN], test "$enable_'$plugin'_builtin"
= "yes")'
+done) > plugin-builtin.m4
+find plugins -name plugin.m4 | xargs cat > plugin-configure.m4
+for f in ` find ./plugins -name '*.m4' | grep -v 'plugin\.m4'`; do
+ ln -sf $f
+done
+libtoolize --force --copy --install
+autoreconf -fi
+
# -fno-strict-aliasing added 2009-04-12. Leave it in because we are
# not sure it is not needed any more and the performance cost of this
# option is cheaper then random undefined behaviours.
++++++ abiword-librevenge.patch ++++++
++++ 1186 lines (skipped)
++++++ abiword-libwps-0.4.patch ++++++
>From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
From: David Tardon <dtar...@redhat.com>
Date: Sat, 6 Jun 2015 21:48:02 +0200
Subject: [PATCH] adapt to libwps 0.4
---
plugins/wordperfect/plugin.m4 | 2 +-
plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
index 0aadbaf..bc32d48 100644
--- plugins/wordperfect/plugin.m4
+++ 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
--- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+++ 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
