pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

arduino-ctags: patching __unused__ and __printf__ macros



Module Name:	pkgsrc-wip
Committed By:	Chris Lasocki <krz.lasocki%gmail.com@localhost>
Pushed By:	klasocki
Date:		Mon Mar 25 18:44:03 2019 +0000
Changeset:	3c3e85b80c82584ce641abbad7d07960b7a2391a

Modified Files:
	arduino-ctags/distinfo
Added Files:
	arduino-ctags/patches/patch-c.c
	arduino-ctags/patches/patch-eiffel.c
	arduino-ctags/patches/patch-general.h
	arduino-ctags/patches/patch-lregex.c
	arduino-ctags/patches/patch-lua.c
	arduino-ctags/patches/patch-main.c
	arduino-ctags/patches/patch-options.c
	arduino-ctags/patches/patch-parse.c
	arduino-ctags/patches/patch-python.c
	arduino-ctags/patches/patch-routines.c

Log Message:
arduino-ctags: patching __unused__ and __printf__ macros

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3c3e85b80c82584ce641abbad7d07960b7a2391a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 arduino-ctags/distinfo                 | 60 ++++++++++++++++++++++++
 arduino-ctags/patches/patch-c.c        | 22 +++++++++
 arduino-ctags/patches/patch-eiffel.c   | 13 ++++++
 arduino-ctags/patches/patch-general.h  | 20 ++++++++
 arduino-ctags/patches/patch-lregex.c   | 83 ++++++++++++++++++++++++++++++++++
 arduino-ctags/patches/patch-lua.c      | 13 ++++++
 arduino-ctags/patches/patch-main.c     | 13 ++++++
 arduino-ctags/patches/patch-options.c  | 77 +++++++++++++++++++++++++++++++
 arduino-ctags/patches/patch-parse.c    | 13 ++++++
 arduino-ctags/patches/patch-python.c   | 13 ++++++
 arduino-ctags/patches/patch-routines.c | 13 ++++++
 11 files changed, 340 insertions(+)

diffs:
diff --git a/arduino-ctags/distinfo b/arduino-ctags/distinfo
index 33ad4cdbc7..8d1bf43a08 100644
--- a/arduino-ctags/distinfo
+++ b/arduino-ctags/distinfo
@@ -4,3 +4,63 @@ SHA1 (ctags-5.8-arduino11.zip) = 10d483cd6085431b349c6b5827e48aee6619c327
 RMD160 (ctags-5.8-arduino11.zip) = a4bc68c4ff05129f463fb17d2319239afc805a5d
 SHA512 (ctags-5.8-arduino11.zip) = c52ec982e843ab1b489168258619bb87825f7c413ea1c15389db6449572d30403199c840b1c0391b20387b3e22e9bffaaea8b11f4b124160b1fea9112f7c8aad
 Size (ctags-5.8-arduino11.zip) = 561013 bytes
+SHA1 (patch-ant.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-argproc.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-args.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-asm.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-asp.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-awk.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-basic.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-beta.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-c.c) = b4b8ca5c9a1004731b42bbcd68eb4d4ece642eb1
+SHA1 (patch-cobol.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ctags-utils.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-debug.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-dosbatch.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-eiffel.c) = 3a3ddeff8d43f4c5ec28cd23720305615716f88f
+SHA1 (patch-entry.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-erlang.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-falcon.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-flex.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-fortran.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-general.h) = 33073c44c01c89101323f3f55346c63eba516c2c
+SHA1 (patch-get.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-gir.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-html.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-jscript.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-keyword.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-lisp.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-lregex.c) = d2893d5d9d4bcccd3e16d7684f0b5ad1b095d4b4
+SHA1 (patch-lua.c) = e346b751c83d1661d1315031c8e25cf3df3f3c5d
+SHA1 (patch-mac.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-main.c) = db5567f5499a340825d8fede941a5733f92a9681
+SHA1 (patch-make.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-matlab.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ocaml.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-options.c) = bfe6647b2234f5777b42e303fa3cb9c527b2b44a
+SHA1 (patch-parse.c) = d6e2d773dc024d2b63918745a1dd838c98cd8da0
+SHA1 (patch-pascal.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-perl.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-php.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-python.c) = 6b1df1a558ed50aca1d67d7296f68146904f84d3
+SHA1 (patch-qdos.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-read.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-readtags.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-rexx.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-routines.c) = ea44717b9c94319cc57eb4c2dba8d61003d888b8
+SHA1 (patch-ruby.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-scheme.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-sh.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-slang.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-sml.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-sort.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-sql.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-strlist.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-tcl.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-tex.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-vala.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-verilog.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-vhdl.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-vim.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-vstring.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-yacc.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
diff --git a/arduino-ctags/patches/patch-c.c b/arduino-ctags/patches/patch-c.c
new file mode 100644
index 0000000000..4d5f5279f9
--- /dev/null
+++ b/arduino-ctags/patches/patch-c.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- c.c.orig	2019-03-25 18:42:04.893874209 +0000
++++ c.c
+@@ -624,7 +624,7 @@ static const char *keywordString (const 
+ 	return name;
+ }
+ 
+-static void __unused__ pt (tokenInfo *const token)
++static void CTAGS_UNUSED pt (tokenInfo *const token)
+ {
+ 	if (isType (token, TOKEN_NAME))
+ 		printf ("type: %-12s: %-13s   line: %lu\n",
+@@ -639,7 +639,7 @@ static void __unused__ pt (tokenInfo *co
+ 			tokenString (token->type), token->lineNumber);
+ }
+ 
+-static void __unused__ ps (statementInfo *const st)
++static void CTAGS_UNUSED ps (statementInfo *const st)
+ {
+ 	unsigned int i;
+ 	printf ("scope: %s   decl: %s   gotName: %s   gotParenName: %s isPointer: %s\n",
diff --git a/arduino-ctags/patches/patch-eiffel.c b/arduino-ctags/patches/patch-eiffel.c
new file mode 100644
index 0000000000..ba8830e5f5
--- /dev/null
+++ b/arduino-ctags/patches/patch-eiffel.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- eiffel.c.orig	2019-03-25 18:42:04.901095628 +0000
++++ eiffel.c
+@@ -807,7 +807,7 @@ static void findKeyword (tokenInfo *cons
+ 
+ static boolean parseType (tokenInfo *const token);
+ 
+-static void parseGeneric (tokenInfo *const token, boolean declaration __unused__)
++static void parseGeneric (tokenInfo *const token, boolean declaration CTAGS_UNUSED)
+ {
+ 	unsigned int depth = 0;
+ #ifdef TYPE_REFERENCE_TOOL
diff --git a/arduino-ctags/patches/patch-general.h b/arduino-ctags/patches/patch-general.h
new file mode 100644
index 0000000000..4e4596b0ee
--- /dev/null
+++ b/arduino-ctags/patches/patch-general.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- general.h.orig	2016-11-23 09:52:52.000000000 +0000
++++ general.h
+@@ -57,11 +57,11 @@
+  *  to prevent warnings about unused variables.
+  */
+ #if (__GNUC__ > 2  ||  (__GNUC__ == 2  &&  __GNUC_MINOR__ >= 7)) && !defined (__GNUG__)
+-# define __unused__  __attribute__((unused))
+-# define __printf__(s,f)  __attribute__((format (printf, s, f)))
++# define CTAGS_UNUSED __attribute__((unused))
++# define CTAGS_PRINTF(s,f)  __attribute__((format (printf, s, f)))
+ #else
+-# define __unused__
+-# define __printf__(s,f)
++# define CTAGS_UNUSED
++# define CTAGS_PRINTF(s,f)
+ #endif
+ 
+ /*
diff --git a/arduino-ctags/patches/patch-lregex.c b/arduino-ctags/patches/patch-lregex.c
new file mode 100644
index 0000000000..0371398f14
--- /dev/null
+++ b/arduino-ctags/patches/patch-lregex.c
@@ -0,0 +1,83 @@
+$NetBSD$
+
+--- lregex.c.orig	2019-03-25 18:42:04.917758680 +0000
++++ lregex.c
+@@ -538,11 +538,11 @@ extern void findRegexTags (void)
+ #endif  /* HAVE_REGEX */
+ 
+ extern void addTagRegex (
+-		const langType language __unused__,
+-		const char* const regex __unused__,
+-		const char* const name __unused__,
+-		const char* const kinds __unused__,
+-		const char* const flags __unused__)
++		const langType language CTAGS_UNUSED,
++		const char* const regex CTAGS_UNUSED,
++		const char* const name CTAGS_UNUSED,
++		const char* const kinds CTAGS_UNUSED,
++		const char* const flags CTAGS_UNUSED)
+ {
+ #ifdef HAVE_REGEX
+ 	Assert (regex != NULL);
+@@ -564,10 +564,10 @@ extern void addTagRegex (
+ }
+ 
+ extern void addCallbackRegex (
+-		const langType language __unused__,
+-		const char* const regex __unused__,
+-		const char* const flags __unused__,
+-		const regexCallback callback __unused__)
++		const langType language CTAGS_UNUSED,
++		const char* const regex CTAGS_UNUSED,
++		const char* const flags CTAGS_UNUSED,
++		const regexCallback callback CTAGS_UNUSED)
+ {
+ #ifdef HAVE_REGEX
+ 	Assert (regex != NULL);
+@@ -581,7 +581,7 @@ extern void addCallbackRegex (
+ }
+ 
+ extern void addLanguageRegex (
+-		const langType language __unused__, const char* const regex __unused__)
++		const langType language CTAGS_UNUSED, const char* const regex CTAGS_UNUSED)
+ {
+ #ifdef HAVE_REGEX
+ 	if (! regexBroken)
+@@ -602,7 +602,7 @@ extern void addLanguageRegex (
+ */
+ 
+ extern boolean processRegexOption (const char *const option,
+-								   const char *const parameter __unused__)
++								   const char *const parameter CTAGS_UNUSED)
+ {
+ 	boolean handled = FALSE;
+ 	const char* const dash = strchr (option, '-');
+@@ -624,7 +624,7 @@ extern boolean processRegexOption (const
+ 	return handled;
+ }
+ 
+-extern void disableRegexKinds (const langType language __unused__)
++extern void disableRegexKinds (const langType language CTAGS_UNUSED)
+ {
+ #ifdef HAVE_REGEX
+ 	if (language <= SetUpper  &&  Sets [language].count > 0)
+@@ -639,8 +639,8 @@ extern void disableRegexKinds (const lan
+ }
+ 
+ extern boolean enableRegexKind (
+-		const langType language __unused__,
+-		const int kind __unused__, const boolean mode __unused__)
++		const langType language CTAGS_UNUSED,
++		const int kind CTAGS_UNUSED, const boolean mode CTAGS_UNUSED)
+ {
+ 	boolean result = FALSE;
+ #ifdef HAVE_REGEX
+@@ -660,7 +660,7 @@ extern boolean enableRegexKind (
+ 	return result;
+ }
+ 
+-extern void printRegexKinds (const langType language __unused__, boolean indent __unused__)
++extern void printRegexKinds (const langType language CTAGS_UNUSED, boolean indent CTAGS_UNUSED)
+ {
+ #ifdef HAVE_REGEX
+ 	if (language <= SetUpper  &&  Sets [language].count > 0)
diff --git a/arduino-ctags/patches/patch-lua.c b/arduino-ctags/patches/patch-lua.c
new file mode 100644
index 0000000000..c82c349483
--- /dev/null
+++ b/arduino-ctags/patches/patch-lua.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lua.c.orig	2019-03-25 18:42:04.919108182 +0000
++++ lua.c
+@@ -37,7 +37,7 @@ static kindOption LuaKinds [] = {
+ */
+ 
+ /* for debugging purposes */
+-static void __unused__ print_string (char *p, char *q)
++static void CTAGS_UNUSED print_string (char *p, char *q)
+ {
+ 	for ( ; p != q; p++)
+ 		fprintf (errout, "%c", *p);
diff --git a/arduino-ctags/patches/patch-main.c b/arduino-ctags/patches/patch-main.c
new file mode 100644
index 0000000000..4431b8ad05
--- /dev/null
+++ b/arduino-ctags/patches/patch-main.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- main.c.orig	2019-03-25 18:42:04.921900823 +0000
++++ main.c
+@@ -522,7 +522,7 @@ static void makeTags (cookedArgs *args)
+  *		Start up code
+  */
+ 
+-extern int main (int __unused__ argc, char **argv)
++extern int main (int CTAGS_UNUSED argc, char **argv)
+ {
+ 	cookedArgs *args;
+ #ifdef VMS
diff --git a/arduino-ctags/patches/patch-options.c b/arduino-ctags/patches/patch-options.c
new file mode 100644
index 0000000000..872461c2e6
--- /dev/null
+++ b/arduino-ctags/patches/patch-options.c
@@ -0,0 +1,77 @@
+$NetBSD$
+
+--- options.c.orig	2019-03-25 18:42:04.927352569 +0000
++++ options.c
+@@ -731,7 +731,7 @@ static void processEtagsInclude (
+ }
+ 
+ static void processExcludeOption (
+-		const char *const option __unused__, const char *const parameter)
++		const char *const option CTAGS_UNUSED, const char *const parameter)
+ {
+ 	const char *const fileName = parameter + 1;
+ 	if (parameter [0] == '\0')
+@@ -869,7 +869,7 @@ static void processFieldsOption (
+ }
+ 
+ static void processFilterTerminatorOption (
+-		const char *const option __unused__, const char *const parameter)
++		const char *const option CTAGS_UNUSED, const char *const parameter)
+ {
+ 	freeString (&Option.filterTerminator);
+ 	Option.filterTerminator = stringCopy (parameter);
+@@ -932,8 +932,8 @@ static void printProgramIdentification (
+ }
+ 
+ static void processHelpOption (
+-		const char *const option __unused__,
+-		const char *const parameter __unused__)
++		const char *const option CTAGS_UNUSED,
++		const char *const parameter CTAGS_UNUSED)
+ {
+ 	printProgramIdentification ();
+ 	putchar ('\n');
+@@ -1141,8 +1141,8 @@ static void processLanguagesOption (
+ }
+ 
+ static void processLicenseOption (
+-		const char *const option __unused__,
+-		const char *const parameter __unused__)
++		const char *const option CTAGS_UNUSED,
++		const char *const parameter CTAGS_UNUSED)
+ {
+ 	printProgramIdentification ();
+ 	puts ("");
+@@ -1168,8 +1168,8 @@ static void processListKindsOption (
+ }
+ 
+ static void processListMapsOption (
+-		const char *const __unused__ option,
+-		const char *const __unused__ parameter)
++		const char *const CTAGS_UNUSED option,
++		const char *const CTAGS_UNUSED parameter)
+ {
+ 	if (parameter [0] == '\0' || strcasecmp (parameter, "all") == 0)
+ 	    printLanguageMaps (LANG_AUTO);
+@@ -1185,8 +1185,8 @@ static void processListMapsOption (
+ }
+ 
+ static void processListLanguagesOption (
+-		const char *const option __unused__,
+-		const char *const parameter __unused__)
++		const char *const option CTAGS_UNUSED,
++		const char *const parameter CTAGS_UNUSED)
+ {
+ 	printLanguageList ();
+ 	exit (0);
+@@ -1360,8 +1360,8 @@ static void processIgnoreOption (const c
+ }
+ 
+ static void processVersionOption (
+-		const char *const option __unused__,
+-		const char *const parameter __unused__)
++		const char *const option CTAGS_UNUSED,
++		const char *const parameter CTAGS_UNUSED)
+ {
+ 	printProgramIdentification ();
+ 	exit (0);
diff --git a/arduino-ctags/patches/patch-parse.c b/arduino-ctags/patches/patch-parse.c
new file mode 100644
index 0000000000..75ea2caaf1
--- /dev/null
+++ b/arduino-ctags/patches/patch-parse.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- parse.c.orig	2019-03-25 18:42:04.929085191 +0000
++++ parse.c
+@@ -376,7 +376,7 @@ extern void freeParserResources (void)
+ */
+ 
+ extern void processLanguageDefineOption (
+-		const char *const option, const char *const parameter __unused__)
++		const char *const option, const char *const parameter CTAGS_UNUSED)
+ {
+ #ifdef HAVE_REGEX
+ 	if (parameter [0] == '\0')
diff --git a/arduino-ctags/patches/patch-python.c b/arduino-ctags/patches/patch-python.c
new file mode 100644
index 0000000000..0195b3a5e6
--- /dev/null
+++ b/arduino-ctags/patches/patch-python.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- python.c.orig	2019-03-25 18:42:04.934404064 +0000
++++ python.c
+@@ -135,7 +135,7 @@ static boolean isIdentifierCharacter (in
+  * extract all relevant information and create a tag.
+  */
+ static void makeFunctionTag (vString *const function,
+-	vString *const parent, int is_class_parent, const char *arglist __unused__)
++	vString *const parent, int is_class_parent, const char *arglist CTAGS_UNUSED)
+ {
+ 	tagEntryInfo tag;
+ 	initTagEntry (&tag, vStringValue (function));
diff --git a/arduino-ctags/patches/patch-routines.c b/arduino-ctags/patches/patch-routines.c
new file mode 100644
index 0000000000..f2f98ddbb9
--- /dev/null
+++ b/arduino-ctags/patches/patch-routines.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- routines.c.orig	2019-03-25 18:42:04.941126183 +0000
++++ routines.c
+@@ -526,7 +526,7 @@ static boolean isPathSeparator (const in
+ 
+ #if ! defined (HAVE_STAT_ST_INO)
+ 
+-static void canonicalizePath (char *const path __unused__)
++static void canonicalizePath (char *const path CTAGS_UNUSED)
+ {
+ #if defined (MSDOS_STYLE_PATH)
+ 	char *p;


Home | Main Index | Thread Index | Old Index