commit: 34c26163abe49fba387f2c45eac3ba4fe73f8f45 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue May 29 11:36:08 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue May 29 12:31:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c26163
app-text/libabw: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-text/libabw/Manifest | 1 - .../libabw/files/libabw-0.1.1-boost-1.59.patch | 22 --------- ...ibabw-0.1.1-dereference-before-null-check.patch | 27 ----------- ...-0.1.1-do-not-let-AbiDocument_parse-throw.patch | 35 -------------- app-text/libabw/libabw-0.1.1.ebuild | 54 ---------------------- 5 files changed, 139 deletions(-) diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest index 24dfe74af61..907099d0d30 100644 --- a/app-text/libabw/Manifest +++ b/app-text/libabw/Manifest @@ -1,2 +1 @@ -DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd 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 deleted file mode 100644 index f2e745a44d2..00000000000 --- a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: David Tardon <dtar...@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 deleted file mode 100644 index 1df274afbe8..00000000000 --- a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: David Tardon <dtar...@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 deleted file mode 100644 index 4854072bc8a..00000000000 --- a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: David Tardon <dtar...@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 deleted file mode 100644 index a1015d7310f..00000000000 --- a/app-text/libabw/libabw-0.1.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="Library parsing abiword documents" -HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"; -SRC_URI="https://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() { - # bug 619470 - append-cxxflags -std=c++14 - - econf \ - --disable-werror \ - $(use_with doc docs) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -}
