Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19091
Modified Files:
Tag: pangocairo-branch
gnome-vfs2-unified.info gnome-vfs2-unified.patch
Log Message:
Remove cruft...we no longer build the compat old thing
Index: gnome-vfs2-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-vfs2-unified.info,v
retrieving revision 1.10.2.26
retrieving revision 1.10.2.27
diff -u -d -r1.10.2.26 -r1.10.2.27
--- gnome-vfs2-unified.info 19 Jan 2008 00:53:04 -0000 1.10.2.26
+++ gnome-vfs2-unified.info 21 Jan 2008 18:48:38 -0000 1.10.2.27
@@ -35,9 +35,9 @@
PatchFile-MD5: 54b15d35a7b2f355e9bbd6d906199791
PatchScript: <<
%{default_script}
- perl -pi -e 's|open64|||g; s|posix_fadvise||g' ../gnome-vfs*/configure
- perl -pi -e 's|data_dirs = "/usr|data_dirs = "%p/share:/usr|g'
../gnome-vfs*/libgnomevfs/xdgmime.c
- perl -pi -e 's|/etc/fstab|/etc/fstab.hd|g'
../gnome-vfs*/libgnomevfs/gnome-vfs-unix-mounts.c
+ perl -pi -e 's|open64|||g; s|posix_fadvise||g' configure
+ perl -pi -e 's|data_dirs = "/usr|data_dirs = "%p/share:/usr|g'
libgnomevfs/xdgmime.c
+ perl -pi -e 's|/etc/fstab|/etc/fstab.hd|g'
libgnomevfs/gnome-vfs-unix-mounts.c
<<
SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE=1 -fno-common
-I%p/lib/system-openssl/include
SetCFLAGS: -Os
@@ -59,7 +59,6 @@
make install DESTDIR="%d"
pushd %i/lib
- rm -rf libgnomevfs-2.dylib libgnomevfs-2.la libgnomevfs-2.a pkgconfig
ln -s gnome-vfs2.16/libgnomevfs-2.dylib .
ln -s gnome-vfs2.16/libgnomevfs-2.la .
ln -s gnome-vfs2.16/libgnomevfs-2.a .
@@ -155,19 +154,16 @@
gnome_vfs_mime_get_default_component
If you need any of those symbols, remain below version 2.15.3.
See: http://bugzilla.gnome.org/show_bug.cgi?id=348100
+ Current library is therefore pushed into a subdirectory of lib/
+ so we can keep old around (from older pre-unified packages) if
+ really need it.
<<
DescPort: <<
- Patch ./configure shell syntax in ACL detection.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=348082
-
Patch modules/file-method-acl.c to disable ACL code if no ACL
support: convert to 2.15.3 file, then:
Patch modules/file-method-acl.c to implement its whole public
API even if there is no ACL support present.
See: http://bugzilla.gnome.org/show_bug.cgi?id=348083
-
- Fix linking of the gnome-vfs-daemon binary.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=338015
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: gnome-vfs2-unified.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-vfs2-unified.patch,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- gnome-vfs2-unified.patch 13 Mar 2007 13:15:47 -0000 1.3.2.3
+++ gnome-vfs2-unified.patch 21 Jan 2008 18:48:38 -0000 1.3.2.4
@@ -1,99 +1,3 @@
-diff -uNr gnome-vfs-2.18.0/gnome-vfs-2.15.2.patch
gnome-vfs-2.18.0-new/gnome-vfs-2.15.2.patch
---- gnome-vfs-2.18.0/gnome-vfs-2.15.2.patch 1969-12-31 19:00:00.000000000
-0500
-+++ gnome-vfs-2.18.0-new/gnome-vfs-2.15.2.patch 2007-03-12
15:52:59.000000000 -0400
-@@ -0,0 +1,92 @@
-+diff -uNr gnome-vfs-2.15.2/configure gnome-vfs-2.15.2-new/configure
-+--- gnome-vfs-2.15.2/configure 2006-06-12 07:31:06.000000000 -0400
-++++ gnome-vfs-2.15.2-new/configure 2006-07-21 01:49:47.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
-+diff -uNr gnome-vfs-2.15.2/daemon/Makefile.in
gnome-vfs-2.15.2-new/daemon/Makefile.in
-+--- gnome-vfs-2.15.2/daemon/Makefile.in 2006-06-12 07:31:08.000000000
-0400
-++++ gnome-vfs-2.15.2-new/daemon/Makefile.in 2006-07-21 01:50:24.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 \
-+diff -uNr gnome-vfs-2.15.2/modules/file-method-acl.c
gnome-vfs-2.15.2-new/modules/file-method-acl.c
-+--- gnome-vfs-2.15.2/modules/file-method-acl.c 2006-06-08
09:08:11.000000000 -0400
-++++ gnome-vfs-2.15.2-new/modules/file-method-acl.c 2006-07-21
02:31:06.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,
-+diff -uNr gnome-vfs-2.15.2/libgnomevfs/gnome-vfs-hal-mounts.c
gnome-vfs-2.15.2-new/libgnomevfs/gnome-vfs-hal-mounts.c
-+--- gnome-vfs-2.15.2/libgnomevfs/gnome-vfs-hal-mounts.c 2006-04-26
08:38:53.000000000 -0400
-++++ gnome-vfs-2.15.2-new/libgnomevfs/gnome-vfs-hal-mounts.c 2007-03-03
12:28:43.000000000 -0500
-+@@ -32,7 +32,6 @@
-+ #include <stdlib.h>
-+ #include <string.h>
-+ #include <sys/stat.h>
-+-#include <sys/sysmacros.h>
-+ #include <sys/types.h>
-+ #include <unistd.h>
-+ #include <limits.h>
diff -uNr gnome-vfs-2.18.0/modules/file-method-acl.c
gnome-vfs-2.18.0-new/modules/file-method-acl.c
--- gnome-vfs-2.18.0/modules/file-method-acl.c 2007-03-05 04:05:05.000000000
-0500
+++ gnome-vfs-2.18.0-new/modules/file-method-acl.c 2007-03-12
15:52:59.000000000 -0400
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
