Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/arduino-ctags/, dev-embedded/arduino-ctags/files/
Date: Thu, 23 Dec 2021 00:15:59
Message-Id: 1640218523.612c3d433d5cc3d78ca7f48fb9e134eaefa38b7b.sam@gentoo
1 commit: 612c3d433d5cc3d78ca7f48fb9e134eaefa38b7b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 23 00:14:46 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 23 00:15:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612c3d43
7
8 dev-embedded/arduino-ctags: update EAPI 6 -> 8, fix build
9
10 Bug: https://bugs.gentoo.org/828550
11 Thanks-to: <s.zharkoff <AT> gmail.com>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 .../arduino-ctags/arduino-ctags-20161123-r1.ebuild | 32 +++
15 ...duino-ctags-20161123-gcc-unused-attribute.patch | 225 +++++++++++++++++++++
16 2 files changed, 257 insertions(+)
17
18 diff --git a/dev-embedded/arduino-ctags/arduino-ctags-20161123-r1.ebuild b/dev-embedded/arduino-ctags/arduino-ctags-20161123-r1.ebuild
19 new file mode 100644
20 index 000000000000..64676af3c7c1
21 --- /dev/null
22 +++ b/dev-embedded/arduino-ctags/arduino-ctags-20161123-r1.ebuild
23 @@ -0,0 +1,32 @@
24 +# Copyright 1999-2021 Gentoo Authors
25 +# Distributed under the terms of the GNU General Public License v2
26 +
27 +EAPI=8
28 +
29 +MY_COMMIT_HASH="abc8fca7499f44c725122881cd380a88c37abe0e"
30 +DESCRIPTION="Arduino private fork of dev-util/ctags"
31 +HOMEPAGE="https://github.com/arduino/ctags"
32 +SRC_URI="https://github.com/arduino/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
33 +S="${WORKDIR}/ctags-${MY_COMMIT_HASH}"
34 +
35 +LICENSE="GPL-2"
36 +SLOT="0"
37 +KEYWORDS="~amd64 ~x86"
38 +
39 +PATCHES=(
40 + "${FILESDIR}"/${PN}-20161123-gcc-unused-attribute.patch
41 +)
42 +
43 +src_configure() {
44 + econf \
45 + --disable-readlib \
46 + --disable-etags \
47 + --enable-tmpdir="${EPREFIX}"/tmp
48 +}
49 +
50 +src_install() {
51 + # This package compiles into a "ctags" executable, but don't want to clash into
52 + # actually legitimate ctags implementations.
53 + mv ctags arduino-ctags
54 + dobin arduino-ctags
55 +}
56
57 diff --git a/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-gcc-unused-attribute.patch b/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-gcc-unused-attribute.patch
58 new file mode 100644
59 index 000000000000..e725e1193685
60 --- /dev/null
61 +++ b/dev-embedded/arduino-ctags/files/arduino-ctags-20161123-gcc-unused-attribute.patch
62 @@ -0,0 +1,225 @@
63 +https://bugs.gentoo.org/828550
64 +
65 +Thanks-to: <s.zharkoff@×××××.com>
66 +--- a/eiffel.c
67 ++++ b/eiffel.c
68 +@@ -807,7 +807,7 @@
69 +
70 + static boolean parseType (tokenInfo *const token);
71 +
72 +-static void parseGeneric (tokenInfo *const token, boolean declaration __unused__)
73 ++static void parseGeneric (tokenInfo *const token, boolean declaration __arduino_unused__)
74 + {
75 + unsigned int depth = 0;
76 + #ifdef TYPE_REFERENCE_TOOL
77 +--- a/general.h
78 ++++ b/general.h
79 +@@ -57,7 +57,7 @@
80 + * to prevent warnings about unused variables.
81 + */
82 + #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !defined (__GNUG__)
83 +-# define __unused__ __attribute__((unused))
84 ++# define __arduino_unused__ __attribute__ ((__unused__))
85 + # define __printf__(s,f) __attribute__((format (printf, s, f)))
86 + #else
87 + # define __unused__
88 +--- a/lregex.c
89 ++++ b/lregex.c
90 +@@ -538,11 +538,11 @@
91 + #endif /* HAVE_REGEX */
92 +
93 + extern void addTagRegex (
94 +- const langType language __unused__,
95 +- const char* const regex __unused__,
96 +- const char* const name __unused__,
97 +- const char* const kinds __unused__,
98 +- const char* const flags __unused__)
99 ++ const langType language __arduino_unused__,
100 ++ const char* const regex __arduino_unused__,
101 ++ const char* const name __arduino_unused__,
102 ++ const char* const kinds __arduino_unused__,
103 ++ const char* const flags __arduino_unused__)
104 + {
105 + #ifdef HAVE_REGEX
106 + Assert (regex != NULL);
107 +@@ -564,10 +564,10 @@
108 + }
109 +
110 + extern void addCallbackRegex (
111 +- const langType language __unused__,
112 +- const char* const regex __unused__,
113 +- const char* const flags __unused__,
114 +- const regexCallback callback __unused__)
115 ++ const langType language __arduino_unused__,
116 ++ const char* const regex __arduino_unused__,
117 ++ const char* const flags __arduino_unused__,
118 ++ const regexCallback callback __arduino_unused__)
119 + {
120 + #ifdef HAVE_REGEX
121 + Assert (regex != NULL);
122 +@@ -581,7 +581,7 @@
123 + }
124 +
125 + extern void addLanguageRegex (
126 +- const langType language __unused__, const char* const regex __unused__)
127 ++ const langType language __arduino_unused__, const char* const regex __arduino_unused__)
128 + {
129 + #ifdef HAVE_REGEX
130 + if (! regexBroken)
131 +@@ -602,7 +602,7 @@
132 + */
133 +
134 + extern boolean processRegexOption (const char *const option,
135 +- const char *const parameter __unused__)
136 ++ const char *const parameter __arduino_unused__)
137 + {
138 + boolean handled = FALSE;
139 + const char* const dash = strchr (option, '-');
140 +@@ -624,7 +624,7 @@
141 + return handled;
142 + }
143 +
144 +-extern void disableRegexKinds (const langType language __unused__)
145 ++extern void disableRegexKinds (const langType language __arduino_unused__)
146 + {
147 + #ifdef HAVE_REGEX
148 + if (language <= SetUpper && Sets [language].count > 0)
149 +@@ -639,8 +639,8 @@
150 + }
151 +
152 + extern boolean enableRegexKind (
153 +- const langType language __unused__,
154 +- const int kind __unused__, const boolean mode __unused__)
155 ++ const langType language __arduino_unused__,
156 ++ const int kind __arduino_unused__, const boolean mode __arduino_unused__)
157 + {
158 + boolean result = FALSE;
159 + #ifdef HAVE_REGEX
160 +@@ -660,7 +660,7 @@
161 + return result;
162 + }
163 +
164 +-extern void printRegexKinds (const langType language __unused__, boolean indent __unused__)
165 ++extern void printRegexKinds (const langType language __arduino_unused__, boolean indent __arduino_unused__)
166 + {
167 + #ifdef HAVE_REGEX
168 + if (language <= SetUpper && Sets [language].count > 0)
169 +--- a/lua.c
170 ++++ b/lua.c
171 +@@ -37,7 +37,7 @@
172 + */
173 +
174 + /* for debugging purposes */
175 +-static void __unused__ print_string (char *p, char *q)
176 ++static void __arduino_unused__ print_string (char *p, char *q)
177 + {
178 + for ( ; p != q; p++)
179 + fprintf (errout, "%c", *p);
180 +--- a/main.c
181 ++++ b/main.c
182 +@@ -522,7 +522,7 @@
183 + * Start up code
184 + */
185 +
186 +-extern int main (int __unused__ argc, char **argv)
187 ++extern int main (int __arduino_unused__ argc, char **argv)
188 + {
189 + cookedArgs *args;
190 + #ifdef VMS
191 +--- a/options.c
192 ++++ b/options.c
193 +@@ -731,7 +731,7 @@
194 + }
195 +
196 + static void processExcludeOption (
197 +- const char *const option __unused__, const char *const parameter)
198 ++ const char *const option __arduino_unused__, const char *const parameter)
199 + {
200 + const char *const fileName = parameter + 1;
201 + if (parameter [0] == '\0')
202 +@@ -869,7 +869,7 @@
203 + }
204 +
205 + static void processFilterTerminatorOption (
206 +- const char *const option __unused__, const char *const parameter)
207 ++ const char *const option __arduino_unused__, const char *const parameter)
208 + {
209 + freeString (&Option.filterTerminator);
210 + Option.filterTerminator = stringCopy (parameter);
211 +@@ -932,8 +932,8 @@
212 + }
213 +
214 + static void processHelpOption (
215 +- const char *const option __unused__,
216 +- const char *const parameter __unused__)
217 ++ const char *const option __arduino_unused__,
218 ++ const char *const parameter __arduino_unused__)
219 + {
220 + printProgramIdentification ();
221 + putchar ('\n');
222 +@@ -1141,8 +1141,8 @@
223 + }
224 +
225 + static void processLicenseOption (
226 +- const char *const option __unused__,
227 +- const char *const parameter __unused__)
228 ++ const char *const option __arduino_unused__,
229 ++ const char *const parameter __arduino_unused__)
230 + {
231 + printProgramIdentification ();
232 + puts ("");
233 +@@ -1168,8 +1168,8 @@
234 + }
235 +
236 + static void processListMapsOption (
237 +- const char *const __unused__ option,
238 +- const char *const __unused__ parameter)
239 ++ const char *const __arduino_unused__ option,
240 ++ const char *const __arduino_unused__ parameter)
241 + {
242 + if (parameter [0] == '\0' || strcasecmp (parameter, "all") == 0)
243 + printLanguageMaps (LANG_AUTO);
244 +@@ -1185,8 +1185,8 @@
245 + }
246 +
247 + static void processListLanguagesOption (
248 +- const char *const option __unused__,
249 +- const char *const parameter __unused__)
250 ++ const char *const option __arduino_unused__,
251 ++ const char *const parameter __arduino_unused__)
252 + {
253 + printLanguageList ();
254 + exit (0);
255 +@@ -1360,8 +1360,8 @@
256 + }
257 +
258 + static void processVersionOption (
259 +- const char *const option __unused__,
260 +- const char *const parameter __unused__)
261 ++ const char *const option __arduino_unused__,
262 ++ const char *const parameter __arduino_unused__)
263 + {
264 + printProgramIdentification ();
265 + exit (0);
266 +--- a/parse.c
267 ++++ b/parse.c
268 +@@ -376,7 +376,7 @@
269 + */
270 +
271 + extern void processLanguageDefineOption (
272 +- const char *const option, const char *const parameter __unused__)
273 ++ const char *const option, const char *const parameter __arduino_unused__)
274 + {
275 + #ifdef HAVE_REGEX
276 + if (parameter [0] == '\0')
277 +--- a/python.c
278 ++++ b/python.c
279 +@@ -135,7 +135,7 @@
280 + * extract all relevant information and create a tag.
281 + */
282 + static void makeFunctionTag (vString *const function,
283 +- vString *const parent, int is_class_parent, const char *arglist __unused__)
284 ++ vString *const parent, int is_class_parent, const char *arglist __arduino_unused__)
285 + {
286 + tagEntryInfo tag;
287 + initTagEntry (&tag, vStringValue (function));