From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../elvis/files/elvis-2.2.0-glibc-2.10.patch | 48 -------------- app-editors/elvis/files/elvis-2.2.0-interix.patch | 11 ---- .../elvis/files/ft2.3-symbol-collision-fix.patch | 73 ---------------------- 3 files changed, 132 deletions(-) delete mode 100644 app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch delete mode 100644 app-editors/elvis/files/elvis-2.2.0-interix.patch delete mode 100644 app-editors/elvis/files/ft2.3-symbol-collision-fix.patch (limited to 'app-editors/elvis/files') diff --git a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch deleted file mode 100644 index 1a3d1affb303..000000000000 --- a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c ---- elvis-2.2_0.orig/ref.c 2003-10-21 05:32:25.000000000 +0300 -+++ elvis-2.2_0/ref.c 2009-08-05 21:28:30.000000000 +0300 -@@ -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); diff --git a/app-editors/elvis/files/elvis-2.2.0-interix.patch b/app-editors/elvis/files/elvis-2.2.0-interix.patch deleted file mode 100644 index e16024374716..000000000000 --- a/app-editors/elvis/files/elvis-2.2.0-interix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru -x '*.Po' -x '*.Plo' elvis-2.2_0.orig/osunix/osblock.c elvis-2.2_0/osunix/osblock.c ---- elvis-2.2_0.orig/osunix/osblock.c 2008-04-03 12:00:26 +0200 -+++ elvis-2.2_0/osunix/osblock.c 2008-04-03 12:01:53 +0200 -@@ -293,5 +293,7 @@ - return; - #endif - -+#ifndef __INTERIX - sync(); -+#endif - } diff --git a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch deleted file mode 100644 index aac099e56ef7..000000000000 --- a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -ur elvis-2.2_0-orig/guix11/tags elvis-2.2_0/guix11/tags ---- elvis-2.2_0-orig/guix11/tags 2003-10-20 19:32:26.000000000 -0700 -+++ elvis-2.2_0/guix11/tags 2007-08-17 12:56:28.000000000 -0700 -@@ -31,7 +31,7 @@ - DEFAULT_TOOLFG guix11.c 40;" d ln:40 file: - DEFAULT_XENCODING guix11.c 48;" d ln:48 file: - FT_DEFAULT xdialog.h 10;" ln:10 enum:X_FIELDTYPE --FT_FILE xdialog.h 10;" ln:10 enum:X_FIELDTYPE -+FT_FILEC xdialog.h 10;" ln:10 enum:X_FIELDTYPE - FT_LOCKED xdialog.h 10;" ln:10 enum:X_FIELDTYPE - FT_NUMBER xdialog.h 10;" ln:10 enum:X_FIELDTYPE - FT_ONEOF xdialog.h 10;" ln:10 enum:X_FIELDTYPE -diff -ur elvis-2.2_0-orig/guix11/xdialog.c elvis-2.2_0/guix11/xdialog.c ---- elvis-2.2_0-orig/guix11/xdialog.c 2003-10-20 19:32:26.000000000 -0700 -+++ elvis-2.2_0/guix11/xdialog.c 2007-08-17 12:56:28.000000000 -0700 -@@ -387,7 +387,7 @@ - case 'o': ft = FT_ONEOF, limit = scan; break; - case 'n': ft = FT_NUMBER, limit = scan; break; - case 's': ft = FT_STRING; break; -- case 'f': ft = FT_FILE; break; -+ case 'f': ft = FT_FILEC; break; - case 'l': ft = FT_LOCKED; break; - } - -@@ -556,7 +556,7 @@ - break; - - case FT_STRING: -- case FT_FILE: -+ case FT_FILEC: - button = addbutton(dia, "<", 'l', ELVCTRL('L')); - button->y = dia->y0 + dia->rowh * i; - button->x = dia->x0 + 3; -@@ -1111,7 +1111,7 @@ - newvalue = keystring(dia, key); - break; - -- case FT_FILE: -+ case FT_FILEC: - #ifdef FEATURE_COMPLETE - if (key == '\t') - { -@@ -1179,7 +1179,7 @@ - switch (dia->field[row].ft) - { - case FT_STRING: -- case FT_FILE: -+ case FT_FILEC: - case FT_NUMBER: - case FT_LOCKED: - drawtext(dia, row); -@@ -1207,7 +1207,7 @@ - break; - - case FT_STRING: -- case FT_FILE: -+ case FT_FILEC: - if (button->shape == 'l') - if (row == dia->current - ? dia->shift > 0 -diff -ur elvis-2.2_0-orig/guix11/xdialog.h elvis-2.2_0/guix11/xdialog.h ---- elvis-2.2_0-orig/guix11/xdialog.h 2003-10-20 19:32:26.000000000 -0700 -+++ elvis-2.2_0/guix11/xdialog.h 2007-08-17 12:56:28.000000000 -0700 -@@ -5,7 +5,7 @@ - FT_ONEOF, /* one of a preset list; includes boolean */ - FT_NUMBER, /* numeric field */ - FT_STRING, /* string field */ -- FT_FILE, /* string field where does filename completion */ -+ FT_FILEC, /* string field where does filename completion */ - FT_LOCKED /* non-editable field */ - } X_FIELDTYPE; - typedef struct - -- cgit v1.2.3