[40294] trunk/dports/gnome/nautilus

[jmr at macports.org]

Revision: 40294
          http://trac.macports.org/changeset/40294
Author:   jmr at macports.org
Date:     2008-09-28 12:47:35 -0700 (Sun, 28 Sep 2008)
Log Message:
-----------
nautilus: update to 2.22.5.1, fix build failure (#16680), remove old patch

Modified Paths:
--------------
    trunk/dports/gnome/nautilus/Portfile

Added Paths:
-----------
    trunk/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff

Removed Paths:
-------------
    trunk/dports/gnome/nautilus/files/patch_nautilus-emblem-utils.c
    trunk/dports/gnome/nautilus/files/patch_nautilus-program-choosing.c

Modified: trunk/dports/gnome/nautilus/Portfile
===================================================================
--- trunk/dports/gnome/nautilus/Portfile	2008-09-28 19:42:03 UTC (rev 40293)
+++ trunk/dports/gnome/nautilus/Portfile	2008-09-28 19:47:35 UTC (rev 40294)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		nautilus
-version		2.22.2
+version		2.22.5.1
 
 description	The GNOME filemanager
 long_description       	Nautilus is the official file manager for the \
@@ -14,9 +14,9 @@
 platforms	darwin
 homepage	http://www.gnome.org/
 master_sites    gnome:sources/nautilus/[join [lrange [split ${version} .] 0 1] .]/
-checksums	md5 4758815c46f350bd314d9e104f0a1b72 \
-		sha1 fe20dfbfbd21e06dcb4fbb471cdb957c2d96f5cf \
-		rmd160 26787ee2e62e49acf5a03d4792e16a00034dd751
+checksums	md5 a63596ca4cccddc970d695d62c05154a \
+		sha1 81c1d875779f5d95ad7bf7dc18ab8a8244abb429 \
+		rmd160 102c5608e3dbf9815cb9b82262799ac0001870a4
 
 depends_lib	\
 	port:rarian \
@@ -34,6 +34,9 @@
 
 use_bzip2 	yes
 
+patchfiles  patch-nautilus-emblem-utils.c.diff \
+            patch-nautilus-file.c.diff
+
 configure.args  --mandir=${prefix}/share/man \
 		--disable-update-mimedb
 

Copied: trunk/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff (from rev 40287, trunk/dports/gnome/nautilus/files/patch_nautilus-emblem-utils.c)
===================================================================
--- trunk/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff	                        (rev 0)
+++ trunk/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff	2008-09-28 19:47:35 UTC (rev 40294)
@@ -0,0 +1,10 @@
+--- libnautilus-private/nautilus-emblem-utils.c.orig	2008-03-29 20:40:43.000000000 +1100
++++ libnautilus-private/nautilus-emblem-utils.c	2008-09-29 05:31:02.000000000 +1000
+@@ -24,6 +24,7 @@
+ 
+ #include <config.h>
+ 
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <utime.h>
+ #include <stdio.h>


Property changes on: trunk/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/dports/gnome/nautilus/files/patch_nautilus-emblem-utils.c
===================================================================
--- trunk/dports/gnome/nautilus/files/patch_nautilus-emblem-utils.c	2008-09-28 19:42:03 UTC (rev 40293)
+++ trunk/dports/gnome/nautilus/files/patch_nautilus-emblem-utils.c	2008-09-28 19:47:35 UTC (rev 40294)
@@ -1,10 +0,0 @@
---- libnautilus-private/nautilus-emblem-utils.c.org	Wed Nov 26 19:05:49 2003
-+++ libnautilus-private/nautilus-emblem-utils.c	Wed Nov 26 21:40:23 2003
-@@ -24,6 +24,7 @@
- 
- #include <config.h>
- 
-+#include <sys/types.h>
- #include <utime.h>
- #include <stdio.h>
- #include <time.h>

Deleted: trunk/dports/gnome/nautilus/files/patch_nautilus-program-choosing.c
===================================================================
--- trunk/dports/gnome/nautilus/files/patch_nautilus-program-choosing.c	2008-09-28 19:42:03 UTC (rev 40293)
+++ trunk/dports/gnome/nautilus/files/patch_nautilus-program-choosing.c	2008-09-28 19:47:35 UTC (rev 40294)
@@ -1,29 +0,0 @@
---- libnautilus-private/nautilus-program-choosing.c.orig	Wed Feb 11 16:37:03 2004
-+++ libnautilus-private/nautilus-program-choosing.c	Wed Apr  7 13:33:57 2004
-@@ -71,7 +71,12 @@
- 
- static GHashTable *choose_application_hash_table, *choose_component_hash_table;
- 
--extern char **environ;
-+#ifdef __APPLE__
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#elif
-+ extern char **environ;
-+#endif
- 
- /* Cut and paste from gdkspawn-x11.c */
- static gchar **
-@@ -634,7 +639,12 @@
- 	gdk_error_trap_pop ();
- }
- 
-+#ifdef __APPLE__
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#elif
- extern char **environ;
-+#endif
- 
- static char **
- make_spawn_environment_for_sn_context (SnLauncherContext *sn_context,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080928/a0fdd8a4/attachment.html