diff options
Diffstat (limited to 'devel/gnomevfs2')
| -rw-r--r-- | devel/gnomevfs2/Makefile | 2 | ||||
| -rw-r--r-- | devel/gnomevfs2/distinfo | 2 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c | 26 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c | 11 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-modules_cdda-method.c | 26 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-modules_ssh-method.c | 10 | ||||
| -rw-r--r-- | devel/gnomevfs2/pkg-plist | 81 |
7 files changed, 13 insertions, 145 deletions
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index ad98d7d81..e6cc6c9de 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.5.1 +PORTVERSION= 2.5.2 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 05aedec8e..280b70a89 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.5.1.tar.bz2) = abae2045675dbaa49dcd904964a16801 +MD5 (gnome2/gnome-vfs-2.5.2.tar.bz2) = 9bce94e51bd378e9a3c3d0465c07c35d diff --git a/devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c b/devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c deleted file mode 100644 index 697e54db0..000000000 --- a/devel/gnomevfs2/files/patch-daemon_gnome-vfs-daemon.c +++ /dev/null @@ -1,26 +0,0 @@ ---- 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-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c new file mode 100644 index 000000000..69c10480d --- /dev/null +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -0,0 +1,11 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Mon Nov 24 15:43:38 2003 ++++ libgnomevfs/gnome-vfs-utils.c Mon Nov 24 15:44:01 2003 +@@ -852,7 +852,7 @@ + paths = g_strsplit (gnome_var, ":", 0); + + for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { +- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); ++ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); + if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { + g_strfreev (paths); + return full_filename; diff --git a/devel/gnomevfs2/files/patch-modules_cdda-method.c b/devel/gnomevfs2/files/patch-modules_cdda-method.c deleted file mode 100644 index d1692cc03..000000000 --- a/devel/gnomevfs2/files/patch-modules_cdda-method.c +++ /dev/null @@ -1,26 +0,0 @@ ---- modules/cdda-method.c.orig Wed Jan 22 13:54:31 2003 -+++ modules/cdda-method.c Wed Jan 22 13:54:33 2003 -@@ -623,7 +623,11 @@ - // Check and see if we already have opened and stashed this drive - if (!use_base) { - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { -+#endif - use_cache = TRUE; - cdda_close (drive); - gnome_vfs_file_info_copy (file_info, global_context->file_info); -@@ -709,7 +713,11 @@ - if (!use_base) { - // Check for cache - if (global_context != NULL) { -+#ifdef Linux - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { -+#elif defined(__FreeBSD__) -+ if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { -+#endif - // Clear old cache - cdda_context_free (global_context); - global_context = cdda_context_new (drive, uri); diff --git a/devel/gnomevfs2/files/patch-modules_ssh-method.c b/devel/gnomevfs2/files/patch-modules_ssh-method.c deleted file mode 100644 index 14b2cf886..000000000 --- a/devel/gnomevfs2/files/patch-modules_ssh-method.c +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/ssh-method.c.orig Mon Jun 10 13:28:42 2002 -+++ modules/ssh-method.c Mon Jun 10 13:28:51 2002 -@@ -34,6 +34,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <signal.h> - #include <unistd.h> - - typedef struct { diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index f32c8672e..d4ff2f428 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -116,12 +116,7 @@ libdata/pkgconfig/gnome-vfs-module-2.0.pc share/doc/gnome-vfs-2.0/about.html share/doc/gnome-vfs-2.0/advanced-operations.html share/doc/gnome-vfs-2.0/ch08.html -share/doc/gnome-vfs-2.0/c9456.html -share/doc/gnome-vfs-2.0/c9466.html share/doc/gnome-vfs-2.0/data-types.html -share/doc/gnome-vfs-2.0/directory-operations.html -share/doc/gnome-vfs-2.0/everything-else.html -share/doc/gnome-vfs-2.0/file-operations.html share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html @@ -158,84 +153,10 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html -share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html -share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html -share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html -share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html -share/doc/gnome-vfs-2.0/gnome-vfs-context.html -share/doc/gnome-vfs-2.0/gnome-vfs-directory.html share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html -share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html -share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html -share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html -share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html -share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html -share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html -share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html -share/doc/gnome-vfs-2.0/gnome-vfs-method.html -share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html -share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html -share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html -share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html -share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html -share/doc/gnome-vfs-2.0/gnome-vfs-mime.html -share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html -share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html -share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html -share/doc/gnome-vfs-2.0/gnome-vfs-module.html -share/doc/gnome-vfs-2.0/gnome-vfs-ops.html -share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html -share/doc/gnome-vfs-2.0/gnome-vfs-process.html -share/doc/gnome-vfs-2.0/gnome-vfs-result.html -share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html -share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html -share/doc/gnome-vfs-2.0/gnome-vfs-types.html -share/doc/gnome-vfs-2.0/gnome-vfs-uri.html -share/doc/gnome-vfs-2.0/gnome-vfs-utils.html share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html -share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html -share/doc/gnome-vfs-2.0/gnome-vfs.devhelp share/doc/gnome-vfs-2.0/home.png share/doc/gnome-vfs-2.0/index.html share/doc/gnome-vfs-2.0/index.sgml @@ -244,8 +165,6 @@ share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/right.png share/doc/gnome-vfs-2.0/up.png -share/doc/gnome-vfs-2.0/writing-modules.html -share/doc/gnome-vfs-2.0/x27.html share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo |