diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-06 02:06:10 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-06 02:06:10 +0800 |
| commit | 3b4ed5a905f7ca4ccebe84741c89494ad10cd61e (patch) | |
| tree | fd94ec431b68e47f56e77a89701eda49966932ca | |
| parent | 9a4c06ea0187720172ca0eaa6add8bb42cf6790e (diff) | |
| download | marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.tar marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.tar.gz marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.tar.bz2 marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.tar.lz marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.tar.xz marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.tar.zst marcuscom-ports-3b4ed5a905f7ca4ccebe84741c89494ad10cd61e.zip | |
This patch is no longer needed since this problem was fixed in a better way.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4715 df743ca5-7f9a-e211-a948-0013205c9059
4 files changed, 4 insertions, 72 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 8a6a94ad9..20e19e337 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,11 +3,12 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.87 2005/08/23 03:03:32 marcus Exp $ +# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.88 2005/09/05 15:24:41 kwm Exp $ # PORTNAME= nautilus2 PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c deleted file mode 100644 index d6465800a..000000000 --- a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-file-operations.c +++ /dev/null @@ -1,35 +0,0 @@ ---- libnautilus-private/nautilus-file-operations.c.orig Thu Aug 25 10:28:10 2005 -+++ libnautilus-private/nautilus-file-operations.c Mon Sep 5 17:09:55 2005 -@@ -2481,12 +2481,22 @@ - gpointer data) - { - struct NewFileData *new_data; -- char source_file_str[] = "/tmp/nautilus-sourceXXXXXX"; -+ char *source_file_str; - char *source_file_uri; -+ GnomeVFSURI *parent_uri; - FILE *source_file; - char *target_filename; - int fd; - -+ parent_uri = gnome_vfs_uri_new (parent_dir); -+ if (parent_uri == NULL) { -+ (*done_callback) (NULL, data); -+ return; -+ } -+ -+ source_file_str = g_build_filename (gnome_vfs_uri_get_path (parent_uri), -+ "nautilus-sourceXXXXXX", NULL); -+ - fd = mkstemp (source_file_str); - if (fd == -1) { - (*done_callback) (NULL, data); -@@ -2518,6 +2528,8 @@ - new_file_from_temp_callback, - new_data); - -+ gnome_vfs_uri_unref (parent_uri); -+ g_free (source_file_str); - g_free (source_file_uri); - g_free (target_filename); - } diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 8a6a94ad9..20e19e337 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -3,11 +3,12 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.87 2005/08/23 03:03:32 marcus Exp $ +# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.88 2005/09/05 15:24:41 kwm Exp $ # PORTNAME= nautilus2 PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12 diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c deleted file mode 100644 index d6465800a..000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-file-operations.c +++ /dev/null @@ -1,35 +0,0 @@ ---- libnautilus-private/nautilus-file-operations.c.orig Thu Aug 25 10:28:10 2005 -+++ libnautilus-private/nautilus-file-operations.c Mon Sep 5 17:09:55 2005 -@@ -2481,12 +2481,22 @@ - gpointer data) - { - struct NewFileData *new_data; -- char source_file_str[] = "/tmp/nautilus-sourceXXXXXX"; -+ char *source_file_str; - char *source_file_uri; -+ GnomeVFSURI *parent_uri; - FILE *source_file; - char *target_filename; - int fd; - -+ parent_uri = gnome_vfs_uri_new (parent_dir); -+ if (parent_uri == NULL) { -+ (*done_callback) (NULL, data); -+ return; -+ } -+ -+ source_file_str = g_build_filename (gnome_vfs_uri_get_path (parent_uri), -+ "nautilus-sourceXXXXXX", NULL); -+ - fd = mkstemp (source_file_str); - if (fd == -1) { - (*done_callback) (NULL, data); -@@ -2518,6 +2528,8 @@ - new_file_from_temp_callback, - new_data); - -+ gnome_vfs_uri_unref (parent_uri); -+ g_free (source_file_str); - g_free (source_file_uri); - g_free (target_filename); - } |