diff options
| author | joerg <joerg> | 2005-12-20 14:32:01 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-12-20 14:32:01 +0000 |
| commit | 5d4a28eb375df0d6cfa931b2cbc2878540acd8a2 (patch) | |
| tree | 1d4c79f9b03f777e89d881963de30f0dd818e7e3 | |
| parent | e5f72de7a116dde894160d9474f419daa5f8cc61 (diff) | |
| download | pkgsrc-5d4a28eb375df0d6cfa931b2cbc2878540acd8a2.tar.gz | |
Fix GCC 3.4+: label at end of compound statement.
Fix ISO C conflict: depend on stdlib.h for malloc.
| -rw-r--r-- | graphics/mgl/distinfo | 5 | ||||
| -rw-r--r-- | graphics/mgl/patches/patch-ap | 14 | ||||
| -rw-r--r-- | graphics/mgl/patches/patch-aq | 12 |
3 files changed, 26 insertions, 5 deletions
diff --git a/graphics/mgl/distinfo b/graphics/mgl/distinfo index 3160422a616..6b63136e3aa 100644 --- a/graphics/mgl/distinfo +++ b/graphics/mgl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 08:45:10 agc Exp $ +$NetBSD: distinfo,v 1.6 2005/12/20 14:32:01 joerg Exp $ SHA1 (mgl2-alpha-020.tar.gz) = aa6be2be28749ba9952afbb359ca0525cad3717f RMD160 (mgl2-alpha-020.tar.gz) = 4c1b6772d9b9adc96279b016fb574defb78f1fe7 @@ -18,7 +18,8 @@ SHA1 (patch-al) = 85a4ce2a9779bd4fd3f2a37192a5250824fc9271 SHA1 (patch-am) = a0b8c7b4c37f5bad8ff5fa3d23d72e918595b72f SHA1 (patch-an) = 958eea3832f726950357f0b6856d2d6347943dfa SHA1 (patch-ao) = a8baeadfb048e397409d027ac5c53b49e4cbd6b9 -SHA1 (patch-ap) = 850e6515a78d3bbf8716a70b2b6f3f88c1a06b6f +SHA1 (patch-ap) = f77dbbd3ae25e17e34d2a81155fdefa8765429a2 +SHA1 (patch-aq) = 67b42759d6036d9dbc43789c4bdf9d8c7ed5364a SHA1 (patch-ar) = 680c2f40e37f8f71d305c8f46460a1fbdc0f0242 SHA1 (patch-as) = fceb87ac6fb9644bd7a640dcc81cf29ca0f824e5 SHA1 (patch-at) = 263b09454b9900d383e3447bc5b3da2e37b495cf diff --git a/graphics/mgl/patches/patch-ap b/graphics/mgl/patches/patch-ap index 66afd5fa684..b45ec19db2b 100644 --- a/graphics/mgl/patches/patch-ap +++ b/graphics/mgl/patches/patch-ap @@ -1,7 +1,7 @@ -$NetBSD: patch-ap,v 1.1 2003/10/14 16:22:21 salo Exp $ +$NetBSD: patch-ap,v 1.2 2005/12/20 14:32:01 joerg Exp $ ---- mgterm/msame.c.orig 2000-09-09 05:35:24.000000000 +0200 -+++ mgterm/msame.c 2003-10-14 17:52:19.000000000 +0200 +--- mgterm/msame.c.orig 2000-09-09 03:35:24.000000000 +0000 ++++ mgterm/msame.c @@ -33,113 +33,113 @@ char *picts[6] ={ @@ -218,3 +218,11 @@ $NetBSD: patch-ap,v 1.1 2003/10/14 16:22:21 salo Exp $ "}; static int vk_attached=0; static struct virtual_key *vk_canvas; +@@ -410,7 +410,6 @@ struct undo_buf { + } *undo_top; + + static void push_undo() { +- extern char *malloc(); + struct undo_buf *buf; + int i,j; + unsigned int x; diff --git a/graphics/mgl/patches/patch-aq b/graphics/mgl/patches/patch-aq new file mode 100644 index 00000000000..201837687b5 --- /dev/null +++ b/graphics/mgl/patches/patch-aq @@ -0,0 +1,12 @@ +$NetBSD: patch-aq,v 1.1 2005/12/20 14:32:01 joerg Exp $ + +--- lib/draw_engine.c.orig 2005-12-20 14:27:42.000000000 +0000 ++++ lib/draw_engine.c +@@ -413,6 +413,7 @@ void bitblt_generic(struct screen *dst, + } + } + ret: ++ ; + } + + static void gen_bitblt(struct screen *dst, int dx, int dy, struct screen *src, |