[25169] trunk/dports/gnome/gnome-vfs/files
source_changes at macosforge.org
source_changes at macosforge.org
Tue May 15 02:53:25 PDT 2007
Revision: 25169
http://trac.macosforge.org/projects/macports/changeset/25169
Author: rhwood at macports.org
Date: 2007-05-15 02:53:25 -0700 (Tue, 15 May 2007)
Log Message:
-----------
Fix broken patches on 10.3.9
Remove unused patch files
Modified Paths:
--------------
trunk/dports/gnome/gnome-vfs/files/patch-modules_file-method-acl.c.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-vfs/files/configure.patch
trunk/dports/gnome/gnome-vfs/files/daemon_Makefile.in.patch
trunk/dports/gnome/gnome-vfs/files/modules_file-method-acl.c.patch
trunk/dports/gnome/gnome-vfs/files/patch_bzip2-method.c
trunk/dports/gnome/gnome-vfs/files/patch_file-metod.c
trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-cdrom.c
trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-utils.c
trunk/dports/gnome/gnome-vfs/files/patch_pty-open.c
Deleted: trunk/dports/gnome/gnome-vfs/files/configure.patch
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/configure.patch 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/configure.patch 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,20 +0,0 @@
---- configure~ 2006-08-05 07:49:16.000000000 -0400
-+++ configure 2006-08-05 07:50:34.000000000 -0400
-@@ -38134,7 +38134,7 @@
-
-
-
--if test $have_posix_acl_support = yes; then
-+if test x"$have_posix_acl_support" = x"yes"; then
- HAVE_POSIX_ACL_TRUE=
- HAVE_POSIX_ACL_FALSE='#'
- else
-@@ -38144,7 +38144,7 @@
-
-
-
--if test $have_solaris_acl_support = yes; then
-+if test x"$have_solaris_acl_support" = x"yes"; then
- HAVE_SOLARIS_ACL_TRUE=
- HAVE_SOLARIS_ACL_FALSE='#'
- else
Deleted: trunk/dports/gnome/gnome-vfs/files/daemon_Makefile.in.patch
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/daemon_Makefile.in.patch 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/daemon_Makefile.in.patch 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,19 +0,0 @@
---- daemon/Makefile.in~ 2006-08-05 09:41:09.000000000 -0400
-+++ daemon/Makefile.in 2006-08-05 09:42:11.000000000 -0400
-@@ -61,7 +61,6 @@
- am__DEPENDENCIES_1 =
- gnome_vfs_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) \
-- $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
- $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -374,7 +373,7 @@
- -I$(top_builddir)/libgnomevfs \
- $(NULL)
-
--gnome_vfs_daemon_LDADD = $(MONIKERS_LIBS) $(LIBGNOMEVFSDAEMON_LIBS) $(top_builddir)/libgnomevfs/libgnomevfs-2.la $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la
-+gnome_vfs_daemon_LDADD = $(MONIKERS_LIBS) $(LIBGNOMEVFSDAEMON_LIBS) $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la
- CORBA_SOURCE = \
- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon.h \
- $(top_builddir)/libgnomevfs/GNOME_VFS_Daemon-common.c \
Deleted: trunk/dports/gnome/gnome-vfs/files/modules_file-method-acl.c.patch
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/modules_file-method-acl.c.patch 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/modules_file-method-acl.c.patch 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,39 +0,0 @@
---- modules/file-method-acl.c~ 2006-08-05 11:45:02.000000000 -0400
-+++ modules/file-method-acl.c 2006-08-05 11:58:27.000000000 -0400
-@@ -34,6 +34,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
-
- #ifdef HAVE_PWD_H
-@@ -46,10 +47,12 @@
-
- #ifdef HAVE_POSIX_ACL
- # include <acl/libacl.h>
-+#define HAVE_ACL
- #endif
-
- #ifdef HAVE_SOLARIS_ACL
- # include <sys/acl.h>
-+#define HAVE_ACL
- #endif
-
- #include "file-method-acl.h"
-@@ -59,6 +62,7 @@
- #define CMD_PERM_EXECUTE 1
- #define CMD_PERM_COND_EXECUTE 8
-
-+#ifdef HAVE_ACL
-
- static char *
- uid_to_string (uid_t uid)
-@@ -717,6 +721,7 @@
- return GNOME_VFS_ERROR_GENERIC;
- }
-
-+#endif /* HAVE_ACL */
-
- GnomeVFSResult file_get_acl (const char *path,
- GnomeVFSFileInfo *info,
Modified: trunk/dports/gnome/gnome-vfs/files/patch-modules_file-method-acl.c.diff
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/patch-modules_file-method-acl.c.diff 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/patch-modules_file-method-acl.c.diff 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,26 +1,10 @@
---- modules/file-method-acl.c~ 2006-08-05 11:45:02.000000000 -0400
-+++ modules/file-method-acl.c 2006-08-05 11:58:27.000000000 -0400
+--- modules/file-method-acl.c~ 2007-05-15 05:57:03.000000000 -0400
++++ modules/file-method-acl.c 2007-05-15 05:57:41.000000000 -0400
@@ -34,6 +34,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
+#include <sys/time.h>
+ #ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
-
- #ifdef HAVE_PWD_H
-@@ -59,6 +62,7 @@
- #define CMD_PERM_EXECUTE 1
- #define CMD_PERM_COND_EXECUTE 8
-
-+#ifdef HAVE_ACL
-
- static char *
- uid_to_string (uid_t uid)
-@@ -717,6 +721,7 @@
- return GNOME_VFS_ERROR_GENERIC;
- }
-
-+#endif /* HAVE_ACL */
-
- GnomeVFSResult file_get_acl (const char *path,
- GnomeVFSFileInfo *info,
+ #endif
Deleted: trunk/dports/gnome/gnome-vfs/files/patch_bzip2-method.c
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/patch_bzip2-method.c 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/patch_bzip2-method.c 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,16 +0,0 @@
---- modules/bzip2-method.c.org Sun Nov 23 17:22:25 2003
-+++ modules/bzip2-method.c Sun Nov 23 17:22:47 2003
-@@ -37,13 +37,6 @@
-
- #include <bzlib.h>
-
--#ifdef HAVE_OLDER_BZIP2
--#define BZ2_bzDecompressInit bzDecompressInit
--#define BZ2_bzCompressInit bzCompressInit
--#define BZ2_bzDecompress bzDecompress
--#define BZ2_bzCompress bzCompress
--#endif
--
- #define BZ_BUFSIZE 5000
-
- struct _Bzip2MethodHandle {
Deleted: trunk/dports/gnome/gnome-vfs/files/patch_file-metod.c
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/patch_file-metod.c 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/patch_file-metod.c 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,22 +0,0 @@
---- modules/file-method.c.org Sun Nov 23 16:51:15 2003
-+++ modules/file-method.c Sun Nov 23 16:51:53 2003
-@@ -91,19 +91,10 @@
- }
- #endif
-
--#ifdef HAVE_OPEN64
--#define OPEN open64
--#else
- #define OPEN open
--#endif
--
--#if defined(HAVE_LSEEK64) && defined(HAVE_OFF64_T)
- #define LSEEK lseek64
--#define OFF_T off64_t
--#else
- #define LSEEK lseek
- #define OFF_T off_t
--#endif
-
- static gchar *
- get_path_from_uri (GnomeVFSURI const *uri)
Deleted: trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-cdrom.c
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-cdrom.c 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-cdrom.c 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,18 +0,0 @@
---- libgnomevfs/gnome-vfs-cdrom.c.org Fri Sep 17 13:59:52 2004
-+++ libgnomevfs/gnome-vfs-cdrom.c Fri Sep 17 14:00:01 2004
-@@ -143,6 +143,7 @@
- #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 +154,7 @@
- return -1;
- }
- return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-+ #endif
- #endif
- }
-
Deleted: trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-utils.c
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-utils.c 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-utils.c 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,12 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.org Thu Jul 24 16:16:25 2003
-+++ libgnomevfs/gnome-vfs-utils.c Thu Jul 24 16:18:09 2003
-@@ -42,6 +42,9 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#define HAVE_STATVFS 0
- #include <unistd.h>
-
- #if HAVE_SYS_STATVFS_H
Deleted: trunk/dports/gnome/gnome-vfs/files/patch_pty-open.c
===================================================================
--- trunk/dports/gnome/gnome-vfs/files/patch_pty-open.c 2007-05-15 08:24:45 UTC (rev 25168)
+++ trunk/dports/gnome/gnome-vfs/files/patch_pty-open.c 2007-05-15 09:53:25 UTC (rev 25169)
@@ -1,105 +0,0 @@
---- modules/pty-open.c.org Fri Sep 17 17:43:28 2004
-+++ modules/pty-open.c Fri Sep 17 17:49:03 2004
-@@ -554,51 +554,6 @@
- static char *
- _gnome_vfs_pty_ptsname(int master)
- {
--#if defined(HAVE_PTSNAME_R)
-- gsize len = 1024;
-- char *buf = NULL;
-- int i;
-- do {
-- buf = g_malloc0(len);
-- i = ptsname_r(master, buf, len - 1);
-- switch (i) {
-- case 0:
-- /* Return the allocated buffer with the name in it. */
--#ifdef GNOME_VFS_DEBUG
-- if (_gnome_vfs_debug_on(GNOME_VFS_DEBUG_PTY)) {
-- fprintf(stderr, "PTY slave is `%s'.\n", buf);
-- }
--#endif
-- return buf;
-- break;
-- default:
-- g_free(buf);
-- buf = NULL;
-- break;
-- }
-- len *= 2;
-- } while ((i != 0) && (errno == ERANGE));
--#elif defined(HAVE_PTSNAME)
-- char *p;
-- if ((p = ptsname(master)) != NULL) {
--#ifdef GNOME_VFS_DEBUG
-- if (_gnome_vfs_debug_on(GNOME_VFS_DEBUG_PTY)) {
-- fprintf(stderr, "PTY slave is `%s'.\n", p);
-- }
--#endif
-- return g_strdup(p);
-- }
--#elif defined(TIOCGPTN)
-- int pty = 0;
-- if (ioctl(master, TIOCGPTN, &pty) == 0) {
--#ifdef GNOME_VFS_DEBUG
-- if (_gnome_vfs_debug_on(GNOME_VFS_DEBUG_PTY)) {
-- fprintf(stderr, "PTY slave is `/dev/pts/%d'.\n", pty);
-- }
--#endif
-- return g_strdup_printf("/dev/pts/%d", pty);
-- }
--#endif
- return NULL;
- }
-
-@@ -606,18 +561,13 @@
- _gnome_vfs_pty_getpt(void)
- {
- int fd, flags;
--#ifdef HAVE_GETPT
-- /* Call the system's function for allocating a pty. */
-- fd = getpt();
--#elif defined(HAVE_POSIX_OPENPT)
-- fd = posix_openpt(O_RDWR | O_NOCTTY);
--#else
-- /* Try to allocate a pty by accessing the pty master multiplex. */
-- fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
-- if ((fd == -1) && (errno == ENOENT)) {
-- fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
-- }
--#endif
-+
-+ /* Try to allocate a pty by accessing the pty master multiplex. */
-+ fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
-+ if ((fd == -1) && (errno == ENOENT)) {
-+ fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
-+ }
-+
- /* Set it to blocking. */
- flags = fcntl(fd, F_GETFL);
- flags &= ~(O_NONBLOCK);
-@@ -628,24 +578,13 @@
- static int
- _gnome_vfs_pty_grantpt(int master)
- {
--#ifdef HAVE_GRANTPT
-- return grantpt(master);
--#else
- return 0;
--#endif
- }
-
- static int
- _gnome_vfs_pty_unlockpt(int fd)
- {
--#ifdef HAVE_UNLOCKPT
-- return unlockpt(fd);
--#elif defined(TIOCSPTLCK)
-- int zero = 0;
-- return ioctl(fd, TIOCSPTLCK, &zero);
--#else
- return -1;
--#endif
- }
-
- static int
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070515/c1e9ea86/attachment.html
More information about the macports-changes
mailing list