fixes for darwin

3 files changed, 35 insertions, 1 deletions

diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 7fcd3f66cf6..f0b1405c7d4 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/04/01 18:36:11 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/05/11 12:31:27 danw Exp $
 
 SHA1 (gnome-desktop-2.6.0.tar.bz2) = 1c067a2e76ca5db38bc80fce0920861ff375fe34
 Size (gnome-desktop-2.6.0.tar.bz2) = 1095481 bytes
 SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c
+SHA1 (patch-af) = 5add103655b1e2996ea041de59156196bbf6f180
+SHA1 (patch-ag) = 2b2b757a9ecd2ee6348a52f51c48749bd78f29e4
diff --git a/x11/gnome-desktop/patches/patch-af b/x11/gnome-desktop/patches/patch-af
new file mode 100644
index 00000000000..6b647bc2279
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2004/05/11 12:31:27 danw Exp $
+
+--- libgnome-desktop/egg-spawn.c.orig	Tue Apr 13 08:49:36 2004
++++ libgnome-desktop/egg-spawn.c
+@@ -28,6 +28,11 @@
+ #include <glib.h>
+ #include <gdk/gdk.h>
+ 
++#if defined(__APPLE__)
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ extern char **environ;
+ 
+ /**
diff --git a/x11/gnome-desktop/patches/patch-ag b/x11/gnome-desktop/patches/patch-ag
new file mode 100644
index 00000000000..7f28f7d0ece
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2004/05/11 12:31:27 danw Exp $
+
+--- libgnome-desktop/gnome-desktop-item.c.orig	Tue Apr 13 08:49:43 2004
++++ libgnome-desktop/gnome-desktop-item.c
+@@ -1396,6 +1396,11 @@ sn_error_trap_pop (SnDisplay *display,
+ 	gdk_error_trap_pop ();
+ }
+ 
++#if defined(__APPLE__)
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#endif
++
+ extern char **environ;
+ 
+ static char **