1 |
commit: 337f0097753cf1c23aadd57dff1a561f6c66f3ed |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Sun May 5 02:09:12 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 5 19:04:01 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337f0097 |
7 |
|
8 |
dev-libs/protobuf-c: Delete old version (1.3.0-r1). |
9 |
|
10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
.../files/protobuf-c-1.3.0-protobuf-3.6.patch | 202 --------------------- |
14 |
...-c-1.3.0-restore-protobuf-2-compatibility.patch | 33 ---- |
15 |
dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild | 45 ----- |
16 |
3 files changed, 280 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch b/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch |
19 |
deleted file mode 100644 |
20 |
index d6d8ffe9325..00000000000 |
21 |
--- a/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch |
22 |
+++ /dev/null |
23 |
@@ -1,202 +0,0 @@ |
24 |
-https://github.com/protobuf-c/protobuf-c/pull/309 |
25 |
-https://github.com/protobuf-c/protobuf-c/pull/328 |
26 |
- |
27 |
---- /protoc-c/c_field.cc |
28 |
-+++ /protoc-c/c_field.cc |
29 |
-@@ -189,7 +189,7 @@ |
30 |
- FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor) |
31 |
- : descriptor_(descriptor), |
32 |
- field_generators_( |
33 |
-- new scoped_ptr<FieldGenerator>[descriptor->field_count()]) { |
34 |
-+ new std::unique_ptr<FieldGenerator>[descriptor->field_count()]) { |
35 |
- // Construct all the FieldGenerators. |
36 |
- for (int i = 0; i < descriptor->field_count(); i++) { |
37 |
- field_generators_[i].reset(MakeGenerator(descriptor->field(i))); |
38 |
---- /protoc-c/c_field.h |
39 |
-+++ /protoc-c/c_field.h |
40 |
-@@ -117,7 +117,7 @@ |
41 |
- |
42 |
- private: |
43 |
- const Descriptor* descriptor_; |
44 |
-- scoped_array<scoped_ptr<FieldGenerator> > field_generators_; |
45 |
-+ std::unique_ptr<std::unique_ptr<FieldGenerator>[] > field_generators_; |
46 |
- |
47 |
- static FieldGenerator* MakeGenerator(const FieldDescriptor* field); |
48 |
- |
49 |
---- /protoc-c/c_file.cc |
50 |
-+++ /protoc-c/c_file.cc |
51 |
-@@ -83,13 +83,13 @@ |
52 |
- const string& dllexport_decl) |
53 |
- : file_(file), |
54 |
- message_generators_( |
55 |
-- new scoped_ptr<MessageGenerator>[file->message_type_count()]), |
56 |
-+ new std::unique_ptr<MessageGenerator>[file->message_type_count()]), |
57 |
- enum_generators_( |
58 |
-- new scoped_ptr<EnumGenerator>[file->enum_type_count()]), |
59 |
-+ new std::unique_ptr<EnumGenerator>[file->enum_type_count()]), |
60 |
- service_generators_( |
61 |
-- new scoped_ptr<ServiceGenerator>[file->service_count()]), |
62 |
-+ new std::unique_ptr<ServiceGenerator>[file->service_count()]), |
63 |
- extension_generators_( |
64 |
-- new scoped_ptr<ExtensionGenerator>[file->extension_count()]) { |
65 |
-+ new std::unique_ptr<ExtensionGenerator>[file->extension_count()]) { |
66 |
- |
67 |
- for (int i = 0; i < file->message_type_count(); i++) { |
68 |
- message_generators_[i].reset( |
69 |
---- /protoc-c/c_file.h |
70 |
-+++ /protoc-c/c_file.h |
71 |
-@@ -98,13 +98,13 @@ |
72 |
- private: |
73 |
- const FileDescriptor* file_; |
74 |
- |
75 |
-- scoped_array<scoped_ptr<MessageGenerator> > message_generators_; |
76 |
-- scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; |
77 |
-- scoped_array<scoped_ptr<ServiceGenerator> > service_generators_; |
78 |
-- scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; |
79 |
-+ std::unique_ptr<std::unique_ptr<MessageGenerator>[] > message_generators_; |
80 |
-+ std::unique_ptr<std::unique_ptr<EnumGenerator>[] > enum_generators_; |
81 |
-+ std::unique_ptr<std::unique_ptr<ServiceGenerator>[] > service_generators_; |
82 |
-+ std::unique_ptr<std::unique_ptr<ExtensionGenerator>[] > extension_generators_; |
83 |
- |
84 |
- // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. |
85 |
-- vector<string> package_parts_; |
86 |
-+ std::vector<string> package_parts_; |
87 |
- |
88 |
- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); |
89 |
- }; |
90 |
---- /protoc-c/c_generator.cc |
91 |
-+++ /protoc-c/c_generator.cc |
92 |
-@@ -80,13 +80,13 @@ |
93 |
- // "foo=bar,baz,qux=corge" |
94 |
- // parses to the pairs: |
95 |
- // ("foo", "bar"), ("baz", ""), ("qux", "corge") |
96 |
--void ParseOptions(const string& text, vector<pair<string, string> >* output) { |
97 |
-- vector<string> parts; |
98 |
-+void ParseOptions(const string& text, std::vector<std::pair<string, string> >* output) { |
99 |
-+ std::vector<string> parts; |
100 |
- SplitStringUsing(text, ",", &parts); |
101 |
- |
102 |
- for (unsigned i = 0; i < parts.size(); i++) { |
103 |
- string::size_type equals_pos = parts[i].find_first_of('='); |
104 |
-- pair<string, string> value; |
105 |
-+ std::pair<string, string> value; |
106 |
- if (equals_pos == string::npos) { |
107 |
- value.first = parts[i]; |
108 |
- value.second = ""; |
109 |
-@@ -105,7 +105,7 @@ |
110 |
- const string& parameter, |
111 |
- OutputDirectory* output_directory, |
112 |
- string* error) const { |
113 |
-- vector<pair<string, string> > options; |
114 |
-+ std::vector<std::pair<string, string> > options; |
115 |
- ParseOptions(parameter, &options); |
116 |
- |
117 |
- // ----------------------------------------------------------------- |
118 |
-@@ -149,7 +149,7 @@ |
119 |
- |
120 |
- // Generate header. |
121 |
- { |
122 |
-- scoped_ptr<io::ZeroCopyOutputStream> output( |
123 |
-+ std::unique_ptr<io::ZeroCopyOutputStream> output( |
124 |
- output_directory->Open(basename + ".h")); |
125 |
- io::Printer printer(output.get(), '$'); |
126 |
- file_generator.GenerateHeader(&printer); |
127 |
-@@ -157,7 +157,7 @@ |
128 |
- |
129 |
- // Generate cc file. |
130 |
- { |
131 |
-- scoped_ptr<io::ZeroCopyOutputStream> output( |
132 |
-+ std::unique_ptr<io::ZeroCopyOutputStream> output( |
133 |
- output_directory->Open(basename + ".c")); |
134 |
- io::Printer printer(output.get(), '$'); |
135 |
- file_generator.GenerateSource(&printer); |
136 |
---- /protoc-c/c_helpers.cc |
137 |
-+++ /protoc-c/c_helpers.cc |
138 |
-@@ -177,7 +177,7 @@ |
139 |
- } |
140 |
- |
141 |
- string FullNameToLower(const string &full_name) { |
142 |
-- vector<string> pieces; |
143 |
-+ std::vector<string> pieces; |
144 |
- SplitStringUsing(full_name, ".", &pieces); |
145 |
- string rv = ""; |
146 |
- for (unsigned i = 0; i < pieces.size(); i++) { |
147 |
-@@ -188,7 +188,7 @@ |
148 |
- return rv; |
149 |
- } |
150 |
- string FullNameToUpper(const string &full_name) { |
151 |
-- vector<string> pieces; |
152 |
-+ std::vector<string> pieces; |
153 |
- SplitStringUsing(full_name, ".", &pieces); |
154 |
- string rv = ""; |
155 |
- for (unsigned i = 0; i < pieces.size(); i++) { |
156 |
-@@ -199,7 +199,7 @@ |
157 |
- return rv; |
158 |
- } |
159 |
- string FullNameToC(const string &full_name) { |
160 |
-- vector<string> pieces; |
161 |
-+ std::vector<string> pieces; |
162 |
- SplitStringUsing(full_name, ".", &pieces); |
163 |
- string rv = ""; |
164 |
- for (unsigned i = 0; i < pieces.size(); i++) { |
165 |
-@@ -214,7 +214,7 @@ |
166 |
- { |
167 |
- if (!comment.empty()) |
168 |
- { |
169 |
-- vector<string> comment_lines; |
170 |
-+ std::vector<string> comment_lines; |
171 |
- SplitStringUsing (comment, "\r\n", &comment_lines); |
172 |
- printer->Print ("/*\n"); |
173 |
- for (int i = 0; i < comment_lines.size(); i++) |
174 |
-@@ -503,8 +503,8 @@ |
175 |
- |
176 |
- void SplitStringUsing(const string& full, |
177 |
- const char* delim, |
178 |
-- vector<string>* result) { |
179 |
-- std::back_insert_iterator< vector<string> > it(*result); |
180 |
-+ std::vector<string>* result) { |
181 |
-+ std::back_insert_iterator< std::vector<string> > it(*result); |
182 |
- SplitStringToIteratorUsing(full, delim, it); |
183 |
- } |
184 |
- |
185 |
-@@ -559,7 +559,7 @@ |
186 |
- } |
187 |
- string CEscape(const string& src) { |
188 |
- const int dest_length = src.size() * 4 + 1; // Maximum possible expansion |
189 |
-- scoped_array<char> dest(new char[dest_length]); |
190 |
-+ std::unique_ptr<char[]> dest(new char[dest_length]); |
191 |
- const int len = CEscapeInternal(src.data(), src.size(), |
192 |
- dest.get(), dest_length, false); |
193 |
- GOOGLE_DCHECK_GE(len, 0); |
194 |
---- /protoc-c/c_message.cc |
195 |
-+++ /protoc-c/c_message.cc |
196 |
-@@ -83,11 +83,11 @@ |
197 |
- : descriptor_(descriptor), |
198 |
- dllexport_decl_(dllexport_decl), |
199 |
- field_generators_(descriptor), |
200 |
-- nested_generators_(new scoped_ptr<MessageGenerator>[ |
201 |
-+ nested_generators_(new std::unique_ptr<MessageGenerator>[ |
202 |
- descriptor->nested_type_count()]), |
203 |
-- enum_generators_(new scoped_ptr<EnumGenerator>[ |
204 |
-+ enum_generators_(new std::unique_ptr<EnumGenerator>[ |
205 |
- descriptor->enum_type_count()]), |
206 |
-- extension_generators_(new scoped_ptr<ExtensionGenerator>[ |
207 |
-+ extension_generators_(new std::unique_ptr<ExtensionGenerator>[ |
208 |
- descriptor->extension_count()]) { |
209 |
- |
210 |
- for (int i = 0; i < descriptor->nested_type_count(); i++) { |
211 |
---- /protoc-c/c_message.h |
212 |
-+++ /protoc-c/c_message.h |
213 |
-@@ -126,9 +126,9 @@ |
214 |
- const Descriptor* descriptor_; |
215 |
- string dllexport_decl_; |
216 |
- FieldGeneratorMap field_generators_; |
217 |
-- scoped_array<scoped_ptr<MessageGenerator> > nested_generators_; |
218 |
-- scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; |
219 |
-- scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; |
220 |
-+ std::unique_ptr<std::unique_ptr<MessageGenerator>[] > nested_generators_; |
221 |
-+ std::unique_ptr<std::unique_ptr<EnumGenerator>[] > enum_generators_; |
222 |
-+ std::unique_ptr<std::unique_ptr<ExtensionGenerator>[] > extension_generators_; |
223 |
- |
224 |
- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); |
225 |
- }; |
226 |
|
227 |
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.3.0-restore-protobuf-2-compatibility.patch b/dev-libs/protobuf-c/files/protobuf-c-1.3.0-restore-protobuf-2-compatibility.patch |
228 |
deleted file mode 100644 |
229 |
index 962341b6540..00000000000 |
230 |
--- a/dev-libs/protobuf-c/files/protobuf-c-1.3.0-restore-protobuf-2-compatibility.patch |
231 |
+++ /dev/null |
232 |
@@ -1,33 +0,0 @@ |
233 |
-From 4302266b45303094616685c7997a6e6015ddadba Mon Sep 17 00:00:00 2001 |
234 |
-From: Robert Edmonds <edmonds@××××××××××××××××××××.com> |
235 |
-Date: Mon, 7 Aug 2017 12:31:55 -0400 |
236 |
-Subject: [PATCH] Restore protobuf-2.x compatibility |
237 |
- |
238 |
-The change in commit 712154b912de824741381c0bb26c2fbed54515a3 ("Bump |
239 |
-minimum required header version for proto3 syntax") uses functionality |
240 |
-only exposed by protobuf-3.x, breaking the build when compiling against |
241 |
-protobuf-2.x. |
242 |
- |
243 |
-Since we still want to support building against protobuf-2.x, this |
244 |
-commit makes the proto3 syntax check in the file generator dependent on |
245 |
-building against protobuf-3.x. |
246 |
---- |
247 |
- protoc-c/c_file.cc | 2 ++ |
248 |
- 1 file changed, 2 insertions(+) |
249 |
- |
250 |
-diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc |
251 |
-index 9851768..0f1d770 100644 |
252 |
---- a/protoc-c/c_file.cc |
253 |
-+++ b/protoc-c/c_file.cc |
254 |
-@@ -120,9 +120,11 @@ void FileGenerator::GenerateHeader(io::Printer* printer) { |
255 |
- string filename_identifier = FilenameIdentifier(file_->name()); |
256 |
- |
257 |
- int min_header_version = 1000000; |
258 |
-+#if defined(HAVE_PROTO3) |
259 |
- if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) { |
260 |
- min_header_version = 1003000; |
261 |
- } |
262 |
-+#endif |
263 |
- |
264 |
- // Generate top of header. |
265 |
- printer->Print( |
266 |
|
267 |
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild |
268 |
deleted file mode 100644 |
269 |
index bed34d3628b..00000000000 |
270 |
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild |
271 |
+++ /dev/null |
272 |
@@ -1,45 +0,0 @@ |
273 |
-# Copyright 1999-2018 Gentoo Foundation |
274 |
-# Distributed under the terms of the GNU General Public License v2 |
275 |
- |
276 |
-EAPI=6 |
277 |
- |
278 |
-inherit autotools multilib-minimal |
279 |
- |
280 |
-MY_PV="${PV/_/-}" |
281 |
-MY_P="${PN}-${MY_PV}" |
282 |
- |
283 |
-DESCRIPTION="Protocol Buffers implementation in C" |
284 |
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c" |
285 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" |
286 |
- |
287 |
-LICENSE="BSD-2" |
288 |
-# Subslot == SONAME version |
289 |
-SLOT="0/1.0.0" |
290 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86" |
291 |
-IUSE="static-libs test" |
292 |
- |
293 |
-RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]" |
294 |
-DEPEND="${RDEPEND} |
295 |
- virtual/pkgconfig[${MULTILIB_USEDEP}]" |
296 |
- |
297 |
-PATCHES=( |
298 |
- "${FILESDIR}/${P}-restore-protobuf-2-compatibility.patch" |
299 |
- "${FILESDIR}/${P}-protobuf-3.6.patch" |
300 |
-) |
301 |
- |
302 |
-S="${WORKDIR}/${MY_P}" |
303 |
- |
304 |
-src_prepare() { |
305 |
- default |
306 |
- if ! use test; then |
307 |
- eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch |
308 |
- fi |
309 |
- |
310 |
- eautoreconf |
311 |
-} |
312 |
- |
313 |
-multilib_src_configure() { |
314 |
- ECONF_SOURCE="${S}" \ |
315 |
- econf \ |
316 |
- $(use_enable static-libs static) |
317 |
-} |