* [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/
@ 2016-11-12 15:02 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-11-12 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 9d2e95e80122db5a8f186ccaf1f3c60c8f32a6b3
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 14:18:00 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 15:00:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d2e95e8
app-office/abiword: Version bump to 3.0.2
Gentoo-bug: 488462, 582788, 595250
* EAPI=6
Package-Manager: portage-2.3.2
app-office/abiword/Manifest | 1 +
app-office/abiword/abiword-3.0.2.ebuild | 138 +++
.../abiword/files/abiword-2.6.0-boolean.patch | 13 +
.../abiword/files/abiword-2.8.3-desktop.patch | 12 +
.../abiword/files/abiword-3.0.0-librevenge.patch | 1169 ++++++++++++++++++++
app-office/abiword/files/abiword-3.0.0-libwp.patch | 36 +
.../abiword-3.0.0-link-grammar-5-second.patch | 19 +
.../abiword/files/abiword-3.0.1-fixwps.patch | 31 +
.../abiword/files/abiword-3.0.1-libwps-0.4.patch | 54 +
.../abiword-3.0.2-fix-installing-readme.patch | 19 +
10 files changed, 1492 insertions(+)
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index ecde7ed..3df5d1c 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -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
diff --git a/app-office/abiword/abiword-3.0.2.ebuild b/app-office/abiword/abiword-3.0.2.ebuild
new file mode 100644
index 00000000..f84d0cd
--- /dev/null
+++ b/app-office/abiword/abiword-3.0.2.ebuild
@@ -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)
+}
diff --git a/app-office/abiword/files/abiword-2.6.0-boolean.patch b/app-office/abiword/files/abiword-2.6.0-boolean.patch
new file mode 100644
index 00000000..9f226c0
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.6.0-boolean.patch
@@ -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"
diff --git a/app-office/abiword/files/abiword-2.8.3-desktop.patch b/app-office/abiword/files/abiword-2.8.3-desktop.patch
new file mode 100644
index 00000000..d908ad4
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.8.3-desktop.patch
@@ -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
diff --git a/app-office/abiword/files/abiword-3.0.0-librevenge.patch b/app-office/abiword/files/abiword-3.0.0-librevenge.patch
new file mode 100644
index 00000000..b2121eb
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.0-librevenge.patch
@@ -0,0 +1,1169 @@
+--- a/plugins/wpg/xp/ie_impGraphic_WPG.cpp
++++ b/plugins/wpg/xp/ie_impGraphic_WPG.cpp
+@@ -31,7 +31,7 @@
+ #include <gsf/gsf-input-memory.h>
+ #include <gsf/gsf-input-stdio.h>
+ #include <gsf/gsf-infile-msole.h>
+-#include <libwpd-stream/libwpd-stream.h>
++#include <librevenge-0.0/librevenge-stream/librevenge-stream.h>
+ #include "xap_Module.h"
+
+ using libwpg::WPGraphics;
+@@ -38,30 +38,35 @@
+
+ ABI_PLUGIN_DECLARE("WPG")
+
+-class AbiWordPerfectGraphicsInputStream : public WPXInputStream
++class AbiWordPerfectGraphicsInputStream : public librevenge::RVNGInputStream
+ {
+ public:
+ AbiWordPerfectGraphicsInputStream(GsfInput *input);
+ ~AbiWordPerfectGraphicsInputStream();
+
+- virtual bool isOLEStream();
+- virtual WPXInputStream * getDocumentOLEStream();
+- virtual WPXInputStream * getDocumentOLEStream(const char * name);
++ virtual bool isStructured();
++ virtual unsigned subStreamCount();
++ virtual const char* subStreamName(unsigned);
++ bool existsSubStream(const char*);
++ virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
++ virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+- virtual int seek(long offset, WPX_SEEK_TYPE seekType);
++ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
+ virtual long tell();
+- virtual bool atEOS();
++ virtual bool isEnd();
+
+ private:
+
+ GsfInput *m_input;
+ GsfInfile *m_ole;
++ std::map<unsigned, std::string> m_substreams;
+ };
+
+ AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
+- WPXInputStream(),
++ librevenge::RVNGInputStream(),
+ m_input(input),
+- m_ole(NULL)
++ m_ole(NULL),
++ m_substreams()
+ {
+ g_object_ref(G_OBJECT(input));
+ }
+@@ -86,50 +91,120 @@
+ return buf;
+ }
+
+-int AbiWordPerfectGraphicsInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
++int AbiWordPerfectGraphicsInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
+ {
+ GSeekType gsfSeekType = G_SEEK_SET;
+ switch(seekType)
+ {
+- case WPX_SEEK_CUR:
++ case librevenge::RVNG_SEEK_CUR:
+ gsfSeekType = G_SEEK_CUR;
+ break;
+- case WPX_SEEK_SET:
++ case librevenge::RVNG_SEEK_SET:
+ gsfSeekType = G_SEEK_SET;
+ break;
++ case librevenge::RVNG_SEEK_END:
++ gsfSeekType = G_SEEK_END;
++ break;
+ }
+
+ return gsf_input_seek(m_input, offset, gsfSeekType);
+ }
+
+-bool AbiWordPerfectGraphicsInputStream::isOLEStream()
++bool AbiWordPerfectGraphicsInputStream::isStructured()
+ {
+ if (!m_ole)
+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
+
+- if (m_ole != NULL)
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
+ return true;
+
+ return false;
+ }
+
+-WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream()
++unsigned AbiWordPerfectGraphicsInputStream::subStreamCount()
+ {
+- return getDocumentOLEStream("PerfectOffice_MAIN");
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ int numChildren = gsf_infile_num_children(m_ole);
++ if (numChildren > 0)
++ return numChildren;
++ return 0;
++ }
++
++ return 0;
+ }
+
+-WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream(const char * name)
++const char * AbiWordPerfectGraphicsInputStream::subStreamName(unsigned id)
+ {
+- WPXInputStream *documentStream = NULL;
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
+
+ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ if ((int)id >= gsf_infile_num_children(m_ole))
++ {
++ return 0;
++ }
++ std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
++ if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
++ {
++ std::string name = gsf_infile_name_by_index(m_ole, (int)id);
++ i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
++ }
++ return i->second.c_str();
++ }
++
++ return 0;
++}
++
++bool AbiWordPerfectGraphicsInputStream::existsSubStream(const char * name)
++{
++ if (!m_ole)
+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
+
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
+ if (m_ole)
+ {
+ GsfInput *document = gsf_infile_child_by_name(m_ole, name);
+ if (document)
+ {
++ g_object_unref(G_OBJECT (document));
++ return true;
++ }
++ }
++
++ return false;
++}
++
++librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamByName(const char * name)
++{
++ librevenge::RVNGInputStream *documentStream = NULL;
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ GsfInput *document = gsf_infile_child_by_name(m_ole, name);
++ if (document)
++ {
+ documentStream = new AbiWordPerfectGraphicsInputStream(document);
+ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
+ }
+@@ -138,12 +213,35 @@
+ return documentStream;
+ }
+
++librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamById(unsigned id)
++{
++ librevenge::RVNGInputStream *documentStream = NULL;
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
++ if (document)
++ {
++ documentStream = new AbiWordPerfectGraphicsInputStream(document);
++ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
++ }
++ }
++
++ return documentStream;
++}
++
+ long AbiWordPerfectGraphicsInputStream::tell()
+ {
+ return gsf_input_tell(m_input);
+ }
+
+-bool AbiWordPerfectGraphicsInputStream::atEOS()
++bool AbiWordPerfectGraphicsInputStream::isEnd()
+ {
+ return gsf_input_eof(m_input);
+ }
+@@ -244,14 +342,24 @@
+ UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
+ {
+ AbiWordPerfectGraphicsInputStream gsfInput(input);
+- WPXString svgOutput;
+- if (WPGraphics::generateSVG(&gsfInput, svgOutput))
++ librevenge::RVNGString svgOutput;
++ librevenge::RVNGStringVector vec;
++ librevenge::RVNGSVGDrawingGenerator generator(vec, "");
++
++ if (!libwpg::WPGraphics::parse(&gsfInput, &generator) || vec.empty() || vec[0].empty())
+ {
+- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
+- UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
+- g_object_unref(svgInput);
+- return result;
++ return UT_ERROR;
+ }
+- return UT_ERROR;
++
++ svgOutput.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
++ svgOutput.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");
++ svgOutput.append(" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
++ svgOutput.append(vec[0]);
++ svgOutput.append("\n");
++
++ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
++ UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
++ g_object_unref(svgInput);
++ return result;
+ }
+
+--- a/plugins/wpg/plugin.m4
++++ b/plugins/wpg/plugin.m4
+@@ -1,5 +1,5 @@
+
+-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="libwpg-0.3 $gsf_req"
+ wpg_deps="no"
+
+ if test "$enable_wpg" != ""; then
+--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.h
++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.h
+@@ -30,7 +30,7 @@
+ #define IE_IMP_WP_H
+
+ #include <stdio.h>
+-#include <libwpd/libwpd.h>
++#include <librevenge-0.0/librevenge/librevenge.h>
+ #include "ie_imp.h"
+ #include "ut_string.h"
+ #include "ut_string_class.h"
+@@ -92,7 +92,7 @@
+ IE_Imp ** ppie);
+ };
+
+-class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
++class IE_Imp_WordPerfect : public IE_Imp, public librevenge::RVNGTextInterface
+ {
+ public:
+ IE_Imp_WordPerfect(PD_Document * pDocument);
+@@ -101,69 +101,83 @@
+ virtual void pasteFromBuffer(PD_DocumentRange * pDocRange,
+ UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0);
+
+- virtual void setDocumentMetaData(const WPXPropertyList &propList);
++ virtual void setDocumentMetaData(const librevenge::RVNGPropertyList &propList);
+
+- virtual void startDocument();
+- virtual void endDocument();
++ virtual void startDocument(const librevenge::RVNGPropertyList &propList);
++ virtual void endDocument();
+
+- virtual void openPageSpan(const WPXPropertyList &propList);
+- virtual void closePageSpan() {}
+- virtual void openHeader(const WPXPropertyList &propList);
+- virtual void closeHeader();
+- virtual void openFooter(const WPXPropertyList &propList);
+- virtual void closeFooter();
++ virtual void defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {}
+
+- virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+- virtual void closeParagraph() {}
++ virtual void definePageStyle(const librevenge::RVNGPropertyList &) {}
++ virtual void openPageSpan(const librevenge::RVNGPropertyList &propList);
++ virtual void closePageSpan() {}
++ virtual void openHeader(const librevenge::RVNGPropertyList &propList);
++ virtual void closeHeader();
++ virtual void openFooter(const librevenge::RVNGPropertyList &propList);
++ virtual void closeFooter();
+
+- virtual void openSpan(const WPXPropertyList &propList);
+- virtual void closeSpan() {}
++ virtual void defineSectionStyle(const librevenge::RVNGPropertyList &) {}
++ virtual void openSection(const librevenge::RVNGPropertyList &propList);
++ virtual void closeSection() {}
+
+- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
+- virtual void closeSection() {}
++ virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {}
++ virtual void openParagraph(const librevenge::RVNGPropertyList &propList);
++ virtual void closeParagraph() {}
+
+- virtual void insertTab();
+- virtual void insertText(const WPXString &text);
+- virtual void insertLineBreak();
++ virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {}
++ virtual void openSpan(const librevenge::RVNGPropertyList &propList);
++ virtual void closeSpan() {}
+
+- virtual void defineOrderedListLevel(const WPXPropertyList &propList);
+- virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
+- virtual void openOrderedListLevel(const WPXPropertyList &propList);
+- virtual void openUnorderedListLevel(const WPXPropertyList &propList);
+- virtual void closeOrderedListLevel();
+- virtual void closeUnorderedListLevel();
+- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+- virtual void closeListElement() {}
++ virtual void openLink(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void closeLink() {}
+
+- virtual void openFootnote(const WPXPropertyList &propList);
+- virtual void closeFootnote();
+- virtual void openEndnote(const WPXPropertyList &propList);
+- virtual void closeEndnote();
++ virtual void insertTab();
++ virtual void insertText(const librevenge::RVNGString &text);
++ virtual void insertSpace();
++ virtual void insertLineBreak();
++ virtual void insertField(const librevenge::RVNGPropertyList & /* propList */) {}
+
+- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
+- virtual void openTableRow(const WPXPropertyList &propList);
+- virtual void closeTableRow() {}
+- virtual void openTableCell(const WPXPropertyList &propList);
+- virtual void closeTableCell() {}
+- virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
+- virtual void closeTable();
++ virtual void openOrderedListLevel(const librevenge::RVNGPropertyList &propList);
++ virtual void openUnorderedListLevel(const librevenge::RVNGPropertyList &propList);
++ virtual void closeOrderedListLevel();
++ virtual void closeUnorderedListLevel();
++ virtual void openListElement(const librevenge::RVNGPropertyList &propList);
++ virtual void closeListElement() {}
+
+- virtual void definePageStyle(const WPXPropertyList&) {}
+- virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
+- virtual void defineCharacterStyle(const WPXPropertyList&) {}
+- virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
+- virtual void insertSpace() {}
+- virtual void insertField(const WPXString&, const WPXPropertyList&) {}
+- virtual void openComment(const WPXPropertyList&) {}
+- virtual void closeComment() {}
+- virtual void openTextBox(const WPXPropertyList&) {}
+- virtual void closeTextBox() {}
+- virtual void openFrame(const WPXPropertyList&) {}
+- virtual void closeFrame() {}
+- virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
+- virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
++ virtual void openFootnote(const librevenge::RVNGPropertyList &propList);
++ virtual void closeFootnote();
++ virtual void openEndnote(const librevenge::RVNGPropertyList &propList);
++ virtual void closeEndnote();
++ virtual void openComment(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void closeComment() {}
++ virtual void openTextBox(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void closeTextBox() {}
+
++ virtual void openTable(const librevenge::RVNGPropertyList &propList);
++ virtual void openTableRow(const librevenge::RVNGPropertyList &propList);
++ virtual void closeTableRow() {}
++ virtual void openTableCell(const librevenge::RVNGPropertyList &propList);
++ virtual void closeTableCell() {}
++ virtual void insertCoveredTableCell(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void closeTable();
+
++ virtual void openFrame(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void closeFrame() {}
++
++ virtual void openGroup(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void closeGroup() {}
++
++ virtual void defineGraphicStyle(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void drawRectangle(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void drawEllipse(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void drawPolygon(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void drawPolyline(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void drawPath(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void drawConnector(const librevenge::RVNGPropertyList & /* propList */) {}
++
++ virtual void insertBinaryObject(const librevenge::RVNGPropertyList & /* propList */) {}
++ virtual void insertEquation(const librevenge::RVNGPropertyList & /* propList */) {}
++
+ protected:
+ virtual UT_Error _loadFile(GsfInput * input);
+ UT_Error _appendSection(int numColumns, const float, const float);
+--- a/plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
++++ b/plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
+@@ -35,7 +35,6 @@
+ ABI_PLUGIN_DECLARE("WordPerfect")
+
+ static IE_Imp_WordPerfect_Sniffer * m_ImpSniffer = 0;
+-static IE_Exp_WordPerfect_Sniffer * m_ExpSniffer = 0;
+
+ #ifdef HAVE_LIBWPS
+ static IE_Imp_MSWorks_Sniffer * m_MSWorks_ImpSniffer = 0;
+@@ -49,13 +48,7 @@
+ m_ImpSniffer = new IE_Imp_WordPerfect_Sniffer ();
+ }
+
+- if (!m_ExpSniffer)
+- {
+- m_ExpSniffer = new IE_Exp_WordPerfect_Sniffer ();
+- }
+-
+ UT_ASSERT (m_ImpSniffer);
+- UT_ASSERT (m_ExpSniffer);
+
+ #ifdef HAVE_LIBWPS
+ if (!m_MSWorks_ImpSniffer)
+@@ -79,7 +72,7 @@
+ mi->usage = "No Usage";
+
+ IE_Imp::registerImporter (m_ImpSniffer);
+- //IE_Exp::registerExporter (m_ExpSniffer);
++
+ return 1;
+ }
+
+@@ -93,18 +86,11 @@
+ mi->usage = 0;
+
+ UT_ASSERT (m_ImpSniffer);
+- UT_ASSERT (m_ExpSniffer);
+
+ IE_Imp::unregisterImporter (m_ImpSniffer);
+ delete m_ImpSniffer;
+ m_ImpSniffer = 0;
+
+- /*
+- IE_Exp::unregisterExporter (m_ExpSniffer);
+- delete m_ExpSniffer;
+- m_ExpSniffer = 0;
+- */
+-
+ #ifdef HAVE_LIBWPS
+ IE_Imp::unregisterImporter (m_MSWorks_ImpSniffer);
+ delete m_MSWorks_ImpSniffer;
+--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+@@ -31,6 +31,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
++#include <map>
++#include <string>
+ #include <gsf/gsf-utils.h>
+ #include <gsf/gsf-input-memory.h>
+ #include <gsf/gsf-input-stdio.h>
+@@ -60,42 +62,47 @@
+
+ // Stream class
+
+-#include <libwpd-stream/libwpd-stream.h>
++#include <librevenge-0.0/librevenge-stream/librevenge-stream.h>
++#include <libwpd/libwpd.h>
+
+ #include <gsf/gsf-input.h>
+ #include <gsf/gsf-infile.h>
+ #include <gsf/gsf-infile-msole.h>
++#include <gsf/gsf-infile-zip.h>
+
+ #ifdef HAVE_LIBWPS
+ #include <libwps/libwps.h>
+ #endif
+
+-class AbiWordperfectInputStream : public WPXInputStream
++class AbiWordperfectInputStream : public librevenge::RVNGInputStream
+ {
+ public:
+ AbiWordperfectInputStream(GsfInput *input);
+ ~AbiWordperfectInputStream();
+
+- virtual bool isOLEStream();
+- virtual WPXInputStream * getDocumentOLEStream();
+-
+- virtual WPXInputStream * getDocumentOLEStream(const char * name);
+-
++ virtual bool isStructured();
++ virtual unsigned subStreamCount();
++ virtual const char* subStreamName(unsigned);
++ bool existsSubStream(const char*);
++ virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
++ virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+- virtual int seek(long offset, WPX_SEEK_TYPE seekType);
++ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
+ virtual long tell();
+- virtual bool atEOS();
++ virtual bool isEnd();
+
+ private:
+
+ GsfInput *m_input;
+ GsfInfile *m_ole;
++ std::map<unsigned, std::string> m_substreams;
+ };
+
+ AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
+- WPXInputStream(),
++ librevenge::RVNGInputStream(),
+ m_input(input),
+- m_ole(NULL)
++ m_ole(NULL),
++ m_substreams()
+ {
+ g_object_ref(G_OBJECT(input));
+ }
+@@ -120,50 +127,120 @@
+ return buf;
+ }
+
+-int AbiWordperfectInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
++int AbiWordperfectInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
+ {
+ GSeekType gsfSeekType = G_SEEK_SET;
+ switch(seekType)
+ {
+- case WPX_SEEK_CUR:
++ case librevenge::RVNG_SEEK_CUR:
+ gsfSeekType = G_SEEK_CUR;
+ break;
+- case WPX_SEEK_SET:
++ case librevenge::RVNG_SEEK_SET:
+ gsfSeekType = G_SEEK_SET;
+ break;
++ case librevenge::RVNG_SEEK_END:
++ gsfSeekType = G_SEEK_END;
++ break;
+ }
+
+ return gsf_input_seek(m_input, offset, gsfSeekType);
+ }
+
+-bool AbiWordperfectInputStream::isOLEStream()
++bool AbiWordperfectInputStream::isStructured()
+ {
+ if (!m_ole)
+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
+
+- if (m_ole != NULL)
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
+ return true;
+
+ return false;
+ }
+
+-WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream()
++unsigned AbiWordperfectInputStream::subStreamCount()
+ {
+- return getDocumentOLEStream("PerfectOffice_MAIN");
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ int numChildren = gsf_infile_num_children(m_ole);
++ if (numChildren > 0)
++ return numChildren;
++ return 0;
++ }
++
++ return 0;
+ }
+
+-WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream(const char * name)
++const char * AbiWordperfectInputStream::subStreamName(unsigned id)
+ {
+- WPXInputStream *documentStream = NULL;
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
+
+ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ if ((int)id >= gsf_infile_num_children(m_ole))
++ {
++ return 0;
++ }
++ std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
++ if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
++ {
++ std::string name = gsf_infile_name_by_index(m_ole, (int)id);
++ i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
++ }
++ return i->second.c_str();
++ }
++
++ return 0;
++}
++
++bool AbiWordperfectInputStream::existsSubStream(const char * name)
++{
++ if (!m_ole)
+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
+
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
+ if (m_ole)
+ {
+ GsfInput *document = gsf_infile_child_by_name(m_ole, name);
+ if (document)
+ {
++ g_object_unref(G_OBJECT (document));
++ return true;
++ }
++ }
++
++ return false;
++}
++
++librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamByName(const char * name)
++{
++ librevenge::RVNGInputStream *documentStream = NULL;
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ GsfInput *document = gsf_infile_child_by_name(m_ole, name);
++ if (document)
++ {
+ documentStream = new AbiWordperfectInputStream(document);
+ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
+ }
+@@ -172,12 +249,35 @@
+ return documentStream;
+ }
+
++librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamById(unsigned id)
++{
++ librevenge::RVNGInputStream *documentStream = NULL;
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
++
++ if (!m_ole)
++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
++
++ if (m_ole)
++ {
++ GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
++ if (document)
++ {
++ documentStream = new AbiWordperfectInputStream(document);
++ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
++ }
++ }
++
++ return documentStream;
++}
++
+ long AbiWordperfectInputStream::tell()
+ {
+ return gsf_input_tell(m_input);
+ }
+
+-bool AbiWordperfectInputStream::atEOS()
++bool AbiWordperfectInputStream::isEnd()
+ {
+ return gsf_input_eof(m_input);
+ }
+@@ -247,13 +347,13 @@
+ {
+ AbiWordperfectInputStream gsfInput(input);
+
+- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
+-
++ libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&gsfInput);
++
+ switch (confidence)
+ {
+- case WPD_CONFIDENCE_NONE:
++ case libwpd::WPD_CONFIDENCE_NONE:
+ return UT_CONFIDENCE_ZILCH;
+- case WPD_CONFIDENCE_EXCELLENT:
++ case libwpd::WPD_CONFIDENCE_EXCELLENT:
+ return UT_CONFIDENCE_PERFECT;
+ default:
+ return UT_CONFIDENCE_ZILCH;
+@@ -312,9 +412,9 @@
+ UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
+ {
+ AbiWordperfectInputStream gsfInput(input);
+- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
++ libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this), NULL);
+
+- if (error != WPD_OK)
++ if (error != libwpd::WPD_OK)
+ {
+ UT_DEBUGMSG(("AbiWordPerfect: ERROR: %i!\n", (int)error));
+ return UT_IE_IMPORTERROR;
+@@ -329,7 +429,7 @@
+ // nada
+ }
+
+-void IE_Imp_WordPerfect::setDocumentMetaData(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::setDocumentMetaData(const librevenge::RVNGPropertyList &propList)
+ {
+ if (propList["dc:author"])
+ getDoc()->setMetaDataProp(PD_META_KEY_CREATOR, propList["dc:author"]->getStr().cstr());
+@@ -339,15 +439,15 @@
+ getDoc()->setMetaDataProp(PD_META_KEY_PUBLISHER, propList["dc:publisher"]->getStr().cstr());
+ if (propList["dc:type"])
+ getDoc()->setMetaDataProp(PD_META_KEY_TYPE, propList["dc:category"]->getStr().cstr());
+- if (propList["libwpd:keywords"])
+- getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["libwpd:keywords"]->getStr().cstr());
++ if (propList["librevenge:keywords"])
++ getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["librevenge:keywords"]->getStr().cstr());
+ if (propList["dc:language"])
+ getDoc()->setMetaDataProp(PD_META_KEY_LANGUAGE, propList["dc:language"]->getStr().cstr());
+- if (propList["libwpd:abstract"])
+- getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["libwpd:abstract"]->getStr().cstr());
++ if (propList["librevenge:abstract"])
++ getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["librevenge:abstract"]->getStr().cstr());
+ }
+
+-void IE_Imp_WordPerfect::startDocument()
++void IE_Imp_WordPerfect::startDocument(const librevenge::RVNGPropertyList & /* propList */)
+ {
+ UT_DEBUGMSG(("AbiWordPerfect: startDocument\n"));
+ }
+@@ -357,7 +457,7 @@
+ UT_DEBUGMSG(("AbiWordPerfect: endDocument\n"));
+ }
+
+-void IE_Imp_WordPerfect::openPageSpan(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openPageSpan(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ UT_DEBUGMSG(("AbiWordPerfect: openPageSpan\n"));
+@@ -378,7 +478,7 @@
+
+ }
+
+-void IE_Imp_WordPerfect::openHeader(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openHeader(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ m_bHdrFtrOpenCount++;
+
+@@ -420,7 +520,7 @@
+ */
+ }
+
+-void IE_Imp_WordPerfect::openFooter(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openFooter(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ m_bHdrFtrOpenCount++;
+ // see above comments re: openHeader
+@@ -432,7 +532,7 @@
+ // see above comments re: closeHeader
+ }
+
+-void IE_Imp_WordPerfect::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
++void IE_Imp_WordPerfect::openParagraph(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ UT_DEBUGMSG(("AbiWordPerfect: openParagraph()\n"));
+@@ -478,13 +578,15 @@
+ (int)(m_topMargin*72), (int)(m_bottomMargin*72), m_leftMarginOffset, m_rightMarginOffset, m_textIndent, lineSpacing);
+ propBuffer += tmpBuffer;
+
+- if (tabStops.count() > 0) // Append the tabstop information
++ const librevenge::RVNGPropertyListVector *tabStops = propList.child("style:tab-stops");
++
++ if (tabStops && tabStops->count()) // Append the tabstop information
+ {
+ propBuffer += "; tabstops:";
+ tmpBuffer = "";
+- WPXPropertyListVector::Iter i(tabStops);
+- for (i.rewind(); i.next();)
+- {
++ librevenge::RVNGPropertyListVector::Iter i(*tabStops);
++ for (i.rewind(); i.next();)
++ {
+ propBuffer += tmpBuffer;
+ if (i()["style:position"])
+ {
+@@ -515,8 +617,8 @@
+ propBuffer += "0";
+
+ tmpBuffer = ",";
+- }
+- }
++ }
++ }
+
+
+
+@@ -543,7 +645,7 @@
+ }
+ }
+
+-void IE_Imp_WordPerfect::openSpan(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openSpan(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ UT_DEBUGMSG(("AbiWordPerfect: Appending current text properties\n"));
+@@ -614,13 +716,14 @@
+ X_CheckDocumentError(appendFmt(propsArray));
+ }
+
+-void IE_Imp_WordPerfect::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
++void IE_Imp_WordPerfect::openSection(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ UT_DEBUGMSG(("AbiWordPerfect: openSection\n"));
+
+ float marginLeft = 0.0f, marginRight = 0.0f;
+- int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
++ const librevenge::RVNGPropertyListVector *columns = propList.child("style:columns");
++ int columnsCount = ((!columns || !columns->count()) ? 1 : columns->count());
+
+ // TODO: support spaceAfter
+ if (propList["fo:start-indent"])
+@@ -647,7 +750,7 @@
+ X_CheckDocumentError(appendSpan(&ucs,1));
+ }
+
+-void IE_Imp_WordPerfect::insertText(const WPXString &text)
++void IE_Imp_WordPerfect::insertText(const librevenge::RVNGString &text)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ if (text.len())
+@@ -658,6 +761,15 @@
+ }
+ }
+
++void IE_Imp_WordPerfect::insertSpace()
++{
++ if (m_bHdrFtrOpenCount) return; // HACK
++ UT_DEBUGMSG(("AbiWordPerfect: insertSpace\n"));
++
++ UT_UCS4Char ucs = UCS_SPACE;
++ X_CheckDocumentError(appendSpan(&ucs,1));
++}
++
+ void IE_Imp_WordPerfect::insertLineBreak()
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+@@ -668,12 +780,11 @@
+ }
+
+
+-
+-void IE_Imp_WordPerfect::defineOrderedListLevel(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openOrderedListLevel(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+- UT_DEBUGMSG(("AbiWordPerfect: defineOrderedListLevel\n"));
+-
++ UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
++
+ int listID = 0, startingNumber = 0, level = 1;
+ char listType = '1';
+ UT_UTF8String textBeforeNumber, textAfterNumber;
+@@ -680,12 +791,12 @@
+ float listLeftOffset = 0.0f;
+ float listMinLabelWidth = 0.0f;
+
+- if (propList["libwpd:id"])
+- listID = propList["libwpd:id"]->getInt();
++ if (propList["librevenge:id"])
++ listID = propList["librevenge:id"]->getInt();
+ if (propList["text:start-value"])
+ startingNumber = propList["text:start-value"]->getInt();
+- if (propList["libwpd:level"])
+- level = propList["libwpd:level"]->getInt();
++ if (propList["librevenge:level"])
++ level = propList["librevenge:level"]->getInt();
+ if (propList["style:num-prefix"])
+ textBeforeNumber += propList["style:num-prefix"]->getStr().cstr();
+ if (propList["style:num-suffix"])
+@@ -716,22 +827,38 @@
+ m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
+ _updateDocumentOrderedListDefinition(m_pCurrentListDefinition, level, listType, textBeforeNumber, textAfterNumber, startingNumber);
+ }
++
++ m_iCurrentListLevel++;
+ }
+
+-void IE_Imp_WordPerfect::defineUnorderedListLevel(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::closeOrderedListLevel()
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+- UT_DEBUGMSG(("AbiWordPerfect: defineUnorderedListLevel\n"));
++ UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
++ UT_ASSERT(m_iCurrentListLevel > 0);
++
++ // every time we close a list level, the level above it is normally renumbered to start at "1"
++ // again. this code takes care of that.
++ if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
++ m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
++
++ m_iCurrentListLevel--;
++}
+
++void IE_Imp_WordPerfect::openUnorderedListLevel(const librevenge::RVNGPropertyList &propList)
++{
++ if (m_bHdrFtrOpenCount) return; // HACK
++ UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
++
+ int listID = 0, level = 1;
+- WPXString textBeforeNumber, textAfterNumber;
++ librevenge::RVNGString textBeforeNumber, textAfterNumber;
+ float listLeftOffset = 0.0f;
+ float listMinLabelWidth = 0.0f;
+
+- if (propList["libwpd:id"])
+- listID = propList["libwpd:id"]->getInt();
+- if (propList["libwpd:level"])
+- level = propList["libwpd:level"]->getInt();
++ if (propList["librevenge:id"])
++ listID = propList["librevenge:id"]->getInt();
++ if (propList["librevenge:level"])
++ level = propList["librevenge:level"]->getInt();
+ if (propList["text:space-before"])
+ listLeftOffset = propList["text:space-before"]->getDouble();
+ if (propList["text:min-label-width"])
+@@ -752,39 +879,10 @@
+ m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
+ _updateDocumentUnorderedListDefinition(m_pCurrentListDefinition, level);
+ }
+-}
+
+-//void IE_Imp_WordPerfect::openOrderedListLevel(const int listID)
+-void IE_Imp_WordPerfect::openOrderedListLevel(const WPXPropertyList & /*propList*/)
+-{
+- if (m_bHdrFtrOpenCount) return; // HACK
+- UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
+-
+ m_iCurrentListLevel++;
+ }
+
+-void IE_Imp_WordPerfect::closeOrderedListLevel()
+-{
+- if (m_bHdrFtrOpenCount) return; // HACK
+- UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
+- UT_ASSERT(m_iCurrentListLevel > 0);
+-
+- // every time we close a list level, the level above it is normally renumbered to start at "1"
+- // again. this code takes care of that.
+- if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
+- m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
+-
+- m_iCurrentListLevel--;
+-}
+-
+-void IE_Imp_WordPerfect::openUnorderedListLevel(const WPXPropertyList & /*propList*/)
+-{
+- if (m_bHdrFtrOpenCount) return; // HACK
+- UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
+-
+- m_iCurrentListLevel++;
+-}
+-
+ void IE_Imp_WordPerfect::closeUnorderedListLevel()
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+@@ -796,7 +894,7 @@
+
+ // ASSUMPTION: We assume that unordered lists will always pass a number of "0". unpredictable behaviour
+ // may result otherwise
+-void IE_Imp_WordPerfect::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector & /*tabStops*/)
++void IE_Imp_WordPerfect::openListElement(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ UT_DEBUGMSG(("AbiWordPerfect: openListElement\n"));
+@@ -885,7 +983,7 @@
+ X_CheckDocumentError(appendSpan(&ucs,1));
+ }
+
+-void IE_Imp_WordPerfect::openFootnote(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openFootnote(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+
+@@ -934,7 +1032,7 @@
+ X_CheckDocumentError(appendStrux(PTX_EndFootnote,NULL));
+ }
+
+-void IE_Imp_WordPerfect::openEndnote(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openEndnote(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ const gchar** propsArray = NULL;
+@@ -975,7 +1073,7 @@
+ X_CheckDocumentError(appendStrux(PTX_EndEndnote,NULL));
+ }
+
+-void IE_Imp_WordPerfect::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
++void IE_Imp_WordPerfect::openTable(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ // TODO: handle 'marginLeftOffset' and 'marginRightOffset'
+@@ -1000,14 +1098,18 @@
+ }
+ }
+
+- propBuffer += "table-column-props:";
+- WPXPropertyListVector::Iter i(columns);
+- for (i.rewind(); i.next();)
++ const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
++ if (columns)
+ {
+- UT_String tmpBuffer;
+- if (i()["style:column-width"])
+- UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
+- propBuffer += tmpBuffer;
++ propBuffer += "table-column-props:";
++ librevenge::RVNGPropertyListVector::Iter i(*columns);
++ for (i.rewind(); i.next();)
++ {
++ UT_String tmpBuffer;
++ if (i()["style:column-width"])
++ UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
++ propBuffer += tmpBuffer;
++ }
+ }
+
+ const gchar* propsArray[3];
+@@ -1018,7 +1120,7 @@
+ X_CheckDocumentError(appendStrux(PTX_SectionTable, propsArray));
+ }
+
+-void IE_Imp_WordPerfect::openTableRow(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openTableRow(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ UT_DEBUGMSG(("AbiWordPerfect: openRow\n"));
+@@ -1030,14 +1132,14 @@
+ m_bInCell = false;
+ }
+
+-void IE_Imp_WordPerfect::openTableCell(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openTableCell(const librevenge::RVNGPropertyList &propList)
+ {
+ if (m_bHdrFtrOpenCount) return; // HACK
+ int col =0, row = 0, colSpan = 0, rowSpan = 0;
+- if (propList["libwpd:column"])
+- col = propList["libwpd:column"]->getInt();
+- if (propList["libwpd:row"])
+- row = propList["libwpd:row"]->getInt();
++ if (propList["librevenge:column"])
++ col = propList["librevenge:column"]->getInt();
++ if (propList["librevenge:row"])
++ row = propList["librevenge:row"]->getInt();
+ if (propList["table:number-columns-spanned"])
+ colSpan = propList["table:number-columns-spanned"]->getInt();
+ if (propList["table:number-rows-spanned"])
+@@ -1247,9 +1349,9 @@
+ virtual UT_Error _loadFile(GsfInput * input)
+ {
+ AbiWordperfectInputStream gsfInput(input);
+- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
++ libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this));
+
+- if (error != WPS_OK)
++ if (error != libwps::WPS_OK)
+ {
+ UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error));
+ return UT_IE_IMPORTERROR;
+@@ -1286,13 +1388,17 @@
+ {
+ AbiWordperfectInputStream gsfInput(input);
+
+- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
++ libwps::WPSKind kind;
++ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
++
++ if (kind != libwps::WPS_TEXT)
++ confidence = libwps::WPS_CONFIDENCE_NONE;
+
+ switch (confidence)
+ {
+- case WPS_CONFIDENCE_NONE:
++ case libwps::WPS_CONFIDENCE_NONE:
+ return UT_CONFIDENCE_ZILCH;
+- case WPS_CONFIDENCE_EXCELLENT:
++ case libwps::WPS_CONFIDENCE_EXCELLENT:
+ return UT_CONFIDENCE_PERFECT;
+ default:
+ return UT_CONFIDENCE_ZILCH;
+--- a/plugins/wordperfect/xp/Makefile.am
++++ b/plugins/wordperfect/xp/Makefile.am
+@@ -6,8 +6,6 @@
+ -DABI_BUILD_VERSION=\"$(VERSION)\"
+
+ libxp_la_SOURCES = \
+- ie_exp_WordPerfect.cpp \
+- ie_exp_WordPerfect.h \
+ ie_impexp_WordPerfect.cpp \
+ ie_impexp_WordPerfect.h \
+ ie_imp_WordPerfect.cpp \
+--- a/plugins/wordperfect/xp/ie_impexp_WordPerfect.h
++++ b/plugins/wordperfect/xp/ie_impexp_WordPerfect.h
+@@ -24,7 +24,6 @@
+ */
+
+ #include "ie_imp_WordPerfect.h"
+-#include "ie_exp_WordPerfect.h"
+ #include "xap_Module.h"
+
+ #define IE_MIMETYPE_WP_51 "application/wordperfect5.1"
+--- a/plugins/wordperfect/plugin.m4
++++ b/plugins/wordperfect/plugin.m4
+@@ -1,6 +1,6 @@
+
+-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="libwpd-0.10 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.3'
+ wordperfect_deps="no"
+
+ WORDPERFECT_CFLAGS=
+@@ -29,7 +29,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"
+ ])
+
diff --git a/app-office/abiword/files/abiword-3.0.0-libwp.patch b/app-office/abiword/files/abiword-3.0.0-libwp.patch
new file mode 100644
index 00000000..9f269bd
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.0-libwp.patch
@@ -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
+
diff --git a/app-office/abiword/files/abiword-3.0.0-link-grammar-5-second.patch b/app-office/abiword/files/abiword-3.0.0-link-grammar-5-second.patch
new file mode 100644
index 00000000..d9f9cf3
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.0-link-grammar-5-second.patch
@@ -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);
diff --git a/app-office/abiword/files/abiword-3.0.1-fixwps.patch b/app-office/abiword/files/abiword-3.0.1-fixwps.patch
new file mode 100644
index 00000000..2929d5b
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.1-fixwps.patch
@@ -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"
+ ])
+
diff --git a/app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch b/app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch
new file mode 100644
index 00000000..292f681
--- /dev/null
+++ b/app-office/abiword/files/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@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/app-office/abiword/files/abiword-3.0.2-fix-installing-readme.patch b/app-office/abiword/files/abiword-3.0.2-fix-installing-readme.patch
new file mode 100644
index 00000000..34c6f4f
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.2-fix-installing-readme.patch
@@ -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 \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/
@ 2019-11-17 19:15 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2019-11-17 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 8ed8ff59a824013848788f1c592baeb090ec35c4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 19:14:58 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 19:14:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed8ff59
app-office/abiword: Add upstream patch for C++ template use
Closes: https://bugs.gentoo.org/690162
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-office/abiword/abiword-3.0.2-r2.ebuild | 4 +++
.../files/abiword-3.0.2-extern-C-template.patch | 29 ++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/app-office/abiword/abiword-3.0.2-r2.ebuild b/app-office/abiword/abiword-3.0.2-r2.ebuild
index 3f1d7150ae4..654d4c6d1ff 100644
--- a/app-office/abiword/abiword-3.0.2-r2.ebuild
+++ b/app-office/abiword/abiword-3.0.2-r2.ebuild
@@ -104,6 +104,10 @@ PATCHES=(
# https://bugzilla.abisource.com/show_bug.cgi?id=13697
"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-bool-boolean.patch
+
+ # https://gitlab.gnome.org/World/AbiWord/issues/2
+ # https://bugs.gentoo.org/690162
+ "${FILESDIR}"/${P}-extern-C-template.patch
)
src_configure() {
diff --git a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
new file mode 100644
index 00000000000..08d2d6cf4e1
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
@@ -0,0 +1,29 @@
+From b398c84c158ac96bcfc9882b42bee94b074e7fa9 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 21 Oct 2019 22:55:12 +0200
+Subject: [PATCH] Do not #include evolution-data-server with C linkage
+
+Fixes #2 https://gitlab.gnome.org/World/AbiWord/issues/2
+Fixes https://bugs.gentoo.org/690162
+---
+ src/text/ptbl/xp/pd_DocumentRDF.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+index 4568bd598..d5849f96b 100644
+--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp
++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+@@ -1879,9 +1879,7 @@ PD_RDFContact::className() const
+
+
+ #ifdef WITH_EVOLUTION_DATA_SERVER
+-extern "C" {
+- #include <libebook/libebook.h>
+-};
++#include <libebook/libebook.h>
+
+ static std::string get( EVCard* c, const char* v )
+ {
+--
+2.22.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/
@ 2020-04-13 16:44 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2020-04-13 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 186b39b11516cc6b87f4e54d939208533160a0a8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 16:44:07 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 16:44:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=186b39b1
app-office/abiword: Remove old
Closes: https://bugs.gentoo.org/629818
Closes: https://bugs.gentoo.org/690326
Closes: https://bugs.gentoo.org/700492
Closes: https://bugs.gentoo.org/700852
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-office/abiword/Manifest | 2 -
app-office/abiword/abiword-3.0.2-r3.ebuild | 168 ---------------------
.../files/abiword-3.0.2-extern-C-template.patch | 29 ----
3 files changed, 199 deletions(-)
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 565c7fbc0ce..c92d6517dae 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,3 +1 @@
-DIST abiword-3.0.2-patchset.tar.xz 11976 BLAKE2B 72acb4956543843ad445525d1f5654c63f2544933aab35a95f0ed4f49e1385c06a29a3deb5b7ba09343188e9adf8f916f0223ab6c2a037424732f5e5bffba103 SHA512 afe6f791f167b40c2fdd16f2308add67990dd1fd0856f5a96e8f486a0af2e7b67cbcde29beacd2d869508e8f98bd3fb140240480882bcd9689cbb1fba6a75743
-DIST abiword-3.0.2.tar.gz 11154333 BLAKE2B af49570ad766b0e698313a4a88f14b2370a0a230866c4e8672f56780705060dba4207d4e13358cc290fb3c1a4a6a56efa05fed1f0540f10f7572d8e717e6cd20 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
DIST abiword-3.0.4.tar.gz 11064305 BLAKE2B fda1732df0bf78f8830c5d68be18f2aec7f88b8d5bb4fe0effc31b48f03d9195a4337087154ba707a70d80bfcff38f92d7298e7b281afe2eacf000eca8dac9c4 SHA512 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
diff --git a/app-office/abiword/abiword-3.0.2-r3.ebuild b/app-office/abiword/abiword-3.0.2-r3.ebuild
deleted file mode 100644
index db0ebd4b8da..00000000000
--- a/app-office/abiword/abiword-3.0.2-r3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit 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
- https://dev.gentoo.org/~pacho/gnome/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~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
- >=x11-libs/gtk+-3.0.8:3[cups?]
- calendar? ( >=dev-libs/libical-0.46:= )
- eds? ( <gnome-extra/evolution-data-server-3.33:= )
- goffice? ( >=x11-libs/goffice-0.10.2:0.10 )
- introspection? ( >=dev-libs/gobject-introspection-1.0.0:= )
- map? ( >=media-libs/libchamplain-0.12:0.12 )
- plugins? (
- collab? (
- >=dev-libs/libxml2-2.4:2
- >=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:0 )
- !<app-office/abiword-plugins-2.8
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- >=dev-libs/boost-1.40.0
- virtual/pkgconfig
- collab? ( dev-cpp/asio )
-"
-
-PATCHES=(
- # http://bugzilla.abisource.com/show_bug.cgi?id=13842
- "${WORKDIR}"/${P}-patchset/${PN}-2.8.3-desktop.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13843
- "${WORKDIR}"/${P}-patchset/${PN}-2.6.0-boolean.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13844
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.0-librevenge.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13845
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.0-link-grammar-5-second.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13846
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.0-libwp.patch
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.1-libwps-0.4.patch
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.1-fixwps.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13847
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-installing-readme.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13841
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-nullptr-c++98.patch
-
- # http://bugzilla.abisource.com/show_bug.cgi?id=13815
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-black-drawing-regression.patch
-
- # https://bugzilla.abisource.com/show_bug.cgi?id=13907
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-smooth-scrolling.patch
-
- # https://bugzilla.abisource.com/show_bug.cgi?id=13791
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-flickering.patch
-
- # https://github.com/AbiWord/abiword/commit/bdaf0e2da72bdc9d9bb3020445fe7b1b5dd7c062
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-libical3.patch
-
- # https://bugzilla.abisource.com/show_bug.cgi?id=13697
- "${WORKDIR}"/${P}-patchset/${PN}-3.0.2-bool-boolean.patch
-
- # https://gitlab.gnome.org/World/AbiWord/issues/2
- # https://bugs.gentoo.org/690162
- "${FILESDIR}"/${P}-extern-C-template.patch
-)
-
-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)
-}
diff --git a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
deleted file mode 100644
index 08d2d6cf4e1..00000000000
--- a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b398c84c158ac96bcfc9882b42bee94b074e7fa9 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Mon, 21 Oct 2019 22:55:12 +0200
-Subject: [PATCH] Do not #include evolution-data-server with C linkage
-
-Fixes #2 https://gitlab.gnome.org/World/AbiWord/issues/2
-Fixes https://bugs.gentoo.org/690162
----
- src/text/ptbl/xp/pd_DocumentRDF.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp
-index 4568bd598..d5849f96b 100644
---- a/src/text/ptbl/xp/pd_DocumentRDF.cpp
-+++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp
-@@ -1879,9 +1879,7 @@ PD_RDFContact::className() const
-
-
- #ifdef WITH_EVOLUTION_DATA_SERVER
--extern "C" {
-- #include <libebook/libebook.h>
--};
-+#include <libebook/libebook.h>
-
- static std::string get( EVCard* c, const char* v )
- {
---
-2.22.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/
@ 2020-04-18 11:02 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2020-04-18 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 6a38810bc88dcefe0612eeafcc8e713b0026717a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 11:02:24 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 11:02:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a38810b
app-office/abiword: Add patches back
Closes: https://bugs.gentoo.org/717738
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-office/abiword/Manifest | 1 +
app-office/abiword/abiword-3.0.4.ebuild | 13 ++++--
.../abiword/files/abiword-3.0.4-enchant-2.patch | 54 ----------------------
3 files changed, 10 insertions(+), 58 deletions(-)
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index c92d6517dae..4d9271ca694 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1 +1,2 @@
+DIST abiword-3.0.4-patchset.tar.gz 9143 BLAKE2B 143faaceab5e4a295876c04e26f38506429566cb9f42b0d41dfc4e40822b3cab647b128abe71da554cc12ac977987afbad131d7220dabeb1d10a28cc34592b35 SHA512 9fcf91d28402b9353d59ffb61aaeedce9d4e1be566eac05dc89866a0b0a5d5314c9ca030234b0c6514f35baab5b96fdf8cb63cf9d1d2cbcf01bd7adee89cecaa
DIST abiword-3.0.4.tar.gz 11064305 BLAKE2B fda1732df0bf78f8830c5d68be18f2aec7f88b8d5bb4fe0effc31b48f03d9195a4337087154ba707a70d80bfcff38f92d7298e7b281afe2eacf000eca8dac9c4 SHA512 121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4
diff --git a/app-office/abiword/abiword-3.0.4.ebuild b/app-office/abiword/abiword-3.0.4.ebuild
index 3142f1c8cda..c8ab57891cf 100644
--- a/app-office/abiword/abiword-3.0.4.ebuild
+++ b/app-office/abiword/abiword-3.0.4.ebuild
@@ -7,7 +7,9 @@ inherit autotools xdg
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"
+SRC_URI="
+ http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/${P}-patchset.tar.gz"
LICENSE="GPL-2"
SLOT="2"
@@ -65,9 +67,12 @@ BDEPEND="
virtual/pkgconfig"
PATCHES=(
- # Backport of hard dep on enchant-2
- # https://gitlab.gnome.org/World/AbiWord/commit/ae05e92df5a5d6151641622c83d35a6fdba47b1f
- "${FILESDIR}"/${P}-enchant-2.patch
+ "${WORKDIR}"/patches/${PN}-2.6.0-boolean.patch
+ "${WORKDIR}"/patches/${PN}-2.8.3-desktop.patch
+ "${WORKDIR}"/patches/${PN}-3.0.0-librevenge.patch
+ "${WORKDIR}"/patches/${PN}-3.0.2-explicit-python.patch
+ "${WORKDIR}"/patches/${PN}-3.0.4-enchant-2.patch # backport
+ "${WORKDIR}"/patches/${PN}-3.0.4-pygobject.patch
)
src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.4-enchant-2.patch b/app-office/abiword/files/abiword-3.0.4-enchant-2.patch
deleted file mode 100644
index 3ded3600a2b..00000000000
--- a/app-office/abiword/files/abiword-3.0.4-enchant-2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ae05e92df5a5d6151641622c83d35a6fdba47b1f Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Fri, 22 Nov 2019 20:02:52 -0500
-Subject: [PATCH] Require enchant 2 now
-
----
- configure.ac | 2 +-
- src/af/xap/xp/enchant_checker.cpp | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f2e392f04..3e1697ced 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,7 +94,7 @@
- "
-
- # optional deps
--enchant_req='enchant >= 1.2.0'
-+enchant_req='enchant-2'
- gio_req='gio-2.0'
- goffice_req='libgoffice-0.10 >= 0.10.0'
-
---- a/src/af/xap/xp/enchant_checker.cpp
-+++ b/src/af/xap/xp/enchant_checker.cpp
-@@ -127,7 +127,7 @@
- pvSugg->addItem (ucszSugg);
- }
-
-- enchant_dict_free_suggestions (m_dict, suggestions);
-+ enchant_dict_free_string_list(m_dict, suggestions);
- }
-
- return pvSugg;
-@@ -139,7 +139,7 @@
-
- if (word && len) {
- UT_UTF8String utf8 (word, len);
-- enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
-+ enchant_dict_add(m_dict, utf8.utf8_str(), utf8.byteLength());
- return true;
- }
- return false;
-@@ -150,7 +150,7 @@
- UT_return_val_if_fail (m_dict, false);
-
- UT_UTF8String ignore (toCorrect, toCorrectLen);
-- return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
-+ return enchant_dict_is_added(m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
- }
-
- void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)
---
-2.24.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/
@ 2024-03-02 22:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-02 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 1bbdb0fc566d1ce9d924685dc186b26177055678
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 22:04:08 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 22:04:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbdb0fc
app-office/abiword: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/923394
Signed-off-by: Sam James <sam <AT> gentoo.org>
...biword-3.0.5.ebuild => abiword-3.0.5-r1.ebuild} | 3 ++-
.../abiword/files/abiword-3.0.5-libxml2-2.12.patch | 25 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/app-office/abiword/abiword-3.0.5.ebuild b/app-office/abiword/abiword-3.0.5-r1.ebuild
similarity index 98%
rename from app-office/abiword/abiword-3.0.5.ebuild
rename to app-office/abiword/abiword-3.0.5-r1.ebuild
index ff7b3097fd9b..4e942cdb2686 100644
--- a/app-office/abiword/abiword-3.0.5.ebuild
+++ b/app-office/abiword/abiword-3.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -85,6 +85,7 @@ PATCHES=(
"${WORKDIR}"/patches/${PN}-3.0.4-asio-standalone-placeholders.patch
"${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch
"${FILESDIR}"/${PN}-3.0.5-musl-lose-precision-fix.patch
+ "${FILESDIR}"/${PN}-3.0.5-libxml2-2.12.patch
)
src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch b/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch
new file mode 100644
index 000000000000..a8f82e2d844a
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.5-libxml2-2.12.patch
@@ -0,0 +1,25 @@
+https://gitlab.gnome.org/World/AbiWord/-/commit/2a06be6a10a0718f8a3d8e00c317f5042c99a467
+https://bugs.gentoo.org/923394
+
+From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Mon, 11 Dec 2023 01:55:53 +0100
+Subject: [PATCH] Fix build with libxml2 2.12
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope.
+Let’s add the correct include.
+--- a/src/af/util/xp/ut_stringbuf.cpp
++++ b/src/af/util/xp/ut_stringbuf.cpp
+@@ -26,6 +26,7 @@
+ #include <algorithm>
+
+ #include <libxml/uri.h>
++#include <libxml/xmlmemory.h>
+
+ #include <glib.h>
+
+--
+GitLab
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/
@ 2024-08-22 5:02 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2024-08-22 5:02 UTC (permalink / raw
To: gentoo-commits
commit: 02452a18f95e91923de3fbc01ca8e4ae2a2ad268
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 04:08:10 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 05:01:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02452a18
app-office/abiword: Patch a build failure with gcc-14
Closes: https://bugs.gentoo.org/922633
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-office/abiword/abiword-3.0.5-r1.ebuild | 2 ++
app-office/abiword/files/abiword-3.0.5-gcc14.patch | 12 ++++++++++++
2 files changed, 14 insertions(+)
diff --git a/app-office/abiword/abiword-3.0.5-r1.ebuild b/app-office/abiword/abiword-3.0.5-r1.ebuild
index 4e942cdb2686..f753d91ff68a 100644
--- a/app-office/abiword/abiword-3.0.5-r1.ebuild
+++ b/app-office/abiword/abiword-3.0.5-r1.ebuild
@@ -86,6 +86,8 @@ PATCHES=(
"${WORKDIR}"/patches/${PN}-3.0.4-c++17-dynamic-exception-specifications.patch
"${FILESDIR}"/${PN}-3.0.5-musl-lose-precision-fix.patch
"${FILESDIR}"/${PN}-3.0.5-libxml2-2.12.patch
+ # https://bugs.gentoo.org/922633
+ "${FILESDIR}"/${PN}-3.0.5-gcc14.patch
)
src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.5-gcc14.patch b/app-office/abiword/files/abiword-3.0.5-gcc14.patch
new file mode 100644
index 000000000000..aa0519c0d43a
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.5-gcc14.patch
@@ -0,0 +1,12 @@
+diff --git a/plugins/mathview/itex2mml/itex2MML.y b/plugins/mathview/itex2mml/itex2MML.y
+index c4e1cc5..60bc842 100644
+--- a/plugins/mathview/itex2mml/itex2MML.y
++++ b/plugins/mathview/itex2mml/itex2MML.y
+@@ -1804,6 +1804,7 @@ static void itex2MML_keep_error (const char * msg)
+ itex2MML_last_error = itex2MML_copy_escaped (msg);
+ }
+
++int itex2MML_do_html_filter (const char *, unsigned long, const int);
+ int itex2MML_html_filter (const char * buffer, unsigned long length)
+ {
+ return itex2MML_do_html_filter (buffer, length, 0);
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-22 5:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-17 19:15 [gentoo-commits] repo/gentoo:master commit in: app-office/abiword/, app-office/abiword/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-08-22 5:02 Michał Górny
2024-03-02 22:04 Sam James
2020-04-18 11:02 David Seifert
2020-04-13 16:44 David Seifert
2016-11-12 15:02 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox