Better patch for gvfsbackendftp.c and regen patches while here.

This commit is contained in:
ajacoutot 2011-08-29 08:50:56 +00:00
parent 69798a56f3
commit 35043a15e3
3 changed files with 19 additions and 25 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2011/07/02 15:46:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.52 2011/08/29 08:50:56 ajacoutot Exp $
COMMENT-main= GNOME virtual file system
COMMENT-smb= samba module for GVFS
@ -9,7 +9,7 @@ GNOME_VERSION= 1.8.2
PKGNAME-main= ${DISTNAME}
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}
REVISION-main= 5
REVISION-main= 6
REVISION-smb= 0
SHARED_LIBS += gvfscommon 3.0 # .0.0

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-config_h_in,v 1.1 2011/06/15 07:21:13 ajacoutot Exp $
$OpenBSD: patch-config_h_in,v 1.2 2011/08/29 08:50:56 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=652623
--- config.h.in.orig Wed Jun 15 08:59:13 2011
+++ config.h.in Wed Jun 15 08:59:34 2011
@@ -192,6 +192,9 @@
/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
--- config.h.in.orig Mon May 23 16:39:04 2011
+++ config.h.in Mon Aug 29 10:44:48 2011
@@ -198,6 +198,9 @@
/* Define to 1 if you have the `unlockpt' function. */
#undef HAVE_UNLOCKPT
+/* Define to 1 if you have the <util.h> header file. */
+#undef HAVE_UTIL_H
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the <utmp.h> header file. */
#undef HAVE_UTMP_H

View File

@ -1,21 +1,15 @@
$OpenBSD: patch-daemon_gvfsbackendftp_c,v 1.1 2011/06/02 18:34:16 ajacoutot Exp $
$OpenBSD: patch-daemon_gvfsbackendftp_c,v 1.2 2011/08/29 08:50:56 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=651729
--- daemon/gvfsbackendftp.c.orig Thu Jun 2 20:16:07 2011
+++ daemon/gvfsbackendftp.c Thu Jun 2 20:19:05 2011
@@ -1073,13 +1073,7 @@ try_query_settable_attributes (GVfsBackend *backend,
GFileAttributeInfoList *list;
if (!g_vfs_backend_ftp_has_feature (ftp, G_VFS_FTP_FEATURE_CHMOD))
- {
- g_vfs_job_failed (G_VFS_JOB (job),
- G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED,
- _("Operation unsupported"));
--- daemon/gvfsbackendftp.c.orig Mon May 23 16:38:05 2011
+++ daemon/gvfsbackendftp.c Mon Aug 29 10:43:50 2011
@@ -1078,7 +1078,7 @@ try_query_settable_attributes (GVfsBackend *backend,
G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
_("Operation unsupported"));
- return FALSE;
- }
+ return FALSE;
+ return TRUE;
}
list = g_file_attribute_info_list_new ();