Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/dvi2tty/files/
Date: Wed, 05 Oct 2016 12:52:09
Message-Id: 1475671830.3c54a632d1179bce862a4595145e7b76e039b604.aballier@gentoo
1 commit: 3c54a632d1179bce862a4595145e7b76e039b604
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Oct 3 16:17:01 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 5 12:50:30 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c54a632
7
8 dev-tex/dvi2tty: remove unused patches
9
10 dev-tex/dvi2tty/files/dvi2tty-cflags.patch | 30 -------------
11 dev-tex/dvi2tty/files/dvi2tty-gcc.patch | 12 ------
12 dev-tex/dvi2tty/files/dvi2tty-getline.patch | 67 -----------------------------
13 3 files changed, 109 deletions(-)
14
15 diff --git a/dev-tex/dvi2tty/files/dvi2tty-cflags.patch b/dev-tex/dvi2tty/files/dvi2tty-cflags.patch
16 deleted file mode 100644
17 index 36d9afb..00000000
18 --- a/dev-tex/dvi2tty/files/dvi2tty-cflags.patch
19 +++ /dev/null
20 @@ -1,30 +0,0 @@
21 -Index: dvi2tty-5.3.1/Makefile
22 -===================================================================
23 ---- dvi2tty-5.3.1.orig/Makefile
24 -+++ dvi2tty-5.3.1/Makefile
25 -@@ -6,11 +6,11 @@
26 - # This Makefile does not work for MSDOS. Make your
27 - # own one, or compile by hand.
28 - #
29 --CC = gcc
30 -+CC ?= gcc
31 -
32 --CFLAGS = -Wall -O2
33 -+CFLAGS ?= -Wall -O2
34 - # CFLAGS = -Wall -O2 -fomit-frame-pointer
35 --LDFLAGS = -s
36 -+#LDFLAGS = -s
37 -
38 - prefix = /usr/local
39 - mandir = $(prefix)/man/man1
40 -@@ -20,10 +20,8 @@ bindir = $(prefix)/bin
41 - all: dvi2tty disdvi
42 -
43 - dvi2tty:dvi2tty.o dvistuff.o
44 -- $(CC) $(LFLAGS) -o dvi2tty dvi2tty.o dvistuff.o
45 -
46 - disdvi:disdvi.o
47 -- $(CC) $(LFLAGS) -o disdvi disdvi.o
48 -
49 - dvi2tty.o: dvi2tty.c dvi2tty.h
50 -
51
52 diff --git a/dev-tex/dvi2tty/files/dvi2tty-gcc.patch b/dev-tex/dvi2tty/files/dvi2tty-gcc.patch
53 deleted file mode 100644
54 index 38ec703..00000000
55 --- a/dev-tex/dvi2tty/files/dvi2tty-gcc.patch
56 +++ /dev/null
57 @@ -1,12 +0,0 @@
58 -diff -ur dvi2tty-5.3.1-old/disdvi.c dvi2tty-5.3.1/disdvi.c
59 ---- dvi2tty-5.3.1-old/disdvi.c 2003-01-23 17:31:00.000000000 +0700
60 -+++ dvi2tty-5.3.1/disdvi.c 2004-12-16 18:59:50.930219880 +0700
61 -@@ -108,7 +108,7 @@
62 - */
63 -
64 - #if !defined(THINK_C)
65 --char * malloc ();
66 -+void * malloc ();
67 - #endif
68 -
69 - #if defined(VMS)
70
71 diff --git a/dev-tex/dvi2tty/files/dvi2tty-getline.patch b/dev-tex/dvi2tty/files/dvi2tty-getline.patch
72 deleted file mode 100644
73 index 932810e..00000000
74 --- a/dev-tex/dvi2tty/files/dvi2tty-getline.patch
75 +++ /dev/null
76 @@ -1,67 +0,0 @@
77 -http://bugs.gentoo.org/271621
78 -
79 ---- dvi2tty-5.3.1-orig/dvistuff.c 2003-01-23 04:01:12.000000000 +0100
80 -+++ dvi2tty-5.3.1/dvistuff.c 2009-06-03 15:57:26.000000000 +0200
81 -@@ -179,7 +179,7 @@
82 - void ruleaux (long, long, char);
83 - long horizontalmove (long);
84 - int skipnops (void);
85 --linetype * getline (void);
86 -+linetype * get_line (void);
87 - linetype * findline (void);
88 - unsigned long num (int);
89 - long snum (int);
90 -@@ -208,7 +208,7 @@
91 - void ruleaux (long rulewt, long ruleht, char ch);
92 - long horizontalmove (long amount);
93 - int skipnops (void);
94 --linetype * getline (void);
95 -+linetype * get_line (void);
96 - linetype * findline (void);
97 - unsigned long num (int size);
98 - long snum (int size);
99 -@@ -376,7 +376,7 @@
100 - h = 0L; v = 0L; /* initialize coordinates */
101 - x = 0L; w = 0L; y = 0L; z = 0L; /* initialize amounts */
102 - sptr = 0; /* initialize stack */
103 -- currentline = getline(); /* initialize list of lines */
104 -+ currentline = get_line(); /* initialize list of lines */
105 - currentline->vv = 0L;
106 - firstline = currentline;
107 - lastline = currentline;
108 -@@ -777,7 +777,7 @@
109 - * GETLINE -- Returns an initialized line-object
110 - */
111 -
112 --linetype *getline(void)
113 -+linetype *get_line(void)
114 - {
115 - register int i;
116 - register linetype *temp;
117 -@@ -809,7 +809,7 @@
118 -
119 - if (v <= firstline->vv) { /* above first line */
120 - if (firstline->vv - v > lineheight) {
121 -- temp = getline();
122 -+ temp = get_line();
123 - temp->next = firstline;
124 - firstline->prev = temp;
125 - temp->vv = v;
126 -@@ -820,7 +820,7 @@
127 -
128 - if (v >= lastline->vv) { /* below last line */
129 - if (v - lastline->vv > lineheight) {
130 -- temp = getline();
131 -+ temp = get_line();
132 - temp->prev = lastline;
133 - lastline->next = temp;
134 - temp->vv = v;
135 -@@ -843,7 +843,7 @@
136 - return temp->next;
137 -
138 - /* no line fits suitable, generate a new one */
139 -- currentline = getline();
140 -+ currentline = get_line();
141 - currentline->next = temp->next;
142 - currentline->prev = temp;
143 - temp->next->prev = currentline;