Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/xgraph/files/
Date: Sun, 29 Jan 2017 20:11:14
Message-Id: 1485720582.22b5a77775a7a8fec7e8cf4fa50269872d64516a.soap@gentoo
1 commit: 22b5a77775a7a8fec7e8cf4fa50269872d64516a
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 29 09:24:23 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 20:09:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b5a777
7
8 sci-visualization/xgraph: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3709
11
12 .../xgraph/files/xgraph-12.1-glibc-2.10.patch | 29 ----------------------
13 .../xgraph/files/xgraph-makefile-gentoo.patch | 12 ---------
14 2 files changed, 41 deletions(-)
15
16 diff --git a/sci-visualization/xgraph/files/xgraph-12.1-glibc-2.10.patch b/sci-visualization/xgraph/files/xgraph-12.1-glibc-2.10.patch
17 deleted file mode 100644
18 index e251408..00000000
19 --- a/sci-visualization/xgraph/files/xgraph-12.1-glibc-2.10.patch
20 +++ /dev/null
21 @@ -1,29 +0,0 @@
22 -diff -ur xgraph-12.1.orig/dialog.c xgraph-12.1/dialog.c
23 ---- xgraph-12.1.orig/dialog.c 2009-08-09 01:02:01.000000000 +0300
24 -+++ xgraph-12.1/dialog.c 2009-08-09 01:02:40.000000000 +0300
25 -@@ -775,7 +775,7 @@
26 - memset(new_info->lines, 0, sizeof(Window) * E_LINES);
27 -
28 - lineptr = text;
29 -- while (getline(&lineptr, line)) {
30 -+ while (get_line(&lineptr, line)) {
31 - if (new_info->num_lines >= new_info->alloc_lines) {
32 - int old_alloc_lines_size = new_info->alloc_lines * sizeof(Window);
33 - new_info->alloc_lines *= 2;
34 -@@ -886,7 +886,7 @@
35 -
36 -
37 - int
38 --getline(tptr, lptr)
39 -+get_line(tptr, lptr)
40 - char **tptr;
41 - char *lptr;
42 -
43 -diff -ur xgraph-12.1.orig/dialog.h xgraph-12.1/dialog.h
44 ---- xgraph-12.1.orig/dialog.h 2009-08-09 01:02:01.000000000 +0300
45 -+++ xgraph-12.1/dialog.h 2009-08-09 01:02:43.000000000 +0300
46 -@@ -1,3 +1,3 @@
47 - extern void msg_box(char *, char *);
48 --extern int getline(char **, char *);
49 -+extern int get_line(char **, char *);
50 - extern void do_error(char *);
51
52 diff --git a/sci-visualization/xgraph/files/xgraph-makefile-gentoo.patch b/sci-visualization/xgraph/files/xgraph-makefile-gentoo.patch
53 deleted file mode 100644
54 index e863742..00000000
55 --- a/sci-visualization/xgraph/files/xgraph-makefile-gentoo.patch
56 +++ /dev/null
57 @@ -1,12 +0,0 @@
58 -diff -Naur xgraph-12.1/Makefile.in xgraph-12.1-new/Makefile.in
59 ---- xgraph-12.1/Makefile.in 1999-12-20 16:40:32.000000000 -0500
60 -+++ xgraph-12.1-new/Makefile.in 2006-08-12 10:04:18.000000000 -0400
61 -@@ -80,7 +80,7 @@
62 -
63 - # C_WARNINGS = -Wall
64 - C_WARNINGS =
65 --CFLAGS = $(ADDITIONAL_INCLUDES) $(C_WARNINGS) -g $(X_CFLAGS)
66 -+CFLAGS = $(ADDITIONAL_INCLUDES) $(C_WARNINGS) @CFLAGS@ $(X_CFLAGS)
67 -
68 - xgraph_LDADD = $(ADDITIONAL_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS) -lX11 -lm
69 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4