Fix build with gcc4 on NetBSD-3.99.21.

7 files changed, 63 insertions, 8 deletions

diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index 400a2951a9f..b7f2efecfe8 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/06/13 07:23:58 dbj Exp $
+$NetBSD: distinfo,v 1.13 2006/06/27 14:54:55 wiz Exp $
 
 SHA1 (Guppi-0.40.3.tar.bz2) = 7435bddddca9e3347efb006ad33198fbbe593ea7
 RMD160 (Guppi-0.40.3.tar.bz2) = c1e5575a992e40966749a8a18b2143ed69329495
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 922c6a651662743e4ae4e4f2e3fe78a6ab86a296
 SHA1 (patch-aj) = 867143c21e4aede1ca50d7ec5afa783c77bad391
 SHA1 (patch-ak) = 5a45f1f3091eaa01c37b9b26fa7805939885be09
 SHA1 (patch-al) = 39dbd475986807e93e1b2116e8d68265371f5e1a
+SHA1 (patch-am) = 5b0ff8f822e1a2d64c7c39351627b56f137689ab
diff --git a/math/guppi/patches/patch-am b/math/guppi/patches/patch-am
new file mode 100644
index 00000000000..912d4d6b79f
--- /dev/null
+++ b/math/guppi/patches/patch-am
@@ -0,0 +1,18 @@
+$NetBSD: patch-am,v 1.1 2006/06/27 14:54:55 wiz Exp $
+
+--- src/libguppiuseful/guppi-plug-in.c.orig	2001-09-08 05:49:59.000000000 +0000
++++ src/libguppiuseful/guppi-plug-in.c
+@@ -44,10 +44,12 @@ static void
+ guppi_plug_in_finalize (GtkObject * obj)
+ {
+   GuppiPlugIn *pi = GUPPI_PLUG_IN (obj);
++  gpointer tmp;
+ 
+   guppi_finalized (obj);
+ 
+-  guppi_free0 ((gpointer)pi->load_path);
++  tmp = (gpointer)pi->load_path;
++  guppi_free0 (tmp);
+ 
+   if (parent_class->finalize)
+     parent_class->finalize (obj);
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 4dce2bcae4b..9bbbaced76d 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2006/06/21 19:19:36 joerg Exp $
+$NetBSD: distinfo,v 1.31 2006/06/27 14:53:42 wiz Exp $
 
 SHA1 (kdemultimedia-3.5.3.tar.bz2) = 2a75ba49bbc513b4ab5cb0d039949984742f94f5
 RMD160 (kdemultimedia-3.5.3.tar.bz2) = 2ae4ba9266b84b972e3bcd106896b6ea0124aa32
@@ -17,6 +17,7 @@ SHA1 (patch-ak) = b55f0915a356949b00c588b25c0aa435aedc109d
 SHA1 (patch-al) = c8c3d6c44d19053c596b41060ab574a051c73eeb
 SHA1 (patch-am) = d08ebf77d69d8c9527728eccaa430b28664a74dd
 SHA1 (patch-an) = 79b26912aeeacb881664cd1557417bd99b96451e
+SHA1 (patch-ao) = 1c849de2e1696c4f4e81b660a42b26e2a1c5440e
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
diff --git a/multimedia/kdemultimedia3/patches/patch-ao b/multimedia/kdemultimedia3/patches/patch-ao
new file mode 100644
index 00000000000..9c9fc251af1
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.3 2006/06/27 14:53:42 wiz Exp $
+
+--- mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h.orig	2005-09-10 08:19:52.000000000 +0000
++++ mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
+@@ -20,6 +20,9 @@
+ 
+ /* gcc 3.3.1 and later optimise the "not used" (only in asm code)
+    symbols away. So we need to mark them as used. */
++#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ)
++#define __GNUC_PREREQ __GNUC_PREREQ__
++#endif
+ #ifdef __GNUC_PREREQ
+ #if __GNUC_PREREQ (3,1)
+ # define __attribute_used__ __attribute__ ((__used__))
diff --git a/net/soup/distinfo b/net/soup/distinfo
index 1113e98151e..9fa46d6b266 100644
--- a/net/soup/distinfo
+++ b/net/soup/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/06/09 20:36:31 dbj Exp $
+$NetBSD: distinfo,v 1.13 2006/06/27 14:55:54 wiz Exp $
 
 SHA1 (soup-0.7.11.tar.bz2) = 47b185b57311053eb8a30c655981b7136c228923
 RMD160 (soup-0.7.11.tar.bz2) = d63a0af5a4739a6e529bd797e5cb570e872b6d6b
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = da73ee261bd8e4247738d99210a2ed12c0315a13
 SHA1 (patch-ad) = 5d14207d9b8f6c634016f098f876c66438ebdabf
 SHA1 (patch-ae) = 9f33467fae553b666fb9890197fd7b15dde78722
 SHA1 (patch-af) = 27e30c8ae3ebdca706551b656bee6adcdc8f28ac
-SHA1 (patch-ag) = 0e09f12a2a4eaf2b7aabf8d2d3e734d96f5fa706
+SHA1 (patch-ag) = ac60efa34fed8b54e16a110546f780e1336ad572
+SHA1 (patch-ah) = 6fdbe5d91fac3ad3ab8f5c5de7e4b6f7012856c0
diff --git a/net/soup/patches/patch-ag b/net/soup/patches/patch-ag
index 416e8e93329..3627d6295e9 100644
--- a/net/soup/patches/patch-ag
+++ b/net/soup/patches/patch-ag
@@ -1,8 +1,15 @@
-$NetBSD: patch-ag,v 1.2 2006/06/09 20:36:31 dbj Exp $
+$NetBSD: patch-ag,v 1.3 2006/06/27 14:55:54 wiz Exp $
 
---- src/libsoup/soup-private.h.orig	2003-01-02 14:04:09.000000000 -0500
+--- src/libsoup/soup-private.h.orig	2003-01-02 19:04:09.000000000 +0000
 +++ src/libsoup/soup-private.h
-@@ -31,7 +31,9 @@
+@@ -26,12 +26,16 @@
+ #else
+ #  ifdef HAVE_ALLOCA_H
+ #    include <alloca.h>
++#  elif defined(HAVE_STDLIB_H)
++#    include <stdlib.h>
+ #  else
+ #    ifdef _AIX
  #      pragma alloca
  #    else
  #      ifndef alloca /* predefined by HP cc +Olibcalls */
@@ -12,7 +19,7 @@ $NetBSD: patch-ag,v 1.2 2006/06/09 20:36:31 dbj Exp $
  #      endif
  #    endif
  #  endif
-@@ -68,7 +70,6 @@ extern "C" {
+@@ -68,7 +72,6 @@ extern "C" {
  #define RESPONSE_BLOCK_SIZE 8192
  
  extern gboolean    soup_initialized;
diff --git a/net/soup/patches/patch-ah b/net/soup/patches/patch-ah
new file mode 100644
index 00000000000..8768483fc87
--- /dev/null
+++ b/net/soup/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/06/27 14:55:54 wiz Exp $
+
+--- src/libsoup/soup-server.c.orig	2002-07-26 15:34:12.000000000 +0000
++++ src/libsoup/soup-server.c
+@@ -312,7 +312,7 @@ read_headers_cgi (SoupMessage *msg,
+ 	/*
+ 	 * Get request HTTP method
+ 	 */
+-	(gchar *) msg->method = g_strdup (g_getenv ("REQUEST_METHOD"));
++	msg->method = g_strdup (g_getenv ("REQUEST_METHOD"));
+ 
+ 	/* 
+ 	 * Get content length of request body