1 |
commit: b15007dc57e6cd1415be28339e0d31b3c179e2b6 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 14 00:31:17 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 14 00:35:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15007dc |
7 |
|
8 |
dev-libs/log4cxx: drop 0.10.0-r1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/790056 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
dev-libs/log4cxx/Manifest | 1 - |
14 |
.../log4cxx/files/log4cxx-0.10.0-fix-c++14.patch | 100 --------------------- |
15 |
dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch | 12 --- |
16 |
.../files/log4cxx-0.10.0-missing_includes.patch | 37 -------- |
17 |
.../log4cxx/files/log4cxx-0.10.0-unixODBC.patch | 75 ---------------- |
18 |
dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild | 65 -------------- |
19 |
6 files changed, 290 deletions(-) |
20 |
|
21 |
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest |
22 |
index a4d520b5750..672c69d34f7 100644 |
23 |
--- a/dev-libs/log4cxx/Manifest |
24 |
+++ b/dev-libs/log4cxx/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37 |
27 |
DIST apache-log4cxx-0.11.0.tar.gz 1145075 BLAKE2B 786f3374923a5d47172bdaba7edb1725bedc766cb310b7b1237cfcc2fdd84cf2e390b47d55284ad0ce65631798e545523723090f4c0f7ab262f6cbe41a03e327 SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd |
28 |
|
29 |
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-fix-c++14.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-fix-c++14.patch |
30 |
deleted file mode 100644 |
31 |
index 86ebdcccd5b..00000000000 |
32 |
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-fix-c++14.patch |
33 |
+++ /dev/null |
34 |
@@ -1,100 +0,0 @@ |
35 |
-Fix building with C++14, which errors out due to narrowing conversions. |
36 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593874 |
37 |
- |
38 |
---- a/src/main/cpp/locationinfo.cpp |
39 |
-+++ b/src/main/cpp/locationinfo.cpp |
40 |
-@@ -153,8 +153,8 @@ |
41 |
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, |
42 |
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, |
43 |
- 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, |
44 |
-- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, |
45 |
-- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, |
46 |
-+ 0x6E, 0x49, 0x6E, 0x66, 0x6F, (char)0xED, (char)0x99, (char)0xBB, |
47 |
-+ (char)0xE1, 0x4A, (char)0x91, (char)0xA5, 0x7C, 0x02, 0x00, 0x01, |
48 |
- 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, |
49 |
- 0x6E, 0x66, 0x6F, |
50 |
- 0x74, 0x00, 0x12, 0x4C, 0x6A, |
51 |
---- a/src/main/cpp/loggingevent.cpp |
52 |
-+++ b/src/main/cpp/loggingevent.cpp |
53 |
-@@ -242,7 +242,7 @@ |
54 |
- 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, |
55 |
- 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, |
56 |
- 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, |
57 |
-- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, |
58 |
-+ 0x74, (char)0xF3, (char)0xF2, (char)0xB9, 0x23, 0x74, 0x0B, (char)0xB5, |
59 |
- 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, |
60 |
- 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, |
61 |
- 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, |
62 |
---- a/src/main/cpp/objectoutputstream.cpp |
63 |
-+++ b/src/main/cpp/objectoutputstream.cpp |
64 |
-@@ -36,7 +36,7 @@ |
65 |
- objectHandle(0x7E0000), |
66 |
- classDescriptions(new ClassDescriptionMap()) |
67 |
- { |
68 |
-- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; |
69 |
-+ char start[] = { (char)0xAC, (char)0xED, 0x00, 0x05 }; |
70 |
- ByteBuffer buf(start, sizeof(start)); |
71 |
- os->write(buf, p); |
72 |
- } |
73 |
-@@ -85,7 +85,7 @@ |
74 |
- 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, |
75 |
- 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, |
76 |
- 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, |
77 |
-- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, |
78 |
-+ (char)0xBB, 0x0F, 0x25, 0x21, 0x4A, (char)0xE4, (char)0xB8, 0x03, |
79 |
- 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, |
80 |
- 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, |
81 |
- 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, |
82 |
---- a/src/main/cpp/synchronized.cpp |
83 |
-+++ b/src/main/cpp/synchronized.cpp |
84 |
-@@ -38,6 +38,9 @@ |
85 |
- } |
86 |
- |
87 |
- synchronized::~synchronized() |
88 |
-+#if __cplusplus >= 201103L |
89 |
-+ noexcept(false) |
90 |
-+#endif |
91 |
- { |
92 |
- #if APR_HAS_THREADS |
93 |
- apr_status_t stat = apr_thread_mutex_unlock( |
94 |
---- a/src/main/include/log4cxx/helpers/synchronized.h |
95 |
-+++ b/src/main/include/log4cxx/helpers/synchronized.h |
96 |
-@@ -29,7 +29,11 @@ |
97 |
- { |
98 |
- public: |
99 |
- synchronized(const Mutex& mutex); |
100 |
-- ~synchronized(); |
101 |
-+ ~synchronized() |
102 |
-+#if __cplusplus >= 201103L |
103 |
-+ noexcept(false) |
104 |
-+#endif |
105 |
-+; |
106 |
- |
107 |
- |
108 |
- private: |
109 |
---- a/src/test/cpp/xml/domtestcase.cpp |
110 |
-+++ b/src/test/cpp/xml/domtestcase.cpp |
111 |
-@@ -190,9 +190,9 @@ |
112 |
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); |
113 |
- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); |
114 |
- #if LOG4CXX_LOGCHAR_IS_UTF8 |
115 |
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; |
116 |
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 }; |
117 |
- #else |
118 |
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; |
119 |
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xB3, 0 }; |
120 |
- #endif |
121 |
- File file; |
122 |
- file.setPath(fname); |
123 |
-@@ -209,9 +209,9 @@ |
124 |
- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); |
125 |
- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); |
126 |
- #if LOG4CXX_LOGCHAR_IS_UTF8 |
127 |
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; |
128 |
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 }; |
129 |
- #else |
130 |
-- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; |
131 |
-+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0x3195, 0 }; |
132 |
- #endif |
133 |
- File file; |
134 |
- file.setPath(fname); |
135 |
|
136 |
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch |
137 |
deleted file mode 100644 |
138 |
index 854d34a1749..00000000000 |
139 |
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-gcc44.patch |
140 |
+++ /dev/null |
141 |
@@ -1,12 +0,0 @@ |
142 |
-Fix for gcc-4.4 |
143 |
---- apache-log4cxx-0.10.0-orig/src/examples/cpp/console.cpp 2009-06-12 13:01:06.000000000 +0200 |
144 |
-+++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp 2009-06-12 13:07:05.000000000 +0200 |
145 |
-@@ -15,6 +15,7 @@ |
146 |
- * limitations under the License. |
147 |
- */ |
148 |
- |
149 |
-+#include <cstdio> |
150 |
- #include <cstdlib> |
151 |
- #include <cstring> |
152 |
- #include <log4cxx/logger.h> |
153 |
- |
154 |
|
155 |
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-missing_includes.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-missing_includes.patch |
156 |
deleted file mode 100644 |
157 |
index 78a57916bde..00000000000 |
158 |
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-missing_includes.patch |
159 |
+++ /dev/null |
160 |
@@ -1,37 +0,0 @@ |
161 |
-diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp |
162 |
---- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200 |
163 |
-+++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200 |
164 |
-@@ -15,7 +15,8 @@ |
165 |
- * limitations under the License. |
166 |
- */ |
167 |
- |
168 |
--#include <stdlib.h> |
169 |
-+#include <cstdlib> |
170 |
-+#include <cstring> |
171 |
- #include <log4cxx/logger.h> |
172 |
- #include <log4cxx/consoleappender.h> |
173 |
- #include <log4cxx/simplelayout.h> |
174 |
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp |
175 |
---- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200 |
176 |
-+++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200 |
177 |
-@@ -21,6 +21,8 @@ |
178 |
- #include <log4cxx/helpers/pool.h> |
179 |
- #include <log4cxx/helpers/bytebuffer.h> |
180 |
- |
181 |
-+#include <cstring> |
182 |
-+ |
183 |
- using namespace log4cxx; |
184 |
- using namespace log4cxx::helpers; |
185 |
- |
186 |
-diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp |
187 |
---- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200 |
188 |
-+++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200 |
189 |
-@@ -20,6 +20,8 @@ |
190 |
- #include <log4cxx/helpers/socket.h> |
191 |
- #include <log4cxx/helpers/bytebuffer.h> |
192 |
- |
193 |
-+#include <cstring> |
194 |
-+ |
195 |
- using namespace log4cxx; |
196 |
- using namespace log4cxx::helpers; |
197 |
- |
198 |
|
199 |
diff --git a/dev-libs/log4cxx/files/log4cxx-0.10.0-unixODBC.patch b/dev-libs/log4cxx/files/log4cxx-0.10.0-unixODBC.patch |
200 |
deleted file mode 100644 |
201 |
index cedca2ccdf4..00000000000 |
202 |
--- a/dev-libs/log4cxx/files/log4cxx-0.10.0-unixODBC.patch |
203 |
+++ /dev/null |
204 |
@@ -1,75 +0,0 @@ |
205 |
-http://issues.apache.org/jira/browse/LOGCXX-299 |
206 |
-http://bugs.gentoo.org/show_bug.cgi?id=254920 |
207 |
- |
208 |
-diff -ur apache-log4cxx-0.10.0.orig/src/main/cpp/odbcappender.cpp apache-log4cxx-0.10.0/src/main/cpp/odbcappender.cpp |
209 |
---- apache-log4cxx-0.10.0.orig/src/main/cpp/odbcappender.cpp 2008-04-01 01:34:09.000000000 +0300 |
210 |
-+++ apache-log4cxx-0.10.0/src/main/cpp/odbcappender.cpp 2010-02-24 14:39:37.000000000 +0200 |
211 |
-@@ -167,7 +167,8 @@ |
212 |
- throw SQLException( SQL_HANDLE_DBC, con, "Failed to allocate sql handle.", p); |
213 |
- } |
214 |
- |
215 |
-- SQLWCHAR* wsql = Transcoder::wencode(sql, p); |
216 |
-+ SQLWCHAR* wsql; |
217 |
-+ encode(&wsql, sql, p); |
218 |
- ret = SQLExecDirectW(stmt, wsql, SQL_NTS); |
219 |
- |
220 |
- if (ret < 0) |
221 |
-@@ -237,9 +238,10 @@ |
222 |
- } |
223 |
- |
224 |
- |
225 |
-- SQLWCHAR* wURL = Transcoder::wencode(databaseURL, p); |
226 |
-+ SQLWCHAR* wURL; |
227 |
-+ encode(&wURL, databaseURL, p); |
228 |
- |
229 |
-- wchar_t szOutConnectionString[1024]; |
230 |
-+ SQLWCHAR szOutConnectionString[1024]; |
231 |
- SQLSMALLINT nOutConnctionLength = 0; |
232 |
- |
233 |
- ret = SQLDriverConnectW( connection, NULL, |
234 |
-@@ -331,3 +333,31 @@ |
235 |
- } |
236 |
- } |
237 |
- } |
238 |
-+ |
239 |
-+void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p) { |
240 |
-+ *dest = Transcoder::wencode(src, p); |
241 |
-+} |
242 |
-+ |
243 |
-+void ODBCAppender::encode(unsigned short** dest, |
244 |
-+ const LogString& src, Pool& p) { |
245 |
-+ // worst case double number of characters from UTF-8 or wchar_t |
246 |
-+ *dest = (unsigned short*) |
247 |
-+ p.palloc((src.size() + 1) * 2 * sizeof(unsigned short)); |
248 |
-+ unsigned short* current = *dest; |
249 |
-+ for(LogString::const_iterator i = src.begin(); |
250 |
-+ i != src.end();) { |
251 |
-+ unsigned int sv = Transcoder::decode(src, i); |
252 |
-+ if (sv < 0x10000) { |
253 |
-+ *current++ = (unsigned short) sv; |
254 |
-+ } else { |
255 |
-+ unsigned char u = (unsigned char) (sv >> 16); |
256 |
-+ unsigned char w = (unsigned char) (u - 1); |
257 |
-+ unsigned short hs = (0xD800 + ((w & 0xF) << 6) + ((sv & 0xFFFF) >> 10)); |
258 |
-+ unsigned short ls = (0xDC00 + (sv && 0x3FF)); |
259 |
-+ *current++ = (unsigned short) hs; |
260 |
-+ *current++ = (unsigned short) ls; |
261 |
-+ } |
262 |
-+ } |
263 |
-+ *current = 0; |
264 |
-+} |
265 |
-+ |
266 |
-diff -ur apache-log4cxx-0.10.0.orig/src/main/include/log4cxx/db/odbcappender.h apache-log4cxx-0.10.0/src/main/include/log4cxx/db/odbcappender.h |
267 |
---- apache-log4cxx-0.10.0.orig/src/main/include/log4cxx/db/odbcappender.h 2008-04-01 01:34:09.000000000 +0300 |
268 |
-+++ apache-log4cxx-0.10.0/src/main/include/log4cxx/db/odbcappender.h 2010-02-24 14:39:39.000000000 +0200 |
269 |
-@@ -279,6 +279,10 @@ |
270 |
- private: |
271 |
- ODBCAppender(const ODBCAppender&); |
272 |
- ODBCAppender& operator=(const ODBCAppender&); |
273 |
-+ static void encode(wchar_t** dest, const LogString& src, |
274 |
-+ log4cxx::helpers::Pool& p); |
275 |
-+ static void encode(unsigned short** dest, const LogString& src, |
276 |
-+ log4cxx::helpers::Pool& p); |
277 |
- }; // class ODBCAppender |
278 |
- LOG4CXX_PTR_DEF(ODBCAppender); |
279 |
- |
280 |
|
281 |
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild |
282 |
deleted file mode 100644 |
283 |
index adc8b749d16..00000000000 |
284 |
--- a/dev-libs/log4cxx/log4cxx-0.10.0-r1.ebuild |
285 |
+++ /dev/null |
286 |
@@ -1,65 +0,0 @@ |
287 |
-# Copyright 1999-2020 Gentoo Authors |
288 |
-# Distributed under the terms of the GNU General Public License v2 |
289 |
- |
290 |
-EAPI=7 |
291 |
- |
292 |
-MY_P=apache-${P} |
293 |
- |
294 |
-DESCRIPTION="Library of C++ classes for logging to files, syslog and other destinations" |
295 |
-HOMEPAGE="https://logging.apache.org/log4cxx/" |
296 |
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz" |
297 |
- |
298 |
-LICENSE="Apache-2.0" |
299 |
-SLOT="0" |
300 |
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos" |
301 |
-IUSE="iodbc unicode odbc smtp" |
302 |
-# test suite fails |
303 |
-RESTRICT="test" |
304 |
- |
305 |
-RDEPEND=" |
306 |
- dev-libs/apr:1 |
307 |
- dev-libs/apr-util:1 |
308 |
- odbc? ( |
309 |
- iodbc? ( >=dev-db/libiodbc-3.52.4 ) |
310 |
- !iodbc? ( dev-db/unixODBC ) |
311 |
- ) |
312 |
- smtp? ( net-libs/libesmtp )" |
313 |
-DEPEND="${RDEPEND}" |
314 |
- |
315 |
-S="${WORKDIR}/${MY_P}" |
316 |
- |
317 |
-HTML_DOCS=( site/. ) |
318 |
-PATCHES=( |
319 |
- "${FILESDIR}"/${PN}-0.10.0-missing_includes.patch |
320 |
- "${FILESDIR}"/${PN}-0.10.0-gcc44.patch |
321 |
- "${FILESDIR}"/${PN}-0.10.0-unixODBC.patch |
322 |
- "${FILESDIR}"/${PN}-0.10.0-fix-c++14.patch |
323 |
-) |
324 |
- |
325 |
-pkg_setup() { |
326 |
- if use iodbc && ! use odbc; then |
327 |
- elog "Please enable the odbc USE-flag as well if you want odbc-support through iodbc." |
328 |
- fi |
329 |
-} |
330 |
- |
331 |
-src_configure() { |
332 |
- econf \ |
333 |
- --disable-static \ |
334 |
- --disable-doxygen \ |
335 |
- --disable-html-docs \ |
336 |
- --with-apr-util="${ESYSROOT}"/usr \ |
337 |
- $(use_with smtp SMTP libesmtp) \ |
338 |
- $(use_with odbc ODBC $(usex iodbc iODBC unixODBC)) \ |
339 |
- --with-charset=$(usex unicode utf-8 auto) |
340 |
-} |
341 |
- |
342 |
-src_install() { |
343 |
- default |
344 |
- |
345 |
- docinto examples |
346 |
- dodoc src/examples/cpp/*.cpp |
347 |
- docompress -x /usr/share/doc/${PF}/examples |
348 |
- |
349 |
- # package provides .pc files |
350 |
- find "${ED}" -name '*.la' -delete || die |
351 |
-} |