mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
app-office/abiword: Version bump to 3.0.2
Gentoo-bug: 488462, 582788, 595250 * EAPI=6 Package-Manager: portage-2.3.2
This commit is contained in:
David Seifert
@@ -1 +1,2 @@
|
||||
DIST abiword-3.0.1.tar.gz 11144990 SHA256 e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6 SHA512 c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf WHIRLPOOL 7d06614673d7275df57999783205b98a41f0588c7eadfdd4d29e30dd52cf1c44aa5b07e90d47ece328119da9877aec7754511a40768b6ea844c3683abefdcad7
|
||||
DIST abiword-3.0.2.tar.gz 11154333 SHA256 afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 WHIRLPOOL c916d144a68f6581927c6d75d12cac2ae39e213e1ca928f190c19ffd8843cb0c463e671ec4ef6b21ab0d4c49a084e04a8b7eeed75bf45fdc0f76dfa4391ff898
|
||||
|
||||
138
app-office/abiword/abiword-3.0.2.ebuild
Normal file
138
app-office/abiword/abiword-3.0.2.ebuild
Normal file
@@ -0,0 +1,138 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools gnome2
|
||||
|
||||
DESCRIPTION="Fully featured yet light and fast cross platform word processor"
|
||||
HOMEPAGE="http://www.abisource.com/"
|
||||
SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="calendar collab cups debug eds +goffice grammar +introspection latex map math ots +plugins readline redland spell wordperfect wmf thesaurus"
|
||||
|
||||
# You need 'plugins' enabled if want to enable the extra plugins
|
||||
REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesaurus !wordperfect !wmf )"
|
||||
|
||||
RDEPEND="
|
||||
>=app-text/wv-1.2
|
||||
>=dev-libs/fribidi-0.10.4
|
||||
>=dev-libs/glib-2.16:2
|
||||
>=dev-libs/libgcrypt-1.4.5:0=
|
||||
dev-libs/libxslt
|
||||
>=gnome-base/librsvg-2.16:2
|
||||
>=gnome-extra/libgsf-1.14.18:=
|
||||
>=media-libs/libpng-1.2:0=
|
||||
virtual/jpeg:0
|
||||
>=x11-libs/cairo-1.10[X]
|
||||
>=x11-libs/gtk+-3.0.8:3[cups?]
|
||||
calendar? ( >=dev-libs/libical-0.46:= )
|
||||
eds? ( >=gnome-extra/evolution-data-server-3.6.0:= )
|
||||
goffice? ( >=x11-libs/goffice-0.10.2:0.10 )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.0.0 )
|
||||
map? ( >=media-libs/libchamplain-0.12 )
|
||||
plugins? (
|
||||
collab? (
|
||||
>=dev-libs/libxml2-2.4
|
||||
>=net-libs/loudmouth-1
|
||||
net-libs/libsoup:2.4
|
||||
net-libs/gnutls:= )
|
||||
grammar? ( >=dev-libs/link-grammar-4.2.1 )
|
||||
math? ( >=x11-libs/gtkmathview-0.7.5 )
|
||||
ots? ( >=app-text/ots-0.5-r1 )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
|
||||
wordperfect? (
|
||||
app-text/libwpd:0.10
|
||||
app-text/libwpg:0.3 )
|
||||
wmf? ( >=media-libs/libwmf-0.2.8 )
|
||||
)
|
||||
redland? (
|
||||
>=dev-libs/redland-1.0.10
|
||||
>=dev-libs/rasqal-0.9.17 )
|
||||
spell? ( >=app-text/enchant-1.2 )
|
||||
!<app-office/abiword-plugins-2.8
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
>=dev-libs/boost-1.40.0
|
||||
virtual/pkgconfig
|
||||
collab? ( dev-cpp/asio )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.8.3-desktop.patch
|
||||
"${FILESDIR}"/${PN}-2.6.0-boolean.patch
|
||||
"${FILESDIR}"/${PN}-3.0.0-librevenge.patch
|
||||
"${FILESDIR}"/${PN}-3.0.0-link-grammar-5-second.patch
|
||||
"${FILESDIR}"/${PN}-3.0.0-libwp.patch
|
||||
"${FILESDIR}"/${PN}-3.0.1-libwps-0.4.patch
|
||||
"${FILESDIR}"/${PN}-3.0.1-fixwps.patch
|
||||
"${FILESDIR}"/${PN}-3.0.2-fix-installing-readme.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
gnome2_src_prepare
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local plugins=()
|
||||
|
||||
if use plugins; then
|
||||
# Plugins depending on libgsf
|
||||
plugins=(t602 docbook clarisworks wml kword hancom openwriter pdf
|
||||
loadbindings mswrite garble pdb applix opendocument sdw xslfo)
|
||||
|
||||
# Plugins depending on librsvg
|
||||
plugins+=(svg)
|
||||
|
||||
# Plugins not depending on anything
|
||||
plugins+=(gimp bmp freetranslation iscii s5 babelfish opml eml wikipedia
|
||||
gdict passepartout google presentation urldict hrtext mif openxml)
|
||||
|
||||
# inter7eps: eps.h
|
||||
# libtidy: gsf + tidy.h
|
||||
# paint: windows only ?
|
||||
use collab && plugins+=(collab)
|
||||
use goffice && plugins+=(goffice)
|
||||
use latex && plugins+=(latex)
|
||||
use math && plugins+=(mathview)
|
||||
use ots && plugins+=(ots)
|
||||
# psion: >=psiconv-0.9.4
|
||||
use readline && plugins+=(command)
|
||||
use thesaurus && plugins+=(aiksaurus)
|
||||
use wmf && plugins+=(wmf)
|
||||
# wordperfect: >=wpd-0.9 >=wpg-0.2
|
||||
use wordperfect && plugins+=(wpg)
|
||||
fi
|
||||
|
||||
gnome2_src_configure \
|
||||
--enable-plugins="${plugins[*]}" \
|
||||
--disable-static \
|
||||
--disable-default-plugins \
|
||||
--disable-builtin-plugins \
|
||||
--disable-collab-backend-telepathy \
|
||||
--enable-clipart \
|
||||
--enable-statusbar \
|
||||
--enable-templates \
|
||||
--with-gio \
|
||||
--without-gnomevfs \
|
||||
--without-gtk2 \
|
||||
$(use_enable debug) \
|
||||
$(use_with goffice goffice) \
|
||||
$(use_with calendar libical) \
|
||||
$(use_enable cups print) \
|
||||
$(use_enable collab collab-backend-xmpp) \
|
||||
$(use_enable collab collab-backend-tcp) \
|
||||
$(use_enable collab collab-backend-service) \
|
||||
$(use_with eds evolution-data-server) \
|
||||
$(use_enable introspection) \
|
||||
$(use_with map champlain) \
|
||||
$(use_with redland) \
|
||||
$(use_enable spell)
|
||||
}
|
||||
13
app-office/abiword/files/abiword-2.6.0-boolean.patch
Normal file
13
app-office/abiword/files/abiword-2.6.0-boolean.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
|
||||
--- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h 2008-03-18 23:16:20.000000000 +0100
|
||||
+++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h 2008-03-25 17:14:23.000000000 +0100
|
||||
@@ -23,6 +23,9 @@
|
||||
#ifndef PD_STYLE_H
|
||||
#define PD_STYLE_H
|
||||
|
||||
+#ifndef FALSE
|
||||
+#define FALSE 0
|
||||
+#endif /* FALSE */
|
||||
#include "ut_types.h"
|
||||
#include "pt_Types.h"
|
||||
#include "ut_xml.h"
|
||||
12
app-office/abiword/files/abiword-2.8.3-desktop.patch
Normal file
12
app-office/abiword/files/abiword-2.8.3-desktop.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -u -r abiword-2.8.3.orig/abiword.desktop abiword-2.8.3/abiword.desktop
|
||||
--- abiword-2.8.3.orig/abiword.desktop 2010-04-02 19:59:58.000000000 +0200
|
||||
+++ abiword-2.8.3/abiword.desktop 2010-04-08 09:07:01.000000000 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
|
||||
StartupNotify=true
|
||||
X-Desktop-File-Install-Version=0.9
|
||||
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
|
||||
+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
|
||||
Name=AbiWord
|
||||
GenericName=Word Processor
|
||||
Comment=Compose, edit, and view documents
|
||||
1169
app-office/abiword/files/abiword-3.0.0-librevenge.patch
Normal file
1169
app-office/abiword/files/abiword-3.0.0-librevenge.patch
Normal file
File diff suppressed because it is too large
Load Diff
36
app-office/abiword/files/abiword-3.0.0-libwp.patch
Normal file
36
app-office/abiword/files/abiword-3.0.0-libwp.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Sat, 6 Jun 2015 18:43:14 +0200
|
||||
Subject: [PATCH] fix libwp? detection
|
||||
|
||||
---
|
||||
plugin-configure.m4 | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/plugin-configure.m4 b/plugin-configure.m4
|
||||
index 54998fb..92e4ec2 100644
|
||||
--- a/plugin-configure.m4
|
||||
+++ b/plugin-configure.m4
|
||||
@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
|
||||
AC_SUBST([BMP_LIBS])
|
||||
|
||||
|
||||
-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
|
||||
+wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
|
||||
wpg_deps="no"
|
||||
|
||||
if test "$enable_wpg" != ""; then
|
||||
@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
|
||||
AC_SUBST([AIKSAURUS_LIBS])
|
||||
|
||||
|
||||
-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
|
||||
-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
|
||||
+wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
|
||||
+wordperfect_wps_pkgs='libwps-0.3'
|
||||
wordperfect_deps="no"
|
||||
|
||||
WORDPERFECT_CFLAGS=
|
||||
--
|
||||
2.4.2
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
--- a/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
|
||||
+++ b/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
|
||||
@@ -223,6 +223,7 @@
|
||||
pErr = NULL;
|
||||
}
|
||||
|
||||
+#ifdef DEAD_DEBUG_CODE
|
||||
// for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
|
||||
// {
|
||||
// pErr = pT->m_vecGrammarErrors.getNthItem(i);
|
||||
@@ -231,6 +232,8 @@
|
||||
UT_UTF8String sErr = linkage_get_violation_name(linkage);
|
||||
// UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
|
||||
linkage_delete(linkage);
|
||||
+#endif // DEAD_DEBUG_CODE
|
||||
+
|
||||
for(i=0; i< vecMapOfWords.getItemCount(); i++)
|
||||
{
|
||||
AbiGrammarError * p = vecMapOfWords.getNthItem(i);
|
||||
31
app-office/abiword/files/abiword-3.0.1-fixwps.patch
Normal file
31
app-office/abiword/files/abiword-3.0.1-fixwps.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
--- abiword-3.0.1/plugin-configure.m4.orig 2016-04-10 14:22:18.271356761 +0100
|
||||
+++ abiword-3.0.1/plugin-configure.m4 2016-04-10 14:24:22.493303398 +0100
|
||||
@@ -1355,7 +1355,7 @@
|
||||
AC_SUBST([BMP_LIBS])
|
||||
|
||||
|
||||
-wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
|
||||
+wpg_pkgs="libwpg-0.3 $gsf_req"
|
||||
wpg_deps="no"
|
||||
|
||||
if test "$enable_wpg" != ""; then
|
||||
@@ -1469,8 +1469,8 @@
|
||||
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.4'
|
||||
+wordperfect_pkgs="libwpd-0.10 $gsf_req"
|
||||
+wordperfect_wps_pkgs='libwps-0.3'
|
||||
wordperfect_deps="no"
|
||||
|
||||
WORDPERFECT_CFLAGS=
|
||||
@@ -1499,7 +1499,7 @@
|
||||
|
||||
PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
|
||||
[
|
||||
- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
|
||||
+ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
|
||||
WPS_DEFINE=" -DHAVE_LIBWPS"
|
||||
])
|
||||
|
||||
54
app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch
Normal file
54
app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch
Normal file
@@ -0,0 +1,54 @@
|
||||
From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@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
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Change the installation directory of the readme.txt file
|
||||
to match standard FHS conventions.
|
||||
|
||||
--- a/user/wp/Makefile.am
|
||||
+++ b/user/wp/Makefile.am
|
||||
@@ -9,10 +9,11 @@
|
||||
EXTRA_DIST = \
|
||||
$(wp_DATA)
|
||||
|
||||
+doc_DATA = \
|
||||
+ readme.txt
|
||||
+
|
||||
wpdir = $(ABIWORD_DATADIR)
|
||||
wp_DATA = \
|
||||
- readme.txt \
|
||||
- readme.abw \
|
||||
system.profile \
|
||||
system.profile-am-ET \
|
||||
system.profile-ar \
|
||||
Reference in New Issue
Block a user