summaryrefslogtreecommitdiff
path: root/app-text/libabw
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /app-text/libabw
reinit the tree, so we can have metadata
Diffstat (limited to 'app-text/libabw')
-rw-r--r--app-text/libabw/Manifest8
-rw-r--r--app-text/libabw/files/libabw-0.1.1-boost-1.59.patch22
-rw-r--r--app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch27
-rw-r--r--app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch35
-rw-r--r--app-text/libabw/libabw-0.1.1.ebuild51
-rw-r--r--app-text/libabw/metadata.xml8
6 files changed, 151 insertions, 0 deletions
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
new file mode 100644
index 000000000000..1f716d71ae10
--- /dev/null
+++ b/app-text/libabw/Manifest
@@ -0,0 +1,8 @@
+AUX libabw-0.1.1-boost-1.59.patch 1077 SHA256 57da19d649ebba0ca57d89a6ec935d8c7663dc5f9070178bade9a414f0d3ac33 SHA512 436c8a855a8cdac0eeb24d7e6b7d7aeb2ca804402b6a70f793b654c2ff0d830a1b769db489f5c6f3650c5b65ea5cb8c62f4875b565f3f6cb9824b8f7d11e28da WHIRLPOOL 2afc37e8659351997060042ea5d2c117464e83bcc615c9f3e9b7ec682c49ac38eb1bf899fb6952720758769cad34b3bb54b7b3aefb214f78315db47ba5ad015a
+AUX libabw-0.1.1-dereference-before-null-check.patch 989 SHA256 bb584ed1b90f96d12e4d7b65405e7b5fdbe8920e79d05fb83d96bbb991e205a4 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694 WHIRLPOOL 33e9f4b6782838500400b6afc55edcc85eb2a46bd320d813419e5b047acd87c23366166dce6c931b1e44888eb7874d6c87aa325eef7315d08b28f12c87e81d41
+AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 SHA256 e576a9e8e9071be0cb2b203ca92f4fcf8c0a82c4c0ed7a59225c8e647ace86a8 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242 WHIRLPOOL 7f27b0f776479ded9c84ad95157f9b10abebb02a620756d83f50329889060e6aeaa0b5e18e878b565cebb9ddaa21cf297994d754fcdd81b479d76636520d2a7c
+DIST libabw-0.1.1.tar.xz 287628 SHA256 cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a WHIRLPOOL 4672c825279b20b1df92d52950eba6344d4ca99711f050069e35503b995f05fafe597706f6587d08409af3f59a64717da365e2e6101ce23665819f25ce4da9f7
+EBUILD libabw-0.1.1.ebuild 1000 SHA256 3724886f759293373d1f5064ec5dedf7e9ee45b2c50d2e25ed3893b1ff5e30f3 SHA512 b74c609ab5c4a31af35a037f0cb83f054041f8dfdde00b4bca2b142442a110c35aae886f637df56b3edc3fb408183b6e01439971d09fd18cd10245d21127560c WHIRLPOOL e3cbed6c79d6a75bc1ee7b1d83e86691d1dd754613905b828fdd6862d38a64a17122ab49150c6151608138f58c6bf76ac59d44937d1bbe26735cf9f84a03ce0f
+MISC ChangeLog 4276 SHA256 4f528d97bc4c6d46a5ffc1e0a7f325647de57b0108e36662c97091016e0e01e0 SHA512 be5cc08438df1ec1e8eb509ad27687e2ea7c04a1b3f7516117a690ebac817cfaf43217b69deb448b659e4e7920f2752d03a6ffc41f478ec17a7d4b5bbf40b5ea WHIRLPOOL b0e0e65c275ed69bd21953e0859f4ff0c6c4987660c5390fa7a0f21713c00a0e48864ddf3a0a3a190a9d82db1d5c00c68fb95f2ee46bc40af962e02a42f98a3f
+MISC ChangeLog-2015 1563 SHA256 2d1abf16adc46cb886030a3aa3feae020561fa6e1c7190640db9c6907cceca1c SHA512 b65da53e61e0e8f4bf1b61b36077444fd4547cbc77822adbecfb9dc673d770e9330c4777451469142bf3643ff8bc43378ff15e3516077f7b29bcc23a2b040a45 WHIRLPOOL 43abb12d6a02ca246e5ff61e30eb10893ab86ad05626008f343aa90aa3cfcafe54d12fa583ba93805fb00bce4dff253dfab6a91649a4f78eea32ab7cabb86288
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
new file mode 100644
index 000000000000..f2e745a44d20
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
@@ -0,0 +1,22 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200)
+Subject: fix build with boost 1.59
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479
+
+fix build with boost 1.59
+
+Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23
+---
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5766f39..d12d8e2 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -26,6 +26,7 @@ generated_files = \
+ $(top_builddir)/src/lib/tokens.h \
+ $(top_builddir)/src/lib/tokenhash.h
+
++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
new file mode 100644
index 000000000000..1df274afbe8f
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
@@ -0,0 +1,27 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
+Subject: coverity#1259904 dereference before null check
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
+
+coverity#1259904 dereference before null check
+
+Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
+---
+
+diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
+index cf914bf..426ab54 100644
+--- a/src/lib/ABWParser.cpp
++++ b/src/lib/ABWParser.cpp
+@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader)
+ void libabw::ABWParser::readM(xmlTextReaderPtr reader)
+ {
+ xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
+- m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+ if (key)
++ {
++ m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+ xmlFree(key);
++ }
+ }
+
+ void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
diff --git a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
new file mode 100644
index 000000000000..4854072bc8a0
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
@@ -0,0 +1,35 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
+Subject: coverity#1259905 do not let AbiDocument::parse throw
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
+
+coverity#1259905 do not let AbiDocument::parse throw
+
+This also fixes coverity#1259906 and coverity#1259907 .
+
+Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
+---
+
+diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
+index b8ab661..23ff750 100644
+--- a/src/lib/AbiDocument.cpp
++++ b/src/lib/AbiDocument.cpp
+@@ -110,7 +110,7 @@ is not protected
+ \return A value that indicates whether the conversion was successful and in case it
+ was not, it indicates the reason of the error
+ */
+-ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface)
++ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try
+ {
+ ABW_DEBUG_MSG(("AbiDocument::parse\n"));
+ if (!input)
+@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
+ return true;
+ return false;
+ }
++catch (...)
++{
++ return false;
++}
++
+ /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
new file mode 100644
index 000000000000..c98a1ac1d581
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+ dev-libs/librevenge
+ dev-libs/libxml2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.46
+ sys-devel/libtool
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ # from git master
+ "${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
+ "${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
+ "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-werror \
+ $(use_with doc docs) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libabw/metadata.xml b/app-text/libabw/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libabw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
+</pkgmetadata>