1 |
commit: 34c26163abe49fba387f2c45eac3ba4fe73f8f45 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 11:36:08 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 29 12:31:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c26163 |
7 |
|
8 |
app-text/libabw: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
app-text/libabw/Manifest | 1 - |
13 |
.../libabw/files/libabw-0.1.1-boost-1.59.patch | 22 --------- |
14 |
...ibabw-0.1.1-dereference-before-null-check.patch | 27 ----------- |
15 |
...-0.1.1-do-not-let-AbiDocument_parse-throw.patch | 35 -------------- |
16 |
app-text/libabw/libabw-0.1.1.ebuild | 54 ---------------------- |
17 |
5 files changed, 139 deletions(-) |
18 |
|
19 |
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest |
20 |
index 24dfe74af61..907099d0d30 100644 |
21 |
--- a/app-text/libabw/Manifest |
22 |
+++ b/app-text/libabw/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a |
25 |
DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index f2e745a44d2..00000000000 |
30 |
--- a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch |
31 |
+++ /dev/null |
32 |
@@ -1,22 +0,0 @@ |
33 |
-From: David Tardon <dtardon@××××××.com> |
34 |
-Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200) |
35 |
-Subject: fix build with boost 1.59 |
36 |
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479 |
37 |
- |
38 |
-fix build with boost 1.59 |
39 |
- |
40 |
-Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23 |
41 |
---- |
42 |
- |
43 |
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am |
44 |
-index 5766f39..d12d8e2 100644 |
45 |
---- a/src/lib/Makefile.am |
46 |
-+++ b/src/lib/Makefile.am |
47 |
-@@ -26,6 +26,7 @@ generated_files = \ |
48 |
- $(top_builddir)/src/lib/tokens.h \ |
49 |
- $(top_builddir)/src/lib/tokenhash.h |
50 |
- |
51 |
-+libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED |
52 |
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@ |
53 |
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@ |
54 |
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) |
55 |
|
56 |
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 |
57 |
deleted file mode 100644 |
58 |
index 1df274afbe8..00000000000 |
59 |
--- a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch |
60 |
+++ /dev/null |
61 |
@@ -1,27 +0,0 @@ |
62 |
-From: David Tardon <dtardon@××××××.com> |
63 |
-Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100) |
64 |
-Subject: coverity#1259904 dereference before null check |
65 |
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3 |
66 |
- |
67 |
-coverity#1259904 dereference before null check |
68 |
- |
69 |
-Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e |
70 |
---- |
71 |
- |
72 |
-diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp |
73 |
-index cf914bf..426ab54 100644 |
74 |
---- a/src/lib/ABWParser.cpp |
75 |
-+++ b/src/lib/ABWParser.cpp |
76 |
-@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader) |
77 |
- void libabw::ABWParser::readM(xmlTextReaderPtr reader) |
78 |
- { |
79 |
- xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key")); |
80 |
-- m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key); |
81 |
- if (key) |
82 |
-+ { |
83 |
-+ m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key); |
84 |
- xmlFree(key); |
85 |
-+ } |
86 |
- } |
87 |
- |
88 |
- void libabw::ABWParser::readHistory(xmlTextReaderPtr reader) |
89 |
|
90 |
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 |
91 |
deleted file mode 100644 |
92 |
index 4854072bc8a..00000000000 |
93 |
--- a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch |
94 |
+++ /dev/null |
95 |
@@ -1,35 +0,0 @@ |
96 |
-From: David Tardon <dtardon@××××××.com> |
97 |
-Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100) |
98 |
-Subject: coverity#1259905 do not let AbiDocument::parse throw |
99 |
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a |
100 |
- |
101 |
-coverity#1259905 do not let AbiDocument::parse throw |
102 |
- |
103 |
-This also fixes coverity#1259906 and coverity#1259907 . |
104 |
- |
105 |
-Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790 |
106 |
---- |
107 |
- |
108 |
-diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp |
109 |
-index b8ab661..23ff750 100644 |
110 |
---- a/src/lib/AbiDocument.cpp |
111 |
-+++ b/src/lib/AbiDocument.cpp |
112 |
-@@ -110,7 +110,7 @@ is not protected |
113 |
- \return A value that indicates whether the conversion was successful and in case it |
114 |
- was not, it indicates the reason of the error |
115 |
- */ |
116 |
--ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) |
117 |
-+ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try |
118 |
- { |
119 |
- ABW_DEBUG_MSG(("AbiDocument::parse\n")); |
120 |
- if (!input) |
121 |
-@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre |
122 |
- return true; |
123 |
- return false; |
124 |
- } |
125 |
-+catch (...) |
126 |
-+{ |
127 |
-+ return false; |
128 |
-+} |
129 |
-+ |
130 |
- /* vim:set shiftwidth=2 softtabstop=2 expandtab: */ |
131 |
|
132 |
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild |
133 |
deleted file mode 100644 |
134 |
index a1015d7310f..00000000000 |
135 |
--- a/app-text/libabw/libabw-0.1.1.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,54 +0,0 @@ |
138 |
-# Copyright 1999-2018 Gentoo Foundation |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
- |
141 |
-EAPI=6 |
142 |
- |
143 |
-inherit autotools flag-o-matic |
144 |
- |
145 |
-DESCRIPTION="Library parsing abiword documents" |
146 |
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw" |
147 |
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz" |
148 |
- |
149 |
-LICENSE="MPL-2.0" |
150 |
-SLOT="0" |
151 |
-KEYWORDS="amd64 ~arm ~arm64 x86" |
152 |
-IUSE="doc static-libs" |
153 |
- |
154 |
-RDEPEND=" |
155 |
- dev-libs/librevenge |
156 |
- dev-libs/libxml2 |
157 |
- sys-libs/zlib |
158 |
-" |
159 |
-DEPEND="${RDEPEND} |
160 |
- >=dev-libs/boost-1.46 |
161 |
- sys-devel/libtool |
162 |
- virtual/pkgconfig |
163 |
- doc? ( app-doc/doxygen ) |
164 |
-" |
165 |
- |
166 |
-PATCHES=( |
167 |
- # from git master |
168 |
- "${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch" |
169 |
- "${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch" |
170 |
- "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch" |
171 |
-) |
172 |
- |
173 |
-src_prepare() { |
174 |
- default |
175 |
- eautoreconf |
176 |
-} |
177 |
- |
178 |
-src_configure() { |
179 |
- # bug 619470 |
180 |
- append-cxxflags -std=c++14 |
181 |
- |
182 |
- econf \ |
183 |
- --disable-werror \ |
184 |
- $(use_with doc docs) \ |
185 |
- $(use_enable static-libs static) |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- default |
190 |
- find "${D}" -name '*.la' -delete || die |
191 |
-} |