- make gcc4 happy by merging the patches from base
- regen patches
This commit is contained in:
robert
parent
3ac6ab497b
commit
66bd09729f
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2008/01/04 17:48:35 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2010/05/09 21:26:54 robert Exp $
|
||||
|
||||
COMMENT= japanese groff
|
||||
|
||||
CATEGORIES= japanese textproc print
|
||||
|
||||
PKGNAME= ja-groff-1.10_0.99
|
||||
PKGNAME= ja-groff-1.10_0.99p0
|
||||
DISTNAME= groff-1.10
|
||||
|
||||
PATCHFILES= jgroff-0.99.diff.gz:0
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Install everything with a `j' prefix, including all manpages.
|
||||
$OpenBSD: patch-Makefile_comm,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
|
||||
$OpenBSD: patch-Makefile_comm,v 1.2 2010/05/09 21:26:54 robert Exp $
|
||||
--- Makefile.comm.orig Tue Jun 27 13:08:27 1995
|
||||
+++ Makefile.comm Wed Apr 12 13:56:12 2000
|
||||
@@ -44,7 +44,7 @@ MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(O
|
||||
+++ Makefile.comm Sun May 9 22:33:01 2010
|
||||
@@ -44,7 +44,7 @@ MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS
|
||||
CLEANFILES=$(LIBCLEAN)
|
||||
DISTCLEANFILES=TAGS Makefile
|
||||
REALCLEANFILES=$(YTABC) $(YTABH)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-devdvi_DESC_in,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
|
||||
--- devdvi/DESC.in.orig Wed Apr 12 14:52:12 2000
|
||||
+++ devdvi/DESC.in Wed Apr 12 14:52:17 2000
|
||||
@@ -8,4 +8,4 @@ sizes 500 600 700 800 900 1000 1100 1200
|
||||
$OpenBSD: patch-devdvi_DESC_in,v 1.2 2010/05/09 21:26:54 robert Exp $
|
||||
--- devdvi/DESC.in.orig Sun May 9 22:33:01 2010
|
||||
+++ devdvi/DESC.in Sun May 9 22:33:01 2010
|
||||
@@ -8,4 +8,4 @@ sizes 500 600 700 800 900 1000 1100 1200 1400 1440 160
|
||||
fonts 15 R I B BI 0 0 0 0 0 MI S EX CW M G
|
||||
ondemand M G
|
||||
tcommand
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-grops_ps_cc,v 1.2 2003/06/18 03:00:30 avsm Exp $
|
||||
--- grops/ps.cc.orig Tue Jun 17 00:24:09 2003
|
||||
+++ grops/ps.cc Wed Jun 18 03:55:45 2003
|
||||
@@ -684,7 +684,7 @@ void ps_printer::define_encoding(const c
|
||||
$OpenBSD: patch-grops_ps_cc,v 1.3 2010/05/09 21:26:54 robert Exp $
|
||||
--- grops/ps.cc.orig Sun May 9 22:33:01 2010
|
||||
+++ grops/ps.cc Sun May 9 22:33:01 2010
|
||||
@@ -684,7 +684,7 @@ void ps_printer::define_encoding(const char *encoding,
|
||||
fatal("can't open encoding file `%1'", encoding);
|
||||
int lineno = 1;
|
||||
char buf[256];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
Missing include, probably due to jgroff-0.99 being based on groff-1.9
|
||||
initially.
|
||||
$OpenBSD: patch-hpftodit_hpftodit_cc,v 1.1.1.1 2000/04/12 20:34:11 espie Exp $
|
||||
--- hpftodit/hpftodit.cc.orig Tue Apr 11 23:05:43 2000
|
||||
+++ hpftodit/hpftodit.cc Tue Apr 11 23:05:55 2000
|
||||
@@ -34,6 +34,7 @@ put filename in error messages (or fix l
|
||||
$OpenBSD: patch-hpftodit_hpftodit_cc,v 1.2 2010/05/09 21:26:54 robert Exp $
|
||||
--- hpftodit/hpftodit.cc.orig Tue Jun 27 14:59:39 1995
|
||||
+++ hpftodit/hpftodit.cc Sun May 9 22:33:01 2010
|
||||
@@ -34,6 +34,7 @@ put filename in error messages (or fix lib)
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include "assert.h"
|
||||
|
||||
12
japanese/groff/patches/patch-refer_refer_cc
Normal file
12
japanese/groff/patches/patch-refer_refer_cc
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-refer_refer_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
|
||||
--- refer/refer.cc.orig Sun May 9 23:24:19 2010
|
||||
+++ refer/refer.cc Sun May 9 23:25:34 2010
|
||||
@@ -513,7 +513,7 @@ static void do_file(const char *filename)
|
||||
if ((flags & FORCE_LEFT_BRACKET) || !have_text)
|
||||
pending_line += PRE_LABEL_MARKER;
|
||||
pending_line += pre;
|
||||
- pending_line += LABEL_MARKER + lt;
|
||||
+ pending_line += LABEL_MARKER + (int)lt;
|
||||
pending_line += post;
|
||||
if ((flags & FORCE_RIGHT_BRACKET) || !have_text)
|
||||
pending_line += POST_LABEL_MARKER;
|
||||
13
japanese/groff/patches/patch-troff_input_cc
Normal file
13
japanese/groff/patches/patch-troff_input_cc
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-troff_input_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
|
||||
--- troff/input.cc.orig Sun May 9 23:21:57 2010
|
||||
+++ troff/input.cc Sun May 9 23:22:15 2010
|
||||
@@ -75,6 +75,9 @@ void vjustify();
|
||||
#endif /* COLUMN */
|
||||
void transparent();
|
||||
void transparent_file();
|
||||
+void process_input_stack();
|
||||
+extern void end_diversions();
|
||||
+extern void title();
|
||||
|
||||
const char *program_name = 0;
|
||||
token tok;
|
||||
20
japanese/groff/patches/patch-troff_node_cc
Normal file
20
japanese/groff/patches/patch-troff_node_cc
Normal file
@ -0,0 +1,20 @@
|
||||
$OpenBSD: patch-troff_node_cc,v 1.1 2010/05/09 21:26:54 robert Exp $
|
||||
--- troff/node.cc.orig Sun May 9 23:21:17 2010
|
||||
+++ troff/node.cc Sun May 9 23:22:54 2010
|
||||
@@ -171,6 +171,7 @@ class tfont : public tfont_spec { (public)
|
||||
hunits get_subscript_correction(charinfo *);
|
||||
friend tfont *make_tfont(tfont_spec &);
|
||||
};
|
||||
+tfont *make_tfont(tfont_spec &);
|
||||
|
||||
inline int env_definite_font(environment *env)
|
||||
{
|
||||
@@ -1527,7 +1528,7 @@ void glyph_node::operator delete(void *p)
|
||||
|
||||
void ligature_node::operator delete(void *p)
|
||||
{
|
||||
- delete p;
|
||||
+ delete[] (char *)p;
|
||||
}
|
||||
|
||||
glyph_node::glyph_node(charinfo *c, tfont *t, node *x)
|
||||
Loading…
x
Reference in New Issue
Block a user