pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs2 Update to 2.6.0. Changes since th...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce22a9d3624b
branches:  trunk
changeset: 471891:ce22a9d3624b
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Apr 01 18:21:20 2004 +0000

description:
Update to 2.6.0.  Changes since the 2.4.x branch:

gnome-vfs 2.6.0
        * Bugs fixed:
                + Some doc fixes
                + Fixed potential buffer in ftp readdir
                + Fix up needs_terminal usage in schema for url handlers

gnome-vfs 2.5.91
        * Bugs fixed:
                + build fixes
                + enable ssl if using gnu tls
                + handle host key changed in sftp method

gnome-vfs 2.5.90
        * Bugs fixed:
                + fix some sftp bugs
                + fix ssl support (wasn't working at all)
                + better webdav support on some servers (including apache)
                + fix crash when monitoring invalid uris
                + handle fam crashing without using 100% cpu
                + fix nautilus crasher
                + better emission of pre_unmount when unmounting volumes
                + fixed some mime sniffing issues (need new shared-mime-info)
                + portability fixes
                + fix memleaks
                + some header changes needed for c++ binding

gnome-vfs 2.5.8
        * Bugs fixed:
                + Text mimetype sniffing
                + portability fixes
        * Features
                + Added gtk file chooser backend (experimental)
                  Note that this introduces a circular build dependency.
                  This will have to be fixed later, but isn't a huge
                  problem atm since nothing is using the backend.
gnome-vfs 2.5.7
        * Bugs fixed:
                + proxy mask parsing bug fixed
                + Eject code on freebsd
                + Fixed leaks
                + DESTDIR install fixes

gnome-vfs 2.5.6
        * Features
                + mime sniffing default method changed
        * Bugs fixed:
                + Portability fixes
                + Force volume reload after mount/unmount
                + handle 32bit linux device numbers
                + fix various mime detection bugs
                + don't confuse user_xattr mount option with user
                + move vfs daemon to libexec

gnome-vfs 2.5.5
        * Features
                + Allow rename to case-different name
                  on case-insensitive filesystems (FAT)
                + Add smb support (requires samba 3.0)
                + Add sftp support
                + Use the xdg mime systems (requires shared-mime-data)
                + Initial network:// support

        * Bugs fixed:
                + Fix drive/volume casting macros
                + Added GPL headers to daemon

gnome-vfs 2.5.4
        * Features
                + performance tweaking of copy block size
                + correct units for kilobytes according to HIG
                + some cleanups of the schemas texts

        * Bugs fixed:
                + fixed up daemon failure handling
                + cd name reading
                + g_object_new crasher
                + removed debug spew
gnome-vfs 2.5.3
        * Features
                + New authentication callbacks, allowing
                  more control and gnome-keyring integration
                + New callback support for http backend
                + moved url handler schemas here
                + real gtypes for gnome-vfs enumerations (Murray Cumming)

        * Bugs fixed:
                + Solaris fixes of the volume handling (Niall Powed, Padraig
                O'Brian)

gnome-vfs 2.5.2
        * Features
                + use ngettext
        * Bugs fixed:
                + no more vfs-daemon zombies
                + fixed gnomevfs-ls escape bug
                + fixed some leaks
                + fixed some http issues

gnome-vfs 2.5.1
        * Features
                + volume monitor
                + computer location

gnome-vfs 2.5.0
        * Features
                + asynchronous seek implementation (Manuel Clos)
                + seek and tell support in the FTP method (Manuel Clos)

        * Featurelets:
                + make the ssh method work with newer ssh (Mitch)

diffstat:

 sysutils/gnome-vfs2/Makefile         |  15 +++++++++----
 sysutils/gnome-vfs2/PLIST            |  33 +++++++++++++++++++++++++++--
 sysutils/gnome-vfs2/buildlink2.mk    |   5 +--
 sysutils/gnome-vfs2/buildlink3.mk    |   5 +--
 sysutils/gnome-vfs2/distinfo         |  16 ++++++++------
 sysutils/gnome-vfs2/patches/patch-aa |  39 +++++++++++------------------------
 sysutils/gnome-vfs2/patches/patch-ab |  21 +++++++++----------
 sysutils/gnome-vfs2/patches/patch-ac |  12 +++++++++++
 sysutils/gnome-vfs2/patches/patch-ad |  34 +++++++++++++++++++++++++++++++
 sysutils/gnome-vfs2/patches/patch-ag |  12 +++++-----
 sysutils/gnome-vfs2/patches/patch-ai |  16 +++++++-------
 11 files changed, 135 insertions(+), 73 deletions(-)

diffs (truncated from 431 to 300 lines):

diff -r af3eee8a8536 -r ce22a9d3624b sysutils/gnome-vfs2/Makefile
--- a/sysutils/gnome-vfs2/Makefile      Thu Apr 01 18:18:00 2004 +0000
+++ b/sysutils/gnome-vfs2/Makefile      Thu Apr 01 18:21:20 2004 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2004/04/01 18:21:20 jmmv Exp $
 #
 
-DISTNAME=              gnome-vfs-2.4.2
+DISTNAME=              gnome-vfs-2.6.0
 PKGNAME=               ${DISTNAME:S/vfs/vfs2/}
-PKGREVISION=           4
 CATEGORIES=            sysutils gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.4/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.6/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            jmmv%NetBSD.org@localhost
@@ -13,6 +12,7 @@
 COMMENT=               GNOME Virtual File System (v2)
 
 BUILD_USES_MSGFMT=     YES
+DEPENDS+=              shared-mime-info>=0.13:../../databases/shared-mime-info
 
 GNU_CONFIGURE=         YES
 USE_BUILDLINK3=                YES
@@ -24,13 +24,16 @@
 PKGCONFIG_OVERRIDE=    gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   gnome-vfs-module-2.0.pc.in
 
-CONFIGURE_ARGS=        --enable-gtk-doc=no
+CONFIGURE_ARGS=        --disable-gtk
+CONFIGURE_ARGS+=       --disable-samba
 CONFIGURE_ARGS+=       --enable-platform-gnome-2
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=       --with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ENV+=                openssl_libs="yes"
 
 CPPFLAGS+=             -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
+CPPFLAGS+=             -DPREFIX=\"\\\"${PREFIX}\\\"\"
+CPPFLAGS+=             -DPKGLOCALEDIR=\"\\\"${PKGLOCALEDIR}\\\"\"
 
 PKG_SYSCONFSUBDIR=     gnome-vfs-2.0
 OWN_DIRS=              ${PKG_SYSCONFDIR}/modules ${PKG_SYSCONFDIR}/vfolders
@@ -52,7 +55,9 @@
 .undef f
 
 GCONF2_SCHEMAS=                desktop_default_applications.schemas
+GCONF2_SCHEMAS+=       desktop_gnome_url_handlers.schemas
 GCONF2_SCHEMAS+=       system_http_proxy.schemas
+GCONF2_SCHEMAS+=       system_smb.schemas
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/cdparanoia/buildlink3.mk"
diff -r af3eee8a8536 -r ce22a9d3624b sysutils/gnome-vfs2/PLIST
--- a/sysutils/gnome-vfs2/PLIST Thu Apr 01 18:18:00 2004 +0000
+++ b/sysutils/gnome-vfs2/PLIST Thu Apr 01 18:21:20 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/02/07 00:07:00 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/01 18:21:20 jmmv Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
 bin/gnomevfs-info
@@ -9,6 +9,8 @@
 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-enum-types.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
@@ -26,6 +28,8 @@
 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
@@ -44,6 +48,7 @@
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.a
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/bonobo/servers/GNOME_VFS_Daemon.server
 lib/bonobo/servers/GNOME_VFS_Moniker_std.server
 lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
 lib/gnome-vfs-2.0/modules/libbzip2.a
@@ -52,6 +57,9 @@
 lib/gnome-vfs-2.0/modules/libcdda.a
 lib/gnome-vfs-2.0/modules/libcdda.la
 lib/gnome-vfs-2.0/modules/libcdda.so
+lib/gnome-vfs-2.0/modules/libcomputer.a
+lib/gnome-vfs-2.0/modules/libcomputer.la
+lib/gnome-vfs-2.0/modules/libcomputer.so
 lib/gnome-vfs-2.0/modules/libextfs.a
 lib/gnome-vfs-2.0/modules/libextfs.la
 lib/gnome-vfs-2.0/modules/libextfs.so
@@ -67,9 +75,15 @@
 lib/gnome-vfs-2.0/modules/libhttp.a
 lib/gnome-vfs-2.0/modules/libhttp.la
 lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnetwork.a
+lib/gnome-vfs-2.0/modules/libnetwork.la
+lib/gnome-vfs-2.0/modules/libnetwork.so
 lib/gnome-vfs-2.0/modules/libnntp.a
 lib/gnome-vfs-2.0/modules/libnntp.la
 lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libsftp.a
+lib/gnome-vfs-2.0/modules/libsftp.la
+lib/gnome-vfs-2.0/modules/libsftp.so
 lib/gnome-vfs-2.0/modules/libssh.a
 lib/gnome-vfs-2.0/modules/libssh.la
 lib/gnome-vfs-2.0/modules/libssh.so
@@ -91,8 +105,8 @@
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.la
 lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.400
-lib/libgnomevfs-2.so.400.2
+lib/libgnomevfs-2.so.600
+lib/libgnomevfs-2.so.600.0
 lib/pkgconfig/gnome-vfs-2.0.pc
 lib/pkgconfig/gnome-vfs-module-2.0.pc
 lib/vfs/2.0/extfs/README
@@ -112,10 +126,12 @@
 lib/vfs/2.0/extfs/trpm
 lib/vfs/2.0/extfs/zip
 lib/vfs/2.0/extfs/zoo
+libexec/gnome-vfs-daemon
 share/doc/html/gnome-vfs-2.0/about.html
 share/doc/html/gnome-vfs-2.0/advanced-operations.html
 share/doc/html/gnome-vfs-2.0/ch08.html
 share/doc/html/gnome-vfs-2.0/data-types.html
+share/doc/html/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
 share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
 share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
 share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
@@ -155,10 +171,14 @@
 share/doc/html/gnome-vfs-2.0/gnome-vfs-file-operations.html
 share/doc/html/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/doc/html/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/html/gnome-vfs-2.0/home.png
 share/doc/html/gnome-vfs-2.0/index.html
 share/doc/html/gnome-vfs-2.0/index.sgml
+share/doc/html/gnome-vfs-2.0/left.png
 share/doc/html/gnome-vfs-2.0/mime-registry.html
 share/doc/html/gnome-vfs-2.0/modules.html
+share/doc/html/gnome-vfs-2.0/right.png
+share/doc/html/gnome-vfs-2.0/up.png
 share/examples/gnome-vfs-2.0/modules/cdda-module.conf
 share/examples/gnome-vfs-2.0/modules/default-modules.conf
 share/examples/gnome-vfs-2.0/modules/ssl-modules.conf
@@ -170,7 +190,9 @@
 share/examples/gnome-vfs-2.0/vfolders/start-here.vfolder-info
 share/examples/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
 share/gconf/schemas/desktop_default_applications.schemas
+share/gconf/schemas/desktop_gnome_url_handlers.schemas
 share/gconf/schemas/system_http_proxy.schemas
+share/gconf/schemas/system_smb.schemas
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -184,6 +206,7 @@
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -195,6 +218,7 @@
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -213,6 +237,7 @@
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -223,8 +248,10 @@
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
diff -r af3eee8a8536 -r ce22a9d3624b sysutils/gnome-vfs2/buildlink2.mk
--- a/sysutils/gnome-vfs2/buildlink2.mk Thu Apr 01 18:18:00 2004 +0000
+++ b/sysutils/gnome-vfs2/buildlink2.mk Thu Apr 01 18:21:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.15 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.16 2004/04/01 18:21:20 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome-vfs2.
 #
@@ -9,8 +9,7 @@
 GNOME_VFS2_BUILDLINK2_MK=      # defined
 
 BUILDLINK_PACKAGES+=                   gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?=         gnome-vfs2>=2.4.2nb2
-BUILDLINK_RECOMMENDED.gnome-vfs2?=     gnome-vfs2>=2.4.2nb4
+BUILDLINK_DEPENDS.gnome-vfs2?=         gnome-vfs2>=2.6.0
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=       ../../sysutils/gnome-vfs2
 
 EVAL_PREFIX+=                          BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
diff -r af3eee8a8536 -r ce22a9d3624b sysutils/gnome-vfs2/buildlink3.mk
--- a/sysutils/gnome-vfs2/buildlink3.mk Thu Apr 01 18:18:00 2004 +0000
+++ b/sysutils/gnome-vfs2/buildlink3.mk Thu Apr 01 18:21:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:21:20 jmmv Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GNOME_VFS2_BUILDLINK3_MK:=     ${GNOME_VFS2_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@
 BUILDLINK_PACKAGES+=   gnome-vfs2
 
 .if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs2+=         gnome-vfs2>=2.4.2nb2
-BUILDLINK_RECOMMENDED.gnome-vfs2?=     gnome-vfs2>=2.4.2nb4
+BUILDLINK_DEPENDS.gnome-vfs2+=         gnome-vfs2>=2.6.0
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=       ../../sysutils/gnome-vfs2
 .endif # GNOME_VFS2_BUILDLINK3_MK
 
diff -r af3eee8a8536 -r ce22a9d3624b sysutils/gnome-vfs2/distinfo
--- a/sysutils/gnome-vfs2/distinfo      Thu Apr 01 18:18:00 2004 +0000
+++ b/sysutils/gnome-vfs2/distinfo      Thu Apr 01 18:21:20 2004 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.14 2004/02/16 20:36:04 snj Exp $
+$NetBSD: distinfo,v 1.15 2004/04/01 18:21:20 jmmv Exp $
 
-SHA1 (gnome-vfs-2.4.2.tar.bz2) = a5439bdabc10b6ec8c8dbe01f90c772aa2d3e0f8
-Size (gnome-vfs-2.4.2.tar.bz2) = 1067445 bytes
-SHA1 (patch-aa) = 88cefbcb5cadf275c6be00c34b5e5b5c5fd6976e
-SHA1 (patch-ab) = a162ffe1e0b396599d57af2c50a7843e75d9dbc1
-SHA1 (patch-ag) = 8dda137fe56462ee2336678a872a43611b11984f
-SHA1 (patch-ai) = d89edb0dc089818191c12360ae542c0edc9fe414
+SHA1 (gnome-vfs-2.6.0.tar.bz2) = a5cfea7568259fc6fe98322a7a01eb70d8f5f615
+Size (gnome-vfs-2.6.0.tar.bz2) = 1431274 bytes
+SHA1 (patch-aa) = 3a8113f861efeb12bec86bff06df1c7d44e7131b
+SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582
+SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560
+SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
+SHA1 (patch-ag) = 73f73a29f7ac4ef644b21cd41b8b0c2d51b4d76e
+SHA1 (patch-ai) = b92f3aad5f3a807c74c6711fd4d40971658e1903
diff -r af3eee8a8536 -r ce22a9d3624b sysutils/gnome-vfs2/patches/patch-aa
--- a/sysutils/gnome-vfs2/patches/patch-aa      Thu Apr 01 18:18:00 2004 +0000
+++ b/sysutils/gnome-vfs2/patches/patch-aa      Thu Apr 01 18:21:20 2004 +0000
@@ -1,28 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2004/02/16 20:36:04 snj Exp $
+$NetBSD: patch-aa,v 1.9 2004/04/01 18:21:20 jmmv Exp $
 
---- modules/cdda-method.c.orig 2004-02-16 11:08:48.000000000 -0800
-+++ modules/cdda-method.c      2004-02-16 11:11:24.000000000 -0800
-@@ -623,7 +623,11 @@ do_get_file_info (GnomeVFSMethod *method
-       /* Check and see if we already have opened and stashed this drive */
-       if (!use_base) {
-               if (global_context != NULL) {
-+#ifndef __FreeBSD__
-                       if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-+#else
-+                      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 @@ do_open_directory (GnomeVFSMethod *metho
-       if (!use_base) {
-               /* Check for cache */
-               if (global_context != NULL) {
-+#ifndef __FreeBSD__
-                               if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-+#else
-+                              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);
+--- libgnomevfs/xdgmime.c.orig 2004-01-20 22:44:22.000000000 +0100
++++ libgnomevfs/xdgmime.c
+@@ -97,7 +97,7 @@ xdg_mime_init (void)
+ 
+       xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+       if (xdg_data_dirs == NULL)
+-      xdg_data_dirs = "/usr/local/share/:/usr/share/";
++      xdg_data_dirs = PREFIX "/share/:/usr/local/share/:/usr/share/";
+
Home | Main Index | Thread Index | Old Index