From 582346a1f522d34582cc37fafb6bdd97502c2f16 Mon Sep 17 00:00:00 2001 From: jmmv Date: Sat, 15 Feb 2003 16:29:31 +0000 Subject: - Note which GNOME bugs are tracking some of the issues we are currently patching. - Remove useless patches that make maintenance harder. - Use glib's g_dir_* functions instead of hacking the local file method to use readdir. - Bump PKGREVISION to 1. Reviewed by wiz. --- sysutils/gnome-vfs2/Makefile | 3 +- sysutils/gnome-vfs2/distinfo | 16 ++--- sysutils/gnome-vfs2/patches/patch-ab | 5 +- sysutils/gnome-vfs2/patches/patch-ad | 12 ---- sysutils/gnome-vfs2/patches/patch-ag | 11 +--- sysutils/gnome-vfs2/patches/patch-ai | 11 +--- sysutils/gnome-vfs2/patches/patch-aj | 22 ------- sysutils/gnome-vfs2/patches/patch-ak | 12 +--- sysutils/gnome-vfs2/patches/patch-al | 120 ++++++++++++++++++++++------------- sysutils/gnome-vfs2/patches/patch-am | 14 ++-- 10 files changed, 97 insertions(+), 129 deletions(-) delete mode 100644 sysutils/gnome-vfs2/patches/patch-ad delete mode 100644 sysutils/gnome-vfs2/patches/patch-aj (limited to 'sysutils/gnome-vfs2') diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 34cd533e2eb..970c8d82e75 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2003/02/14 20:10:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2003/02/15 16:29:31 jmmv Exp $ # DISTNAME= gnome-vfs-2.2.2 PKGNAME= ${DISTNAME:S/vfs/vfs2/} +PKGREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.2/} EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 9a5b8922f63..4a24598c414 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.3 2003/02/14 20:10:02 jmmv Exp $ +$NetBSD: distinfo,v 1.4 2003/02/15 16:29:31 jmmv Exp $ SHA1 (gnome-vfs-2.2.2.tar.bz2) = 98c87820f17bd1b7fa75162f079e25ae515378b0 Size (gnome-vfs-2.2.2.tar.bz2) = 988477 bytes SHA1 (patch-aa) = 7b55f951a970c40e1eb3cf14fabe391e096f7a80 -SHA1 (patch-ab) = 8ecedea0b7208300699b69eebc6225426316020c -SHA1 (patch-ad) = 674e29f933c284fdd33766690b1f45fc32a3d9d9 +SHA1 (patch-ab) = dded13bd541a42530af426597f56997e8de301c2 SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2 -SHA1 (patch-ag) = cb907a0a654032252c63493c3ab9f2566d4980d6 -SHA1 (patch-ai) = f4f49339cd357b702ab619b0ff0bb1c5551ae170 -SHA1 (patch-aj) = 4b0eccb280f14ffe34bc6843f1d9e0889f853895 -SHA1 (patch-ak) = dab3409128ca9f35c017488abb2a95301dfbfd89 -SHA1 (patch-al) = 2e90dfb8eb2eeb900558a578f9e774fc5990d505 -SHA1 (patch-am) = fbe546eb296a0e6a38c1c851a322b34c33e49283 +SHA1 (patch-ag) = 48a1a7e7b780bcf25f311abe0c48524c8fe9eaa4 +SHA1 (patch-ai) = 0cbdf095c4c55a770d13d443d904bb567fee3666 +SHA1 (patch-ak) = 37f441733d26817363440a34bba1a9b66b4bc132 +SHA1 (patch-al) = 8c27ab4e0f6af2b61e842cd19f3bf6d1e325d9f9 +SHA1 (patch-am) = 0e308fd9c5f842df4c75be2e36a06292f8e73cd6 diff --git a/sysutils/gnome-vfs2/patches/patch-ab b/sysutils/gnome-vfs2/patches/patch-ab index eac6bb2b548..9d2be4e9924 100644 --- a/sysutils/gnome-vfs2/patches/patch-ab +++ b/sysutils/gnome-vfs2/patches/patch-ab @@ -1,4 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2003/02/14 20:10:03 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2003/02/15 16:29:32 jmmv Exp $ + +This patch is being tracked in bug #104418. +See http://bugzilla.gnome.org/show_bug.cgi?id=104418 for more details. --- schemas/Makefile.in.orig Mon Jan 20 20:46:20 2003 +++ schemas/Makefile.in diff --git a/sysutils/gnome-vfs2/patches/patch-ad b/sysutils/gnome-vfs2/patches/patch-ad deleted file mode 100644 index c91fa887c42..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/09/11 23:07:51 rh Exp $ - ---- Makefile.am.orig Sat Sep 7 17:53:13 2002 -+++ Makefile.am Sat Sep 7 17:53:08 2002 -@@ -6,7 +6,6 @@ - schemas \ - devel-docs \ - doc \ -- test \ - monikers \ - po - diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag index 87f14c2681a..05b126616bf 100644 --- a/sysutils/gnome-vfs2/patches/patch-ag +++ b/sysutils/gnome-vfs2/patches/patch-ag @@ -1,16 +1,7 @@ -$NetBSD: patch-ag,v 1.2 2003/02/14 20:10:05 jmmv Exp $ +$NetBSD: patch-ag,v 1.3 2003/02/15 16:29:32 jmmv Exp $ --- modules/Makefile.in.orig Mon Jan 20 20:46:17 2003 +++ modules/Makefile.in -@@ -208,7 +208,7 @@ EXTRA_DIST = \ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la - @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = - --module_flags = -export_dynamic -avoid-version -module -+module_flags = -export_dynamic -avoid-version -module -L../libgnomevfs/.libs - modulesdir = $(libdir)/gnome-vfs-2.0/modules - - modules_LTLIBRARIES = \ @@ -232,7 +232,7 @@ modules_LTLIBRARIES = \ # Not currently supported # libnfs.la diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai index 2a6f2a28909..41bed287703 100644 --- a/sysutils/gnome-vfs2/patches/patch-ai +++ b/sysutils/gnome-vfs2/patches/patch-ai @@ -1,16 +1,7 @@ -$NetBSD: patch-ai,v 1.2 2003/02/14 20:10:06 jmmv Exp $ +$NetBSD: patch-ai,v 1.3 2003/02/15 16:29:32 jmmv Exp $ --- modules/vfolder/Makefile.in.orig Mon Jan 20 20:46:19 2003 +++ modules/vfolder/Makefile.in -@@ -211,7 +211,7 @@ EXTRA_DIST = \ - - ### Module setup - --module_flags = -export_dynamic -avoid-version -+module_flags = -export_dynamic -avoid-version -L$(top_builddir)/libgnomevfs/.libs - modulesdir = $(libdir)/gnome-vfs-2.0/modules - - modules_LTLIBRARIES = libvfolder-desktop.la @@ -231,7 +231,7 @@ libvfolder_desktop_la_LIBADD = $(top_bui ### Default .vfolder-info files diff --git a/sysutils/gnome-vfs2/patches/patch-aj b/sysutils/gnome-vfs2/patches/patch-aj deleted file mode 100644 index 00c80288b27..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-aj +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2003/02/14 20:10:06 jmmv Exp $ - ---- configure.in.orig Mon Jan 20 20:24:43 2003 -+++ configure.in -@@ -88,7 +88,7 @@ ALL_LINGUAS="ar az be bg ca cs da de el - AM_GLIB_GNU_GETTEXT - - AC_FUNC_ALLOCA --AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid) -+AC_CHECK_FUNCS(getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid readdir_r) - AC_REPLACE_FUNCS(getdelim) - - dnl Specify the gconf configuration source, -@@ -151,7 +151,7 @@ AC_SUBST(VFS_OFFSET_IS) - AC_SUBST(VFS_SIZE_PRINTF) - AC_SUBST(VFS_OFFSET_PRINTF) - --AC_CHECK_HEADERS(sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h) -+AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statvfs.h) - - dnl ==================================== - dnl = diff --git a/sysutils/gnome-vfs2/patches/patch-ak b/sysutils/gnome-vfs2/patches/patch-ak index 876b1bb52e0..c99683250ce 100644 --- a/sysutils/gnome-vfs2/patches/patch-ak +++ b/sysutils/gnome-vfs2/patches/patch-ak @@ -1,17 +1,7 @@ -$NetBSD: patch-ak,v 1.2 2003/02/14 20:10:07 jmmv Exp $ +$NetBSD: patch-ak,v 1.3 2003/02/15 16:29:33 jmmv Exp $ --- config.h.in.orig Thu Jan 16 18:21:17 2003 +++ config.h.in -@@ -140,6 +140,9 @@ - /* Define to 1 if you have the `statvfs' function. */ - #undef HAVE_STATVFS - -+/* Define to 1 if you have the `readdir_r' function. */ -+#undef HAVE_READDIR_R -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_STDINT_H - @@ -154,6 +157,9 @@ /* Define to 1 if you have the header file. */ diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al index 138729249b8..a019ed26add 100644 --- a/sysutils/gnome-vfs2/patches/patch-al +++ b/sysutils/gnome-vfs2/patches/patch-al @@ -1,61 +1,95 @@ -$NetBSD: patch-al,v 1.1 2002/09/11 23:07:52 rh Exp $ +$NetBSD: patch-al,v 1.2 2003/02/15 16:29:33 jmmv Exp $ ---- modules/file-method.c.orig Mon Sep 9 12:29:10 2002 -+++ modules/file-method.c Mon Sep 9 12:33:33 2002 -@@ -511,8 +511,10 @@ +This patch is being tracked in bug #92844. +See http://bugzilla.gnome.org/show_bug.cgi?id=92844 for more details. + +--- modules/file-method.c.orig 2003-02-12 12:55:48.000000000 +0100 ++++ modules/file-method.c +@@ -488,10 +488,10 @@ do_truncate (GnomeVFSMethod *method, + + typedef struct { + GnomeVFSURI *uri; +- DIR *dir; ++ GDir *dir; + GnomeVFSFileInfoOptions options; + +- struct dirent *current_entry; ++ gchar *current_entry; + + gchar *name_buffer; + gchar *name_ptr; +@@ -499,7 +499,7 @@ typedef struct { + + static DirectoryHandle * + directory_handle_new (GnomeVFSURI *uri, +- DIR *dir, ++ GDir *dir, + GnomeVFSFileInfoOptions options) + { + DirectoryHandle *result; +@@ -511,9 +511,6 @@ directory_handle_new (GnomeVFSURI *uri, result->uri = gnome_vfs_uri_ref (uri); result->dir = dir; -+#ifdef HAVE_READDIR_R - /* Reserve extra space for readdir_r, see man page */ - result->current_entry = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1); -+#endif - +- /* Reserve extra space for readdir_r, see man page */ +- result->current_entry = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1); +- full_name = get_path_from_uri (uri); g_assert (full_name != NULL); /* already done by caller */ -@@ -538,7 +540,9 @@ + full_name_len = strlen (full_name); +@@ -538,7 +535,6 @@ directory_handle_destroy (DirectoryHandl { gnome_vfs_uri_unref (directory_handle->uri); g_free (directory_handle->name_buffer); -+#ifdef HAVE_READDIR_R - g_free (directory_handle->current_entry); -+#endif +- g_free (directory_handle->current_entry); g_free (directory_handle); } -@@ -763,7 +767,11 @@ - handle = (DirectoryHandle *) method_handle; - - errno = 0; -+#ifdef HAVE_READDIR_R - if (readdir_r (handle->dir, handle->current_entry, &result) != 0) { -+#else -+ if ((handle->current_entry = readdir (handle->dir)) == NULL) { -+#endif - /* Work around a Solaris bug. - * readdir64_r returns -1 instead of 0 at EOF. - */ -@@ -773,9 +781,11 @@ +@@ -737,13 +733,13 @@ do_open_directory (GnomeVFSMethod *metho + GnomeVFSContext *context) + { + gchar *directory_name; +- DIR *dir; ++ GDir *dir; + + directory_name = get_path_from_uri (uri); + if (directory_name == NULL) + return GNOME_VFS_ERROR_INVALID_URI; + +- dir = opendir (directory_name); ++ dir = g_dir_open (directory_name, 0, NULL); + g_free (directory_name); + if (dir == NULL) return gnome_vfs_result_from_errno (); - } +@@ -764,7 +760,7 @@ do_close_directory (GnomeVFSMethod *meth + + directory_handle = (DirectoryHandle *) method_handle; + +- closedir (directory_handle->dir); ++ g_dir_close (directory_handle->dir); + + directory_handle_destroy (directory_handle); + +@@ -784,20 +780,9 @@ do_read_directory (GnomeVFSMethod *metho + + handle = (DirectoryHandle *) method_handle; -+#ifdef HAVE_READDIR_R - if (result == NULL) { +- errno = 0; +- if (readdir_r (handle->dir, handle->current_entry, &result) != 0) { +- /* Work around a Solaris bug. +- * readdir64_r returns -1 instead of 0 at EOF. +- */ +- if (errno == 0) { +- return GNOME_VFS_ERROR_EOF; +- } +- return gnome_vfs_result_from_errno (); +- } +- +- if (result == NULL) { ++ handle->current_entry = g_dir_read_name (handle->dir); ++ if (handle->current_entry == NULL) return GNOME_VFS_ERROR_EOF; - } -+#endif +- } file_info->name = g_strdup (result->d_name); -@@ -1068,7 +1078,11 @@ - - item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1); - for (;;) { -+#ifdef HAVE_READDIR_R - if (readdir_r (directory, item_buffer, &item) != 0 || item == NULL) { -+#else -+ if ((item_buffer = readdir (directory)) == NULL) { -+#endif - break; - } - diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am index 2f9869c7f54..86efd3e5f57 100644 --- a/sysutils/gnome-vfs2/patches/patch-am +++ b/sysutils/gnome-vfs2/patches/patch-am @@ -1,16 +1,10 @@ -$NetBSD: patch-am,v 1.2 2003/02/14 20:10:07 jmmv Exp $ +$NetBSD: patch-am,v 1.3 2003/02/15 16:29:33 jmmv Exp $ + +This patch is being tracked in bug #104413. +See http://bugzilla.gnome.org/show_bug.cgi?id=104413 for more details. --- configure.orig Mon Jan 20 20:32:45 2003 +++ configure -@@ -10809,7 +10809,7 @@ fi - - - --for ac_func in getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid -+for ac_func in getdtablesize open64 lseek64 statvfs seteuid setegid setresuid setresgid readdir_r - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -12060,7 +12060,7 @@ esac -- cgit v1.2.3