Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21699
Modified Files:
gnome-vfs2-unified.info gnome-vfs2-unified.patch
Log Message:
Remove legacy build fixes and fixes to their side-effects.
Now all internal symbols resolve.
Still missing symbols in public interface vs previous versions.
No explicit 10.3/10.4 differences, but they're probably different
due to ACL and/or other added support on 10.4, so should keep 10.4
"much higher Revision".
Index: gnome-vfs2-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gnome-vfs2-unified.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnome-vfs2-unified.info 20 Jul 2006 07:24:21 -0000 1.5
+++ gnome-vfs2-unified.info 20 Jul 2006 07:47:05 -0000 1.6
@@ -1,6 +1,6 @@
Package: gnome-vfs2-unified
Version: 2.15.3
-Revision: 5
+Revision: 6
Depends: gconf2 (>= 2.8.0-1), %N-shlibs (>= %v-%r)
BuildDepends: <<
bzip2-dev,
@@ -37,25 +37,20 @@
NoSetCPPFLAGS: true
SetCPPFLAGS: -DDBUS_API_SUBJECT_TO_CHANGE=1 -fno-common
-I%p/lib/system-openssl/include -I%p/include
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
-SetLDFLAGS: -L%p/lib/system-openssl/lib -Wl,-undefined,dynamic_lookup
-Wl,-multiply_defined,suppress -lresolv
+SetLDFLAGS: -L%p/lib/system-openssl/lib -lresolv
SetLIBS: -L%p/lib
-ConfigureParams: --enable-ipv6 --enable-howl
--with-openssl-libs=%p/lib/system-openssl/lib
--with-openssl-includes=%p/lib/system-openssl/include --disable-gnutls
--libexecdir=%p/sbin --enable-static --enable-shared
--disable-dependency-tracking
+ConfigureParams: --enable-ipv6 --enable-howl
--with-openssl-libs=%p/lib/system-openssl/lib
--with-openssl-includes=%p/lib/system-openssl/include --disable-gnutls
--libexecdir=%p/sbin --enable-static --enable-shared
--disable-dependency-tracking --disable-schemas-install
CompileScript: <<
#!/bin/sh -ev
SSH_PROGRAM=/usr/bin/ssh ./configure %c
- case `uname -r` in
- # statvfs is detected, but not really there, on 10.3
- 7*) perl -pi -e 's,^.*HAVE_STATVFS.*$,,' config.h ;;
- esac
make
- sed -e 's/-lssl//g' -e 's/-lcrypto//g'
<libgnomevfs/.libs/libgnomevfs-2.lai >libgnomevfs-2.la
+ perl -pi -e 's/-lssl//g; s/-lcrypto//g'
libgnomevfs/.libs/libgnomevfs-2.lai
<<
InstallScript: <<
#!/bin/sh -ev
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
+ make install DESTDIR=%d
rm -rf %i/doc
- install -c -m 644 libgnomevfs-2.la %i/lib/
install -d -m 755 %i/lib/%N
ln -sf %p/sbin/gnome-vfs-daemon %i/lib/%N
install -d %i/share/doc/installed-packages
@@ -173,6 +168,17 @@
where one expects to find daemons, and add symlinks to support
scripts that still use the old location.
<<
+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 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]>
Homepage: http://www.gnome.org/
Index: gnome-vfs2-unified.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gnome-vfs2-unified.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-vfs2-unified.patch 20 Jul 2006 00:52:20 -0000 1.1
+++ gnome-vfs2-unified.patch 20 Jul 2006 07:47:05 -0000 1.2
@@ -1,16 +1,35 @@
+diff -uNr gnome-vfs-2.15.3/configure gnome-vfs-2.15.3-new/configure
+--- gnome-vfs-2.15.3/configure 2006-07-11 03:38:24.000000000 -0400
++++ gnome-vfs-2.15.3-new/configure 2006-07-20 00:11:00.000000000 -0400
+@@ -37651,7 +37651,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
+@@ -37661,7 +37661,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.3/daemon/Makefile.in
gnome-vfs-2.15.3-new/daemon/Makefile.in
--- gnome-vfs-2.15.3/daemon/Makefile.in Tue Jul 11 03:38:34 2006
+++ gnome-vfs-2.15.3-new/daemon/Makefile.in Wed Jul 19 14:34:30 2006
-@@ -368,8 +368,7 @@
+@@ -368,7 +368,6 @@
gnome_vfs_daemon_LDADD = \
$(LIBGNOMEVFS_LIBS) \
$(LIBGNOMEVFSDAEMON_LIBS) \
- $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
-- $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la
-+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la
+ $(top_builddir)/libgnomevfs/libgnomevfsdaemon-2.la
gnome_vfs_daemon_SOURCES = \
- dbus-utils.c \
diff -uNr gnome-vfs-2.15.3/modules/file-method-acl.c
gnome-vfs-2.15.3-new/modules/file-method-acl.c
--- gnome-vfs-2.15.3/modules/file-method-acl.c Tue Jun 13 12:04:46 2006
+++ gnome-vfs-2.15.3-new/modules/file-method-acl.c Wed Jul 19 14:35:22 2006
@@ -22,3 +41,19 @@
#include <sys/resource.h>
#ifdef HAVE_PWD_H
+@@ -721,6 +722,7 @@
+ return GNOME_VFS_ERROR_GENERIC;
+ }
+
++#endif /* HAVE_ACL */
+
+ GnomeVFSResult file_get_acl (const char *path,
+ GnomeVFSFileInfo *info,
+@@ -809,7 +811,6 @@
+ #endif
+ }
+
+-#endif /* HAVE_ACL */
+
+ GnomeVFSResult
+ file_set_acl (const char *path,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
