From 66712113a8fe61cc7737948f150c98e2c40891a68b1c87b0275ca3d2a84fc73c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 13 Nov 2007 20:47:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ctags?expand=0&rev=6 --- ctags-ycp-parser.diff | 15 +++++-------- ctags.changes | 5 +++++ ctags.spec | 15 ++++++++----- etags-17.26.tar.bz2 | 3 --- etags-17.26.diff => etags-17.34.diff | 33 +++++++++------------------- etags-17.34.tar.gz | 3 +++ 6 files changed, 32 insertions(+), 42 deletions(-) delete mode 100644 etags-17.26.tar.bz2 rename etags-17.26.diff => etags-17.34.diff (86%) create mode 100644 etags-17.34.tar.gz diff --git a/ctags-ycp-parser.diff b/ctags-ycp-parser.diff index 989d43c..e3e95af 100644 --- a/ctags-ycp-parser.diff +++ b/ctags-ycp-parser.diff @@ -1,10 +1,5 @@ ---- - c.c | 327 +++++++++++++++++++++++++++++++++++++++----------------------- - parsers.h | 3 - 2 files changed, 210 insertions(+), 120 deletions(-) - ---- a/c.c -+++ b/c.c +--- c.c ++++ c.c @@ -59,35 +59,39 @@ typedef enum eException { */ typedef enum eKeywordId { @@ -211,8 +206,8 @@ + /* keyword keyword ID | | | | | | */ + { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0, 0 } }, + { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0, 0 } }, -+ { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, + { "any", KEYWORD_ANY, { 0, 0, 0, 0, 0, 1 } }, ++ { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, + { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1, 0 } }, + { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1, 0 } }, + { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0 } }, @@ -482,8 +477,8 @@ +} + /* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ ---- a/parsers.h -+++ b/parsers.h +--- parsers.h ++++ parsers.h @@ -49,7 +49,8 @@ VeraParser, \ VerilogParser, \ diff --git a/ctags.changes b/ctags.changes index 60f8b5e..fc96050 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 13 14:22:21 CET 2007 - schwab@suse.de + +- Update etags from Emacs trunk. + ------------------------------------------------------------------- Mon Nov 12 21:43:02 CET 2007 - bwalle@suse.de diff --git a/ctags.spec b/ctags.spec index 1b5c86c..eaa1ae2 100644 --- a/ctags.spec +++ b/ctags.spec @@ -1,5 +1,5 @@ # -# spec file for package ctags (Version 2007.11.12) +# spec file for package ctags (Version 2007.11.13) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,13 +15,13 @@ License: GPL v2 or later Group: Development/Tools/Navigators AutoReqProv: on %define exuberant_ver 5.7 -%define emacs_ver 17.26 -Version: 2007.11.12 +%define emacs_ver 17.34 +Version: 2007.11.13 Release: 1 Summary: A Program to Generate Tag Files for Use with vi and Other Editors Url: http://ctags.sourceforge.net/ Source0: ftp://ftp.sourceforge.net/pub/sourceforge/c/ct/ctags/ctags-%{exuberant_ver}.tar.bz2 -Source1: etags-%{emacs_ver}.tar.bz2 +Source1: etags-%{emacs_ver}.tar.gz Source2: README.SuSE Patch0: ctags-%{exuberant_ver}.diff Patch1: ctags-ycp-parser.diff @@ -48,7 +48,7 @@ Authors: %prep %setup -n ctags-%{exuberant_ver} -b 1 %patch -%patch1 -p1 +%patch1 cd ../etags-%{emacs_ver} %patch2 @@ -60,7 +60,7 @@ export CFLAGS CC make cd ../etags-%{emacs_ver} CFLAGS="$CFLAGS -I../ctags-%{exuberant_ver}" -CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DHAVE_UNISTD_H -DHAVE_GETCWD -DVERSION=\"%{emacs_ver}\"" +CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DHAVE_UNISTD_H -DHAVE_GETCWD" $CC $CFLAGS -o etags etags.c $CC $CFLAGS -DCTAGS -o gnuctags etags.c @@ -73,6 +73,7 @@ cd ../etags-%{emacs_ver} install -m 755 etags gnuctags $RPM_BUILD_ROOT/usr/bin install -m 644 etags.1 $RPM_BUILD_ROOT%{_mandir}/man1 ln -sf etags.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/gnuctags.1.gz +install -m 644 ETAGS.README $RPM_BUILD_ROOT%{_docdir}/ctags %clean rm -rf $RPM_BUILD_ROOT @@ -87,6 +88,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/etags.1.gz %{_docdir}/ctags %changelog +* Tue Nov 13 2007 - schwab@suse.de +- Update etags from Emacs trunk. * Mon Nov 12 2007 - bwalle@suse.de - update to ctags 5.7 * Added support for DIM AS [Freebasic] diff --git a/etags-17.26.tar.bz2 b/etags-17.26.tar.bz2 deleted file mode 100644 index e96b5d8..0000000 --- a/etags-17.26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:091f9b2004d9cdc2775517cf6c173b7a997026157e3d66ce560eb42b389c4b82 -size 48171 diff --git a/etags-17.26.diff b/etags-17.34.diff similarity index 86% rename from etags-17.26.diff rename to etags-17.34.diff index 84079e8..988583b 100644 --- a/etags-17.26.diff +++ b/etags-17.34.diff @@ -9,7 +9,7 @@ .SH SYNOPSIS .hy 0 .na -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ etags, ctags \- generate tag file for Em [\|\-\-help\|] [\|\-\-version\|] \fIfile\fP .\|.\|. @@ -18,7 +18,7 @@ .if n .br [\|\-o \fItagfile\fP\|] [\|\-r \fIregexp\fP\|] [\|\-\-parse\-stdin=\fIfile\fP\|] -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ etags, ctags \- generate tag file for Em The \|\fBetags\fP\| program is used to create a tag table file, in a format understood by .BR emacs ( 1 )\c @@ -27,7 +27,7 @@ format understood by .BR vi ( 1 )\c \&. Both forms of the program understand -@@ -56,7 +56,7 @@ +@@ -56,7 +56,7 @@ Python, Prolog, Scheme and most assembler\-like syntaxes. Both forms read the files specified on the command line, and write a tag table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for @@ -36,7 +36,7 @@ Files specified with relative file names will be recorded in the tag table with file names relative to the directory where the tag table resides. If the tag table is in /dev, however, the file names are made -@@ -71,7 +71,7 @@ +@@ -71,7 +71,7 @@ parsing of the file names following the language, overriding guesses based on filename extensions. .SH OPTIONS Some options make sense only for the \fBvi\fP style tag files produced @@ -45,7 +45,7 @@ \fBetags\fP does not recognize them. The programs accept unambiguous abbreviations for long option names. .TP -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ expression search instructions; the \fB\ the delimiter `\|\fB?\fP\|', to search \fIbackwards\fP through files. The default is to use the delimiter `\|\fB/\fP\|', to search \fIforwards\fP through files. @@ -54,7 +54,7 @@ .TP .B \-\-declarations In C and derived languages, create tags for function declarations, -@@ -94,24 +94,24 @@ +@@ -94,24 +94,24 @@ and create tags for extern variables unl .B \-d, \-\-defines Create tag entries for C preprocessor constant definitions and enum constants, too. Since this is the default behavior of @@ -83,7 +83,7 @@ \fBetags\fP accepts this option. .TP \fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ the previous ones. The regexps are of o where \fItagregexp\fP is used to match the tag. It should not match useless characters. If the match is such that more characters than needed are unavoidably matched by \fItagregexp\fP, it may be useful to @@ -92,16 +92,7 @@ ignores regexps without a \fInameregexp\fP. The syntax of regexps is the same as in emacs. The following character escape sequences are supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which -@@ -224,7 +224,7 @@ - - .br - A regexp can be preceded by {\fIlang\fP}, thus restricting it to match --lines of files of the specified language. Use \fBetags --help\fP to obtain -+lines of files of the specified language. Use \fBetags \-\-help\fP to obtain - a list of the recognised languages. This feature is particularly useful inside - \fBregex files\fP. A regex file contains one regex per line. Empty lines, - and those lines beginning with space or tab are ignored. Lines beginning -@@ -243,12 +243,12 @@ +@@ -243,12 +243,12 @@ freely intermixed with filenames and the .TP .B \-t, \-\-typedefs Record typedefs in C code as tags. Since this is the default behavior @@ -116,7 +107,7 @@ .TP .B \-u, \-\-update Update tag entries for \fIfiles\fP specified on command line, leaving -@@ -256,11 +256,11 @@ +@@ -256,15 +256,15 @@ tag entries for other files in place. C by deleting the existing entries for the given files and then rewriting the new entries at the end of the tags file. It is often faster to simply rebuild the entire tag file than to use this. @@ -127,10 +118,6 @@ Instead of generating a tag file, write index (in \fBvgrind\fP format) -to standard output. Only \fBctags\fP accepts this option. +to standard output. Only \fBgnuctags\fP accepts this option. - .TP - .B \-w, \-\-no\-warn - Suppress warning messages about duplicate entries. The \fBetags\fP -@@ -269,7 +269,7 @@ .TP .B \-x, \-\-cxref Instead of generating a tag file, write a cross reference (in @@ -139,7 +126,7 @@ .TP .B \-h, \-H, \-\-help Print usage information. Followed by one or more \-\-language=LANG -@@ -283,8 +283,10 @@ +@@ -278,8 +278,10 @@ emacs \fBetags\fP is shipped with). `\|\fBemacs\fP\|' entry in \fBinfo\fP; \fIGNU Emacs Manual\fP, Richard Stallman. .br diff --git a/etags-17.34.tar.gz b/etags-17.34.tar.gz new file mode 100644 index 0000000..66af641 --- /dev/null +++ b/etags-17.34.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:172b24bbe692dcb9f22b2cd1759e4c36932df0132ab2ecab69069933d0bbf2b0 +size 57612