diff options
author | drochner <drochner> | 2005-10-07 16:10:44 +0000 |
---|---|---|
committer | drochner <drochner> | 2005-10-07 16:10:44 +0000 |
commit | ba9d66c88633664ca292f89b9fca998f94711f48 (patch) | |
tree | eca3de57cacd345746489a231d941c8767c07e16 /sysutils/gnome-vfs2 | |
parent | f7aa4f6d2dc0acc25970765c371593fd32d9310e (diff) | |
download | pkgsrc-ba9d66c88633664ca292f89b9fca998f94711f48.tar.gz |
update to 2.12.1.1
too many fixes and feature additions to list here, see the NEWS
file in the distribution
Diffstat (limited to 'sysutils/gnome-vfs2')
-rw-r--r-- | sysutils/gnome-vfs2/Makefile | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/Makefile.common | 9 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/PLIST | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/distinfo | 23 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ac | 13 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ad | 14 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ae | 10 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-af | 20 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ah | 19 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ao | 11 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ap | 18 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-at | 13 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-av | 13 |
13 files changed, 57 insertions, 114 deletions
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index e38b0ed1d2b..e9a9240d844 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/09/05 14:15:32 adam Exp $ - -PKGREVISION= 1 +# $NetBSD: Makefile,v 1.51 2005/10/07 16:10:44 drochner Exp $ PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index dca88d4b603..475d38aae1d 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.21 2005/08/10 20:56:23 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/10/07 16:10:44 drochner Exp $ # -DISTNAME= gnome-vfs-2.10.1 +DISTNAME= gnome-vfs-2.12.1.1 PKGNAME= ${DISTNAME:S/vfs/vfs2/} CATEGORIES?= sysutils CATEGORIES+= gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.10/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.12/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -23,6 +23,7 @@ USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES USE_PKGINSTALL= YES +CONFIGURE_ARGS+= --disable-cdda CONFIGURE_ARGS+= --disable-fam CONFIGURE_ARGS+= --disable-gtk CONFIGURE_ARGS+= --disable-howl @@ -70,7 +71,7 @@ SUBST_STAGE.libs= pre-configure SUBST_FILES.libs= modules/Makefile.in SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g' -BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.1 +BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.12.1.1 .include "../../sysutils/gnome-vfs2/buildlink3.mk" PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index 00a980138e2..5cc1484121c 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2005/04/26 18:03:18 drochner Exp $ +@comment $NetBSD: PLIST,v 1.17 2005/10/07 16:10:44 drochner Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-info @@ -67,9 +67,7 @@ lib/gnome-vfs-2.0/modules/libnetwork.la lib/gnome-vfs-2.0/modules/libnntp.la lib/gnome-vfs-2.0/modules/libsftp.la lib/gnome-vfs-2.0/modules/libtar.la -lib/gnome-vfs-2.0/modules/libvfs-pipe.la lib/gnome-vfs-2.0/modules/libvfs-test.la -lib/gnome-vfs-2.0/modules/libvfs-translate.la lib/libgnomevfs-2.la lib/pkgconfig/gnome-vfs-2.0.pc lib/pkgconfig/gnome-vfs-module-2.0.pc diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 3b57dbcd8e9..813ddda4bb3 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,22 +1,19 @@ -$NetBSD: distinfo,v 1.41 2005/08/25 16:23:42 reed Exp $ +$NetBSD: distinfo,v 1.42 2005/10/07 16:10:44 drochner Exp $ -SHA1 (gnome-vfs-2.10.1.tar.bz2) = e5dc34cc9ea4a570c1fda31e0adadfa2271a5aaa -RMD160 (gnome-vfs-2.10.1.tar.bz2) = 4336a26eab0558759b0b099ed8bb2c7f3342b0d4 -Size (gnome-vfs-2.10.1.tar.bz2) = 1905314 bytes +SHA1 (gnome-vfs-2.12.1.1.tar.bz2) = 48e484663f0d0f5e2a858d2f6e6a5a702e831734 +RMD160 (gnome-vfs-2.12.1.1.tar.bz2) = b96cd620ce60131c0ff467fd277d89ac76419e09 +Size (gnome-vfs-2.12.1.1.tar.bz2) = 1726588 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 -SHA1 (patch-ac) = 6c9604b57eab2429935dffac8c17e09fa6e3e53a -SHA1 (patch-ad) = 2e8159aa2fdf6a01ee46a450054dd329669af0b5 -SHA1 (patch-ae) = 32fe1a4e82d96bf80f3364704e7369a4ee778e0f -SHA1 (patch-af) = ebbd81c92403cd429a807f9a89c81971d1c4fb88 +SHA1 (patch-ad) = fe233b03b0fc97f7bd34b29d79fef38f900365f4 +SHA1 (patch-ae) = 572b40dfa035dab5ef374aa73d2acacfcb72d641 +SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 SHA1 (patch-ag) = 78f7d50beaeab8b33c554e6cfaf510cdba3b00ba -SHA1 (patch-ah) = 8bd1ead2097c8e65fd1e83b62ff976052c72a793 +SHA1 (patch-ah) = 4bd07f6c3d356505babba2a14e250c5f480296c0 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 -SHA1 (patch-ao) = 38bd5859bff41642c2d1a26c16d90d780387b2d0 -SHA1 (patch-ap) = f13b6a4e0740a211e87bd820a266b2ce038f932c +SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 +SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b SHA1 (patch-ar) = 99c99d0d90ed7a0d804b349f532d3a17c780d506 -SHA1 (patch-at) = b75ad2f2accb0ca8986f8c4e2771028fceca41b4 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c -SHA1 (patch-av) = 77e9b0e7fdde8637973a16ed6260ffb132f91caf SHA1 (patch-aw) = 22801eb932f8f7e7256be3863fcd5273a7a5213e diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac deleted file mode 100644 index 4c1bc805d05..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2005/04/12 20:12:02 jmmv Exp $ - ---- modules/cdda-cddb.c.orig 2004-07-25 15:40:35.000000000 +0000 -+++ modules/cdda-cddb.c -@@ -440,7 +440,7 @@ CDDBDoQuery (cdrom_drive *cd_desc, CDDBS - query->query_match=MATCH_INEXACT; - query->query_matches=0; - -- while(!CDDBReadLine(socket,inbuffer,256)) { -+ while(query->query_matches < MAX_INEXACT_MATCHES && !CDDBReadLine(socket,inbuffer,256)) { - query->query_list[query->query_matches].list_genre= - CDDBGenreValue(ChopWhite(strtok(inbuffer," "))); - diff --git a/sysutils/gnome-vfs2/patches/patch-ad b/sysutils/gnome-vfs2/patches/patch-ad index 5840fcea2fb..488266ed1aa 100644 --- a/sysutils/gnome-vfs2/patches/patch-ad +++ b/sysutils/gnome-vfs2/patches/patch-ad @@ -1,8 +1,6 @@ -$NetBSD: patch-ad,v 1.4 2005/06/02 17:10:10 jmmv Exp $ +$NetBSD: patch-ad,v 1.5 2005/10/07 16:10:44 drochner Exp $ -http://bugzilla.gnome.org/show_bug.cgi?id=134276 - ---- modules/cdda-method.c.orig 2004-01-22 13:29:10.000000000 +0100 +--- modules/cdda-method.c.orig 2005-05-08 15:40:13.000000000 +0200 +++ modules/cdda-method.c @@ -623,10 +623,10 @@ do_get_file_info (GnomeVFSMethod *method /* Check and see if we already have opened and stashed this drive */ @@ -10,8 +8,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=134276 if (global_context != NULL) { -#ifdef __linux__ - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { --#elif defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) { +#else + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) { @@ -24,8 +22,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=134276 if (global_context != NULL) { -#ifdef __linux__ - if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { --#elif defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) { +#else + if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) { diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae index 6739b362674..b3d079bb3f3 100644 --- a/sysutils/gnome-vfs2/patches/patch-ae +++ b/sysutils/gnome-vfs2/patches/patch-ae @@ -1,14 +1,14 @@ -$NetBSD: patch-ae,v 1.7 2004/11/28 13:00:17 recht Exp $ +$NetBSD: patch-ae,v 1.8 2005/10/07 16:10:44 drochner Exp $ ---- configure.orig Thu Oct 28 16:16:54 2004 -+++ configure Sat Nov 27 20:51:53 2004 -@@ -25971,9 +25971,11 @@ +--- configure.orig 2005-10-05 10:56:02.000000000 +0200 ++++ configure +@@ -25942,9 +25942,11 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { +#ifndef HAVE_STATVFS struct statfs st; - statfs(NULL, &st); + statfs(NULL, &st); ; +#endif return 0; diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af index 0459d4fcdf2..2a0cdb3116f 100644 --- a/sysutils/gnome-vfs2/patches/patch-af +++ b/sysutils/gnome-vfs2/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.7 2005/03/22 15:56:41 jmmv Exp $ +$NetBSD: patch-af,v 1.8 2005/10/07 16:10:44 drochner Exp $ ---- libgnomevfs/gnome-vfs-cdrom.c.orig 2005-02-10 11:00:21.000000000 +0100 +--- libgnomevfs/gnome-vfs-cdrom.c.orig 2005-05-08 19:49:56.000000000 +0200 +++ libgnomevfs/gnome-vfs-cdrom.c @@ -37,6 +37,8 @@ @@ -11,19 +11,3 @@ $NetBSD: patch-af,v 1.7 2005/03/22 15:56:41 jmmv Exp $ #endif #ifdef HAVE_SYS_CDIO_H -@@ -143,6 +145,7 @@ _gnome_vfs_get_cdrom_type (const char *v - #endif /* defined(__FreeBSD__) */ - return type; - #else -+ #if !defined(__APPLE__) - *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); - if (*fd < 0) { - return -1; -@@ -153,6 +156,7 @@ _gnome_vfs_get_cdrom_type (const char *v - return -1; - } - return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); -+ #endif - #endif - } - diff --git a/sysutils/gnome-vfs2/patches/patch-ah b/sysutils/gnome-vfs2/patches/patch-ah index 70d1d7d55b1..d8f2e6191d6 100644 --- a/sysutils/gnome-vfs2/patches/patch-ah +++ b/sysutils/gnome-vfs2/patches/patch-ah @@ -1,18 +1,17 @@ -$NetBSD: patch-ah,v 1.5 2005/07/06 06:36:03 reed Exp $ +$NetBSD: patch-ah,v 1.6 2005/10/07 16:10:44 drochner Exp $ ---- libgnomevfs/gnome-vfs-resolve.c.orig Fri May 6 18:06:26 2005 -+++ libgnomevfs/gnome-vfs-resolve.c Fri May 6 18:15:23 2005 -@@ -172,8 +172,12 @@ - switch (error) { +--- libgnomevfs/gnome-vfs-resolve.c.orig 2005-04-19 13:54:52.000000000 +0200 ++++ libgnomevfs/gnome-vfs-resolve.c +@@ -172,9 +172,11 @@ _gnome_vfs_result_from_gai_error (int er case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; + #ifdef EAI_ADDRFAMILY - case EAI_ADDRFAMILY: -+#ifdef EAI_ADDRFAMILY -+ case EAI_ADDRFAMILY: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; -+#endif ++ case EAI_ADDRFAMILY: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; + #endif +#ifdef EAI_NODATA case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; +#endif + #ifdef EAI_SYSTEM case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - case EAI_FAIL: - case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; + #endif diff --git a/sysutils/gnome-vfs2/patches/patch-ao b/sysutils/gnome-vfs2/patches/patch-ao index 2867f11961d..98b03c93d30 100644 --- a/sysutils/gnome-vfs2/patches/patch-ao +++ b/sysutils/gnome-vfs2/patches/patch-ao @@ -1,18 +1,17 @@ -$NetBSD: patch-ao,v 1.1 2004/10/24 18:03:24 recht Exp $ +$NetBSD: patch-ao,v 1.2 2005/10/07 16:10:44 drochner Exp $ ---- libgnomevfs/gnome-vfs-utils.c.orig Sun Oct 24 17:36:16 2004 -+++ libgnomevfs/gnome-vfs-utils.c Sun Oct 24 17:37:27 2004 -@@ -46,6 +46,13 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig 2005-09-15 13:02:53.000000000 +0200 ++++ libgnomevfs/gnome-vfs-utils.c +@@ -49,6 +49,12 @@ #include <sys/param.h> #include <sys/stat.h> #include <sys/types.h> + +#ifdef __APPLE__ -+#include <sys/param.h> +#include <sys/mount.h> +#define HAVE_STATVFS 0 +#endif + #include <unistd.h> - #if HAVE_SYS_STATVFS_H + #define KILOBYTE_FACTOR 1024.0 diff --git a/sysutils/gnome-vfs2/patches/patch-ap b/sysutils/gnome-vfs2/patches/patch-ap index fd24613f588..f576219be30 100644 --- a/sysutils/gnome-vfs2/patches/patch-ap +++ b/sysutils/gnome-vfs2/patches/patch-ap @@ -1,8 +1,16 @@ -$NetBSD: patch-ap,v 1.1 2004/10/24 18:03:24 recht Exp $ +$NetBSD: patch-ap,v 1.2 2005/10/07 16:10:44 drochner Exp $ ---- modules/file-method.c.orig Sun Oct 24 18:55:16 2004 -+++ modules/file-method.c Sun Oct 24 18:56:12 2004 -@@ -94,13 +94,13 @@ +--- modules/file-method.c.orig 2005-07-15 15:46:53.000000000 +0200 ++++ modules/file-method.c +@@ -66,6 +66,7 @@ + #if HAVE_SYS_VFS_H + #include <sys/vfs.h> + #elif HAVE_SYS_MOUNT_H ++#include <sys/param.h> + #include <sys/mount.h> + #endif + +@@ -173,13 +174,13 @@ GET_PATH_MAX (void) } #endif @@ -10,7 +18,7 @@ $NetBSD: patch-ap,v 1.1 2004/10/24 18:03:24 recht Exp $ +#if defined(HAVE_OPEN64) && !defined(__APPLE__) #define OPEN open64 #else - #define OPEN open + #define OPEN g_open #endif -#if defined(HAVE_LSEEK64) && defined(HAVE_OFF64_T) diff --git a/sysutils/gnome-vfs2/patches/patch-at b/sysutils/gnome-vfs2/patches/patch-at deleted file mode 100644 index 59dc6e527f1..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.1 2005/01/11 12:32:53 jmmv Exp $ - ---- libgnomevfs/gnome-vfs-mime-info.c.orig 2004-10-18 09:13:03.000000000 +0200 -+++ libgnomevfs/gnome-vfs-mime-info.c -@@ -149,7 +149,7 @@ gnome_vfs_mime_init (void) - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = PREFIX "/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/sysutils/gnome-vfs2/patches/patch-av b/sysutils/gnome-vfs2/patches/patch-av deleted file mode 100644 index 029a4027be2..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.3 2005/04/05 20:29:04 rillig Exp $ - ---- modules/smb-method.c.orig Sat Apr 2 09:46:02 2005 -+++ modules/smb-method.c Sat Apr 2 09:46:12 2005 -@@ -1446,7 +1446,7 @@ do_read (GnomeVFSMethod *method, - GnomeVFSContext *context) - { - FileHandle *handle = (FileHandle *)method_handle; -- GnomeVFSResult res = GNOME_VFS_OK;; -+ GnomeVFSResult res = GNOME_VFS_OK; - SmbAuthContext actx; - ssize_t n = 0; - |