From 78136728c9847026705abca3cb78567952e6e5c9 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 10 Nov 2003 23:32:21 +0000 Subject: Update to 2.5.1. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1309 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 2 +- devel/gnome-vfs/distinfo | 2 +- .../files/patch-daemon_gnome-vfs-async-daemon.c | 67 ---------------------- .../files/patch-daemon_gnome-vfs-daemon.c | 26 +++++++++ .../patch-libgnomevfs_gnome-vfs-unix-mounts.c | 19 ++++++ devel/gnome-vfs/pkg-plist | 4 ++ devel/gnomevfs2/Makefile | 2 +- devel/gnomevfs2/distinfo | 2 +- .../files/patch-daemon_gnome-vfs-async-daemon.c | 67 ---------------------- .../files/patch-daemon_gnome-vfs-daemon.c | 26 +++++++++ .../patch-libgnomevfs_gnome-vfs-unix-mounts.c | 19 ++++++ devel/gnomevfs2/pkg-plist | 4 ++ 12 files changed, 102 insertions(+), 138 deletions(-) delete mode 100644 devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c create mode 100644 devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c create mode 100644 devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c delete mode 100644 devel/gnomevfs2/files/patch-daemon_gnome-vfs-async-daemon.c create mode 100644 devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c create mode 100644 devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c (limited to 'devel') diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 000704c05..ad98d7d81 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.5.0.1 +PORTVERSION= 2.5.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 12d8d5540..05aedec8e 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.5.0.1.tar.bz2) = 482e66dbe72c9e1be0fa02d48d16beb6 +MD5 (gnome2/gnome-vfs-2.5.1.tar.bz2) = abae2045675dbaa49dcd904964a16801 diff --git a/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c deleted file mode 100644 index 588665856..000000000 --- a/devel/gnome-vfs/files/patch-daemon_gnome-vfs-async-daemon.c +++ /dev/null @@ -1,67 +0,0 @@ ---- daemon/gnome-vfs-async-daemon.c.orig Thu Oct 23 16:17:06 2003 -+++ daemon/gnome-vfs-async-daemon.c Thu Oct 23 16:19:26 2003 -@@ -23,23 +23,23 @@ - * the context object that has been looked up */ - G_LOCK_DEFINE_STATIC (client_call_context); - --static GnomeVFSAsyncDaemon *async_daemon = NULL; -+static GnomeVFSAsyncDaemon *g_vfs_async_daemon = NULL; - - static void - gnome_vfs_async_daemon_finalize (GObject *object) - { - /* All client calls should have finished before we kill this object */ -- g_assert (g_hash_table_size (async_daemon->client_call_context) == 0); -- g_hash_table_destroy (async_daemon->client_call_context); -+ g_assert (g_hash_table_size (g_vfs_async_daemon->client_call_context) == 0); -+ g_hash_table_destroy (g_vfs_async_daemon->client_call_context); - BONOBO_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); -- async_daemon = NULL; -+ g_vfs_async_daemon = NULL; - } - - static void - gnome_vfs_async_daemon_instance_init (GnomeVFSAsyncDaemon *daemon) - { - daemon->client_call_context = g_hash_table_new (NULL, NULL); -- async_daemon = daemon; -+ g_vfs_async_daemon = daemon; - } - - GnomeVFSContext * -@@ -48,13 +48,13 @@ - { - GnomeVFSContext *context; - -- if (async_daemon == NULL) { -+ if (g_vfs_async_daemon == NULL) { - return NULL; - } - - context = gnome_vfs_context_new (); - G_LOCK (client_call_context); -- g_hash_table_insert (async_daemon->client_call_context, client_call, context); -+ g_hash_table_insert (g_vfs_async_daemon->client_call_context, client_call, context); - G_UNLOCK (client_call_context); - - gnome_vfs_daemon_add_context (client, context); -@@ -72,8 +72,8 @@ - _gnome_vfs_daemon_set_current_daemon_client_call (NULL); - gnome_vfs_daemon_remove_context (client, context); - G_LOCK (client_call_context); -- if (async_daemon != NULL) { -- g_hash_table_remove (async_daemon->client_call_context, client_call); -+ if (g_vfs_async_daemon != NULL) { -+ g_hash_table_remove (g_vfs_async_daemon->client_call_context, client_call); - } - gnome_vfs_context_free (context); - G_UNLOCK (client_call_context); -@@ -176,7 +176,7 @@ - client_call = data; - - G_LOCK (client_call_context); -- context = g_hash_table_lookup (async_daemon->client_call_context, client_call); -+ context = g_hash_table_lookup (g_vfs_async_daemon->client_call_context, client_call); - if (context != NULL) { - cancellation = gnome_vfs_context_get_cancellation (context); - if (cancellation) { diff --git a/devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c new file mode 100644 index 000000000..697e54db0 --- /dev/null +++ b/devel/gnome-vfs/files/patch-daemon_gnome-vfs-daemon.c @@ -0,0 +1,26 @@ +--- daemon/gnome-vfs-daemon.c.orig Mon Nov 10 18:17:52 2003 ++++ daemon/gnome-vfs-daemon.c Mon Nov 10 18:18:30 2003 +@@ -14,7 +14,7 @@ + + /* Global daemon */ + static GnomeVFSDaemon *the_daemon = NULL; +-static GnomeVFSAsyncDaemon *async_daemon = NULL; ++static GnomeVFSAsyncDaemon *gnomevfs_async_daemon = NULL; + + typedef struct { + GNOME_VFS_Client client; +@@ -534,12 +534,12 @@ + the_daemon = g_object_new (GNOME_TYPE_VFS_DAEMON, NULL); + + poa = bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST); +- async_daemon = g_object_new (GNOME_TYPE_VFS_ASYNC_DAEMON, ++ gnomevfs_async_daemon = g_object_new (GNOME_TYPE_VFS_ASYNC_DAEMON, + "poa", poa, + NULL); + CORBA_Object_release ((CORBA_Object)poa, NULL); + bonobo_object_add_interface (BONOBO_OBJECT (the_daemon), +- BONOBO_OBJECT (async_daemon)); ++ BONOBO_OBJECT (gnomevfs_async_daemon)); + } + return BONOBO_OBJECT (the_daemon); + } diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c new file mode 100644 index 000000000..650aea16c --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -0,0 +1,19 @@ +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Nov 10 18:09:17 2003 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Nov 10 18:13:26 2003 +@@ -398,16 +398,6 @@ + mount_entry->is_read_only = TRUE; + } + +-#ifdef HAVE_SYS_SYSCTL_H +- if (usermnt != 0) { +- if (stat (fstab->fs_file, &sb) == 0) { +- if (sb.st_uid != 0) { +- mount_entry->is_user_mountable = TRUE; +- } +- } +- } +-#endif +- + *return_list = g_list_prepend (*return_list, mount_entry); + } + diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 6011ae601..f32c8672e 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -38,6 +38,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h @@ -55,6 +56,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h @@ -73,6 +76,7 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so +lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libextfs.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 000704c05..ad98d7d81 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.5.0.1 +PORTVERSION= 2.5.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 12d8d5540..05aedec8e 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.5.0.1.tar.bz2) = 482e66dbe72c9e1be0fa02d48d16beb6 +MD5 (gnome2/gnome-vfs-2.5.1.tar.bz2) = abae2045675dbaa49dcd904964a16801 diff --git a/devel/gnomevfs2/files/patch-daemon_gnome-vfs-async-daemon.c b/devel/gnomevfs2/files/patch-daemon_gnome-vfs-async-daemon.c deleted file mode 100644 index 588665856..000000000 --- a/devel/gnomevfs2/files/patch-daemon_gnome-vfs-async-daemon.c +++ /dev/null @@ -1,67 +0,0 @@ ---- daemon/gnome-vfs-async-daemon.c.orig Thu Oct 23 16:17:06 2003 -+++ daemon/gnome-vfs-async-daemon.c Thu Oct 23 16:19:26 2003 -@@ -23,23 +23,23 @@ - * the context object that has been looked up */ - G_LOCK_DEFINE_STATIC (client_call_context); - --static GnomeVFSAsyncDaemon *async_daemon = NULL; -+static GnomeVFSAsyncDaemon *g_vfs_async_daemon = NULL; - - static void - gnome_vfs_async_daemon_finalize (GObject *object) - { - /* All client calls should have finished before we kill this object */ -- g_assert (g_hash_table_size (async_daemon->client_call_context) == 0); -- g_hash_table_destroy (async_daemon->client_call_context); -+ g_assert (g_hash_table_size (g_vfs_async_daemon->client_call_context) == 0); -+ g_hash_table_destroy (g_vfs_async_daemon->client_call_context); - BONOBO_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); -- async_daemon = NULL; -+ g_vfs_async_daemon = NULL; - } - - static void - gnome_vfs_async_daemon_instance_init (GnomeVFSAsyncDaemon *daemon) - { - daemon->client_call_context = g_hash_table_new (NULL, NULL); -- async_daemon = daemon; -+ g_vfs_async_daemon = daemon; - } - - GnomeVFSContext * -@@ -48,13 +48,13 @@ - { - GnomeVFSContext *context; - -- if (async_daemon == NULL) { -+ if (g_vfs_async_daemon == NULL) { - return NULL; - } - - context = gnome_vfs_context_new (); - G_LOCK (client_call_context); -- g_hash_table_insert (async_daemon->client_call_context, client_call, context); -+ g_hash_table_insert (g_vfs_async_daemon->client_call_context, client_call, context); - G_UNLOCK (client_call_context); - - gnome_vfs_daemon_add_context (client, context); -@@ -72,8 +72,8 @@ - _gnome_vfs_daemon_set_current_daemon_client_call (NULL); - gnome_vfs_daemon_remove_context (client, context); - G_LOCK (client_call_context); -- if (async_daemon != NULL) { -- g_hash_table_remove (async_daemon->client_call_context, client_call); -+ if (g_vfs_async_daemon != NULL) { -+ g_hash_table_remove (g_vfs_async_daemon->client_call_context, client_call); - } - gnome_vfs_context_free (context); - G_UNLOCK (client_call_context); -@@ -176,7 +176,7 @@ - client_call = data; - - G_LOCK (client_call_context); -- context = g_hash_table_lookup (async_daemon->client_call_context, client_call); -+ context = g_hash_table_lookup (g_vfs_async_daemon->client_call_context, client_call); - if (context != NULL) { - cancellation = gnome_vfs_context_get_cancellation (context); - if (cancellation) { diff --git a/devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c b/devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c new file mode 100644 index 000000000..697e54db0 --- /dev/null +++ b/devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c @@ -0,0 +1,26 @@ +--- daemon/gnome-vfs-daemon.c.orig Mon Nov 10 18:17:52 2003 ++++ daemon/gnome-vfs-daemon.c Mon Nov 10 18:18:30 2003 +@@ -14,7 +14,7 @@ + + /* Global daemon */ + static GnomeVFSDaemon *the_daemon = NULL; +-static GnomeVFSAsyncDaemon *async_daemon = NULL; ++static GnomeVFSAsyncDaemon *gnomevfs_async_daemon = NULL; + + typedef struct { + GNOME_VFS_Client client; +@@ -534,12 +534,12 @@ + the_daemon = g_object_new (GNOME_TYPE_VFS_DAEMON, NULL); + + poa = bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST); +- async_daemon = g_object_new (GNOME_TYPE_VFS_ASYNC_DAEMON, ++ gnomevfs_async_daemon = g_object_new (GNOME_TYPE_VFS_ASYNC_DAEMON, + "poa", poa, + NULL); + CORBA_Object_release ((CORBA_Object)poa, NULL); + bonobo_object_add_interface (BONOBO_OBJECT (the_daemon), +- BONOBO_OBJECT (async_daemon)); ++ BONOBO_OBJECT (gnomevfs_async_daemon)); + } + return BONOBO_OBJECT (the_daemon); + } diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c new file mode 100644 index 000000000..650aea16c --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c @@ -0,0 +1,19 @@ +--- libgnomevfs/gnome-vfs-unix-mounts.c.orig Mon Nov 10 18:09:17 2003 ++++ libgnomevfs/gnome-vfs-unix-mounts.c Mon Nov 10 18:13:26 2003 +@@ -398,16 +398,6 @@ + mount_entry->is_read_only = TRUE; + } + +-#ifdef HAVE_SYS_SYSCTL_H +- if (usermnt != 0) { +- if (stat (fstab->fs_file, &sb) == 0) { +- if (sb.st_uid != 0) { +- mount_entry->is_user_mountable = TRUE; +- } +- } +- } +-#endif +- + *return_list = g_list_prepend (*return_list, mount_entry); + } + diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 6011ae601..f32c8672e 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -38,6 +38,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h @@ -55,6 +56,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h @@ -73,6 +76,7 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h lib/bonobo/monikers/libmoniker_gnome_vfs_std.so lib/gnome-vfs-2.0/modules/libbzip2.so %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so +lib/gnome-vfs-2.0/modules/libcomputer.so lib/gnome-vfs-2.0/modules/libextfs.so lib/gnome-vfs-2.0/modules/libfile.so lib/gnome-vfs-2.0/modules/libftp.so -- cgit v1.2.3