Update to 2.12.2:

Major changes in 2.12.2 are:

* Skip non-existant bookmarks in menu/sidebar
* Sort applications in open dialogs and menus
* Deletion confirmation dialog fixes
* Fix leaks
* Fix crashes

5 files changed, 15 insertions, 29 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 2bc267cf928..d8f192ca475 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2006/01/01 17:33:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.59 2006/01/06 16:53:49 wiz Exp $
 #
 
-DISTNAME=		nautilus-2.12.1
-PKGREVISION=		2
+DISTNAME=		nautilus-2.12.2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 33878e7cf5b..5a9331e7e44 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/10/12 21:53:11 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2006/01/06 16:53:49 wiz Exp $
 
-SHA1 (nautilus-2.12.1.tar.bz2) = 0e333cfd98b60cef6afbc477b75ac051d02c6c16
-RMD160 (nautilus-2.12.1.tar.bz2) = e5e3c10ff88c49109bf204cfb00959c4aef2b241
-Size (nautilus-2.12.1.tar.bz2) = 4056062 bytes
-SHA1 (patch-aa) = 44c913fecea053c89fd0ff8bd7b9e56c9dd08959
-SHA1 (patch-af) = 928ce8395e33d4459ac83c2d992e251e223ddfeb
+SHA1 (nautilus-2.12.2.tar.bz2) = 9a7e01afb8db91c3b95b7aef9572a581fdb2f1b5
+RMD160 (nautilus-2.12.2.tar.bz2) = 6fedb1880febead00e5d4f4e71fb3cf219e1942e
+Size (nautilus-2.12.2.tar.bz2) = 4057461 bytes
+SHA1 (patch-af) = 0c2403514de7e602faa2d5867d80a17e5ee595ac
 SHA1 (patch-ah) = 081da3e950f04573e136b6ed8c1ce0d057e803c5
-SHA1 (patch-ai) = fe69717dce315877966e7c4d394ddfdcfd379bde
+SHA1 (patch-ai) = 3d460b4688f70628320ace3054718fa248c5602c
diff --git a/sysutils/nautilus/patches/patch-aa b/sysutils/nautilus/patches/patch-aa
deleted file mode 100644
index 6b0dafb6954..00000000000
--- a/sysutils/nautilus/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/10/12 21:53:11 jmmv Exp $
-
---- libnautilus-private/nautilus-file-operations.c.orig	2005-09-26 17:30:05.000000000 +0200
-+++ libnautilus-private/nautilus-file-operations.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include <config.h>
-+#include <locale.h>
- #include <string.h>
- #include <stdio.h>
- #include "nautilus-file-operations.h"
diff --git a/sysutils/nautilus/patches/patch-af b/sysutils/nautilus/patches/patch-af
index 17d848db5e8..c415da46b0d 100644
--- a/sysutils/nautilus/patches/patch-af
+++ b/sysutils/nautilus/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2005/03/22 16:14:16 jmmv Exp $
+$NetBSD: patch-af,v 1.3 2006/01/06 16:53:49 wiz Exp $
 
---- src/nautilus-main.c.orig	2005-03-07 10:00:15.000000000 +0100
+--- src/nautilus-main.c.orig	2005-08-17 21:16:10.000000000 +0200
 +++ src/nautilus-main.c
-@@ -57,6 +57,24 @@
+@@ -58,6 +58,24 @@
  #include <string.h>
  #include <unistd.h>
  
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.2 2005/03/22 16:14:16 jmmv Exp $
  /* Keeps track of everyone who wants the main event loop kept active */
  static GSList *event_loop_registrants;
  
-@@ -420,6 +438,10 @@ main (int argc, char *argv[])
+@@ -421,6 +439,10 @@ main (int argc, char *argv[])
  	} else {
  		/* Run the nautilus application. */
  		application = nautilus_application_new ();
diff --git a/sysutils/nautilus/patches/patch-ai b/sysutils/nautilus/patches/patch-ai
index f72c9bdd337..cb5cc010824 100644
--- a/sysutils/nautilus/patches/patch-ai
+++ b/sysutils/nautilus/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2004/09/21 16:54:57 jmmv Exp $
+$NetBSD: patch-ai,v 1.3 2006/01/06 16:53:49 wiz Exp $
 
---- libnautilus-private/nautilus-program-choosing.c.orig	2004-07-24 16:47:37.000000000 +0200
+--- libnautilus-private/nautilus-program-choosing.c.orig	2005-10-27 09:25:52.000000000 +0200
 +++ libnautilus-private/nautilus-program-choosing.c
-@@ -62,6 +62,11 @@
+@@ -61,6 +61,11 @@
  #include <gdk/gdkx.h>
  #endif