Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (6c8ea1ecc0f4705bce8f6086027fb3b298042c41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (6c8ea1ecc0f4705bce8f6086027fb3b298042c41)
  • Date: Wed, 22 Jul 2009 10:22:54 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

editors/elvis/HISTORY | 5 ++++
editors/elvis/PRE_BUILD | 4 +++
editors/elvis/elvis-glibc.patch | 47
++++++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+)

New commits:
commit 6c8ea1ecc0f4705bce8f6086027fb3b298042c41
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

elvis: Added patch for glibc 2.10.x. Bug #15254

diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index fcadb6f..2a2336b 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,3 +1,8 @@
+2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added to apply patch
+ * elvis-glibc.patch: Added to fix issue with glibc 2.10.x
+ Bug #15254
+
2008-11-22 Justin Boffemmyer <flux AT sourcemage.org>
* CONFIGURE: fixed a typo vim->elvis

diff --git a/editors/elvis/PRE_BUILD b/editors/elvis/PRE_BUILD
new file mode 100755
index 0000000..75cb1c8
--- /dev/null
+++ b/editors/elvis/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/elvis-glibc.patch
diff --git a/editors/elvis/elvis-glibc.patch b/editors/elvis/elvis-glibc.patch
new file mode 100644
index 0000000..4b3c497
--- /dev/null
+++ b/editors/elvis/elvis-glibc.patch
@@ -0,0 +1,47 @@
+--- ref.c.orig 2009-06-10 16:15:50.000000000 -0500
++++ ref.c 2009-06-10 16:17:04.000000000 -0500
+@@ -42,7 +42,7 @@
+
+ #if USE_PROTOTYPES
+ static void usage(char *argv0);
+-static char *getline(FILE *fp);
++static char *get_line(FILE *fp);
+ static void store(char *line, char **list);
+ static LINECLS classify(char *line, LINECLS prev);
+ static void lookup(TAG *tag);
+@@ -171,7 +171,7 @@
+ /* This function reads a single line, and replaces the terminating newline
with
+ * a '\0' byte. The string will be in a static buffer. Returns NULL at
EOF.
+ */
+-static char *getline(fp)
++static char *get_line(fp)
+ FILE *fp;
+ {
+ int ch;
+@@ -348,7 +348,7 @@
+ }
+
+ /* for each line... */
+- for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
++ for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL;
lnum++)
+ {
+ /* is this the tag definition? */
+ if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line,
len))
+@@ -377,7 +377,7 @@
+ {
+ if (strchr(line, '(') != NULL)
+ {
+- while ((line = getline(fp)) != NULL
++ while ((line = get_line(fp)) != NULL
+ && *line
+ && ((*line != '#' && *line != '{')
+ || line[strlen(line) - 1] ==
'\\'))
+@@ -387,7 +387,7 @@
+ }
+ else if ((lc = classify(line, lc)) ==
LC_PARTIAL)
+ {
+- while ((line = getline(fp)) != NULL
++ while ((line = get_line(fp)) != NULL
+ && (lc = classify(line, lc)) ==
LC_PARTIAL)
+ {
+ puts(line);



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (6c8ea1ecc0f4705bce8f6086027fb3b298042c41), George Sherwood, 07/22/2009

Archive powered by MHonArc 2.6.24.

Top of Page