Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5054/10.4/unstable/main/finkinfo/gnome
Added Files:
gnome-vfs2-unified.info gnome-vfs2-unified.patch
Removed Files:
gnome-vfs2.info gnome-vfs2.patch
Log Message:
I fell into the same trap thesin did... "surely this will work OK!" nope, need
to do -unified to fix all upgrade issues :(
--- NEW FILE: gnome-vfs2-unified.patch ---
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 @@
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
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
@@ -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
--- NEW FILE: gnome-vfs2-unified.info ---
Package: gnome-vfs2-unified
Version: 2.15.3
Revision: 13
Depends: gconf2 (>= 2.8.0-1), %N-shlibs (>= %v-%r)
BuildDepends: <<
bzip2-dev,
dbus-dev (>= 0.60-1),
fink (>= 0.24.8-1),
gconf2-dev (>= 2.8.0-1),
gconf2 (>= 2.8.0-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.12.0-1),
gtk-doc (>= 1.2-1),
intltool (>= 0.30-1),
libbonobo2-dev (>= 2.8.0-1),
libgettext3-dev,
libhowl-dev,
libiconv-dev,
libxml2 (>= 2.6.7-1),
libxslt,
orbit2-dev (>= 2.10.0-1),
pkgconfig,
popt,
system-openssl-dev
<<
Replaces: gnome-vfs2 (<< %v-%r), gnome-vfs2-ssl (<< %v-%r), libgnome2 (<<
2.6.0-6)
Source: mirror:gnome:sources/gnome-vfs/2.15/gnome-vfs-%v.tar.bz2
Source-MD5: f7eb8f2c658d6c8dfc34b5a2161e6890
Patch: %n.patch
PatchScript: <<
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 libgnomevfs/gnome-vfs-mime-info.c
perl -pi -e 's|/etc/fstab|/etc/fstab.hd|g'
libgnomevfs/gnome-vfs-unix-mounts.c
<<
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
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
CompileScript: <<
#!/bin/sh -ev
./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
<<
InstallScript: <<
#!/bin/sh -ev
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 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
for type in "" "-shlibs" "-dev"; do
for ssl in "" "-ssl"; do
touch
%i/share/doc/installed-packages/gnome-vfs2${ssl}${type}
done
done
<<
PostInstScript: <<
if [ configure = "$1" ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
for i in desktop_default_applications
desktop_gnome_url_handlers \
system_dns_sd system_http_proxy system_smb; do
gconftool-2 --makefile-install-rule
%p/etc/gconf/schemas/$i.schemas >/dev/null
done
fi
<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
bzip2-shlibs,
dbus-shlibs (>= 0.60-1),
gconf2-shlibs (>= 2.8.0-1),
glib2-shlibs (>= 2.6.6-1111),
gnome-mime-data (>= 2.4.0-1),
libbonobo2-shlibs (>= 2.8.0-1),
libgettext3-shlibs,
libiconv,
libxml2-shlibs (>= 2.6.7-1),
orbit2-shlibs (>= 2.10.0-1),
popt-shlibs
<<
DescPackaging: <<
share/locale was in %N until 2.10.0-5
<<
Replaces: gnome-vfs2-shlibs (<< %v-%r), gnome-vfs2-ssl-shlibs (<<
%v-%r), gnome-vfs2 (<< 2.10.1-5), gnome-vfs2-ssl (<< 2.10.1-5)
Files: lib/libgnomevfs-2.*.dylib lib/gnome-vfs-2.0/modules/*.so
share/locale
Shlibs: %p/lib/libgnomevfs-2.0.dylib 1001.0.0 gnome-vfs2-unified-shlibs
(>= 2.15.3-1)
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
DescPackaging: <<
Uses pkgconfig.
Any package which BuildDepends on this one must also
BuildDepend on:
glib2-dev (>= 2.6.6-1111), libxml2 (>= 2.6.7-1),
orbit2-dev (>= 2.10.0-1)
modules/lib*.{a,la} were in %N-shlibs until 2.10.0-5
<<
Replaces: gnome-vfs2-dev (<< %v-%r), gnome-vfs2-ssl-dev (<< %v-%r),
gnome-vfs2 (<< 2.10.1-5), gnome-vfs2-ssl (<< 2.10.1-5), gnome-vfs2-shlibs (<<
2.10.0-5), gnome-vfs2-ssl-shlibs (<< 2.10.0-5)
BuildDependsOnly: True
Files: <<
include lib/gnome-vfs-2.0 lib/pkgconfig share/gtk-doc
lib/libgnomevfs-2.*a lib/libgnomevfs-2.dylib
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
SplitOff3: <<
Package: gnome-vfs2-ssl
Depends: %N (>= %v-%r)
Files: share/doc/installed-packages/%n
<<
SplitOff4: <<
Package: gnome-vfs2-ssl-dev
Depends: %N-dev (>= %v-%r)
Files: share/doc/installed-packages/%n
<<
SplitOff5: <<
Package: gnome-vfs2-ssl-shlibs
Depends: %N-shlibs (>= %v-%r)
Files: share/doc/installed-packages/%n
<<
SplitOff6: <<
Package: gnome-vfs2
Depends: %N (>= %v-%r)
Files: share/doc/installed-packages/%n
<<
SplitOff7: <<
Package: gnome-vfs2-dev
Depends: %N-dev (>= %v-%r)
Files: share/doc/installed-packages/%n
<<
SplitOff8: <<
Package: gnome-vfs2-shlibs
Depends: %N-shlibs (>= %v-%r)
Files: share/doc/installed-packages/%n
<<
ConfFiles: <<
%p/etc/gnome-vfs-2.0/modules/default-modules.conf
%p/etc/gconf/schemas/desktop_default_applications.schemas
%p/etc/gconf/schemas/desktop_gnome_url_handlers.schemas
%p/etc/gconf/schemas/system_dns_sd.schemas
%p/etc/gconf/schemas/system_http_proxy.schemas
%p/etc/gconf/schemas/system_smb.schemas
<<
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
Description: The GNOME virtual file-system libraries
DescDetail: <<
GNOME VFS is the GNOME virtual file system. It is the foundation of the
Nautilus file manager. It provides a modular architecture and ships with
several modules that implement support for file systems, http, ftp and others.
It provides a URI-based API, a backend supporting asynchronous file operations,
a MIME type manipulation library and other features.
<<
DescPackaging: <<
Remove -lssl and -lcrypto flags from *.la files to make dependent
programs depends on those crypto libraries directly and pass their
own flags. (makes %n and %n-ssl more interchangeable at runtime)
v2.6 had libexecdir as %p/lib/%n so switching to/from -ssl changed
where the daemon was. Now always put in %p/sbin in both packages,
where one expects to find daemons, and add symlinks to support
scripts that still use the old location.
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
--- gnome-vfs2.patch DELETED ---
--- gnome-vfs2.info DELETED ---
-------------------------------------------------------------------------
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
