summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authortaca <taca>2009-08-11 15:01:14 +0000
committertaca <taca>2009-08-11 15:01:14 +0000
commit2c63221f0c209cc17583e330c137dbcf17f21e85 (patch)
treeb64e67566ac594f69b877580dc188b39d0587666 /converters
parentd2f70949e4712f58bd67f4150ad61e737678410c (diff)
downloadpkgsrc-2c63221f0c209cc17583e330c137dbcf17f21e85.tar.gz
Add a patch to avoid conflict with getline(3).
Diffstat (limited to 'converters')
-rw-r--r--converters/dvi2tty/distinfo3
-rw-r--r--converters/dvi2tty/patches/patch-ab78
2 files changed, 80 insertions, 1 deletions
diff --git a/converters/dvi2tty/distinfo b/converters/dvi2tty/distinfo
index 90d5fb4d987..c7ffa075777 100644
--- a/converters/dvi2tty/distinfo
+++ b/converters/dvi2tty/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:12:33 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/08/11 15:01:14 taca Exp $
SHA1 (dvi2tty.tar.gz) = 7b62aef389325d87683630869261e14a6e98258e
RMD160 (dvi2tty.tar.gz) = 331f9ca12c1d905ce3ec2963cb970dfbff80848d
Size (dvi2tty.tar.gz) = 30720 bytes
SHA1 (patch-aa) = c6452a3ea322b507b3f7a3c5dc654c0a2b4bfea6
+SHA1 (patch-ab) = 7776499817462f9a1f9dff1c50f876e3dc7de2b1
diff --git a/converters/dvi2tty/patches/patch-ab b/converters/dvi2tty/patches/patch-ab
new file mode 100644
index 00000000000..dd52af842e4
--- /dev/null
+++ b/converters/dvi2tty/patches/patch-ab
@@ -0,0 +1,78 @@
+$NetBSD: patch-ab,v 1.1 2009/08/11 15:01:14 taca Exp $
+
+Avoid confliction with getline(3).
+
+--- dvistuff.c.orig 2009-08-11 23:56:48.000000000 +0900
++++ dvistuff.c
+@@ -123,7 +123,7 @@ void rule (bool, l
+ void ruleaux (long, long, char);
+ long horizontalmove (long);
+ int skipnops (void);
+-linetype * getline (void);
++linetype * get_line (void);
+ linetype * findline (void);
+ unsigned long num (int);
+ long snum (int);
+@@ -148,7 +148,7 @@ void rule ();
+ void ruleaux ();
+ long horizontalmove ();
+ int skipnops ();
+-linetype * getline ();
++linetype * get_line ();
+ linetype * findline ();
+ unsigned long num ();
+ long snum ();
+@@ -290,7 +290,7 @@ void initpage()
+ h = 0L; v = 0L; /* initialize coordinates */
+ x = 0L; w = 0L; y = 0L; z = 0L; /* initialize amounts */
+ sptr = 0; /* initialize stack */
+- currentline = getline(); /* initialize list of lines */
++ currentline = get_line(); /* initialize list of lines */
+ currentline->vv = 0L;
+ firstline = currentline;
+ lastline = currentline;
+@@ -647,7 +647,7 @@ int skipnops() /* s
+
+ /*----------------------------------------------------------------------------*/
+
+-linetype *getline() /* returns an initialized line-object */
++linetype *get_line() /* returns an initialized line-object */
+ {
+ register int i;
+ register linetype *temp;
+@@ -662,7 +662,7 @@ linetype *getline() /* retur
+ temp->text[i] = '\0';
+ return temp;
+
+-} /* getline */
++} /* get_line */
+
+ /*----------------------------------------------------------------------------*/
+
+@@ -673,7 +673,7 @@ linetype *findline() /* find
+
+ if (v <= firstline->vv) { /* above first line */
+ if (firstline->vv - v > VERTICALEPSILON) {
+- temp = getline();
++ temp = get_line();
+ temp->next = firstline;
+ firstline->prev = temp;
+ temp->vv = v;
+@@ -684,7 +684,7 @@ linetype *findline() /* find
+
+ if (v >= lastline->vv) { /* below last line */
+ if (v - lastline->vv > VERTICALEPSILON) {
+- temp = getline();
++ temp = get_line();
+ temp->prev = lastline;
+ lastline->next = temp;
+ temp->vv = v;
+@@ -707,7 +707,7 @@ linetype *findline() /* find
+ return temp->next;
+
+ /* no line fits suitable, generate a new one */
+- currentline = getline();
++ currentline = get_line();
+ currentline->next = temp->next;
+ currentline->prev = temp;
+ temp->next->prev = currentline;