Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29422/10.3/unstable/main/finkinfo/gnome
Modified Files:
gnome-vfs2.info gnome-vfs2.patch
Log Message:
new upstream
Index: gnome-vfs2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gnome-vfs2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnome-vfs2.patch 3 Aug 2005 05:17:11 -0000 1.5
+++ gnome-vfs2.patch 19 Jul 2006 19:28:17 -0000 1.6
@@ -1,158 +1,24 @@
-diff -ruN ../gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-cdrom.c
gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-cdrom.c
---- ../gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-cdrom.c 2005-02-09
11:00:47.000000000 -0600
-+++ gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-cdrom.c 2005-06-25
15:00:56.000000000 -0500
-@@ -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
- }
+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
-diff -ruN ../gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-utils.c
gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-utils.c
---- ../gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-utils.c 2005-02-23
03:15:42.000000000 -0600
-+++ gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-utils.c 2005-06-25
14:45:08.000000000 -0500
-@@ -46,6 +46,9 @@
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#define HAVE_STATVFS 0
+ 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>
- #if HAVE_SYS_STATVFS_H
-diff -ruN ../gnome-vfs-2.10.1/modules/bzip2-method.c
gnome-vfs-2.10.1/modules/bzip2-method.c
---- ../gnome-vfs-2.10.1/modules/bzip2-method.c 2004-01-22 06:29:10.000000000
-0600
-+++ gnome-vfs-2.10.1/modules/bzip2-method.c 2005-06-25 15:01:07.000000000
-0500
-@@ -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 {
-diff -ruN ../gnome-vfs-2.10.1/modules/pty-open.c
gnome-vfs-2.10.1/modules/pty-open.c
---- ../gnome-vfs-2.10.1/modules/pty-open.c 2005-02-09 07:10:44.000000000
-0600
-+++ gnome-vfs-2.10.1/modules/pty-open.c 2005-06-25 14:45:08.000000000
-0500
-@@ -606,51 +606,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;
- }
-
-@@ -658,18 +613,11 @@
- _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
- /* Set it to blocking. */
- flags = fcntl(fd, F_GETFL);
- flags &= ~(O_NONBLOCK);
-@@ -680,24 +630,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
---- gnome-vfs2-2.10.1-5/gnome-vfs-2.10.1/Makefile.in 2005-04-11
02:07:40.000000000 -0500
-+++ gnome-vfs-2.10.1/Makefile.in 2005-06-26 03:05:08.000000000 -0500
-@@ -230,7 +230,6 @@
- devel-docs \
- doc \
- programs \
-- test \
- monikers \
- po
-
+ #ifdef HAVE_PWD_H
Index: gnome-vfs2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/gnome-vfs2.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gnome-vfs2.info 3 Aug 2005 05:17:11 -0000 1.21
+++ gnome-vfs2.info 19 Jul 2006 19:28:17 -0000 1.22
@@ -1,125 +1,143 @@
Package: gnome-vfs2
-Version: 2.10.1
-Revision: 5
-Depends: <<
- %N-shlibs (>= %v-%r),
- gconf2 (>= 2.8.0-1),
- glib2 (>= 2.6.0-1),
- libbonobo2 (>= 2.6.0-1),
- libgettext3-shlibs,
- libiconv,
- orbit2 (>= 2.10.0-1)
-<<
+Version: 2.15.3
+Revision: 1
+Depends: gconf2 (>= 2.8.0-1), %N-shlibs (>= %v-%r)
BuildDepends: <<
- fink (>= 0.24.8-1),
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.6.0-1),
+ 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,
- (%N = gnome-vfs2-ssl) openssl097-dev,
orbit2-dev (>= 2.10.0-1),
pkgconfig,
- popt
+ popt,
+ system-openssl-dev
<<
-BuildConflicts: libcdparanoia0-dev
-Conflicts: gnome-vfs2, gnome-vfs2-ssl
+Conflicts: gnome-vfs2 (<< 2.14.2-1), gnome-vfs2-ssl (<< 2.14.2-1)
Replaces: gnome-vfs2, gnome-vfs2-ssl, libgnome2 (<< 2.6.0-6)
-Source: mirror:gnome:sources/gnome-vfs/2.10/gnome-vfs-%v.tar.bz2
-Source-MD5: 88b520e5de748a310a2aef62fc095c8b
+Source: mirror:gnome:sources/gnome-vfs/2.15/gnome-vfs-%v.tar.bz2
+Source-MD5: f7eb8f2c658d6c8dfc34b5a2161e6890
Patch: %n.patch
PatchScript: <<
- perl -pi.bak -e 's|open64|||g; s|posix_fadvise||g' configure
- perl -pi.bak -e 's|data_dirs = "/usr|data_dirs = "%p/share:/usr|g' \
- libgnomevfs/xdgmime.c libgnomevfs/gnome-vfs-mime-info.c
- perl -pi.bak -e 's|/etc/fstab|/etc/fstab.hd|g'
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 libgnomevfs/gnome-vfs-mime-info.c
+ perl -pi -e 's|/etc/fstab|/etc/fstab.hd|g'
libgnomevfs/gnome-vfs-unix-mounts.c
<<
-SetCPPFLAGS: -flat_namespace -undefined suppress
-SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -flat_namespace -undefined
suppress
-SetLDFLAGS: -lresolv
+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 --disable-howl (%N = gnome-vfs2-ssl)
--with-openssl-libs=%p (%N != gnome-vfs2-ssl) --disable-openssl
--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
CompileScript: <<
- ./configure %c
- perl -pi.bak -e 's/-lkrb5support//g' `find . -name Makefile`
- make
- sed -e 's/-lssl//g' -e 's/-lcrypto//g' <libgnomevfs/.libs/libgnomevfs-2.lai
>libgnomevfs-2.la
+#!/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: <<
- 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 -s %p/sbin/gnome-vfs-daemon %i/lib/%N
+#!/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
+ touch %i/share/doc/installed-packages/gnome-vfs2-ssl${type}
+ 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
+ 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: <<
+ Package: %N-shlibs
+ Depends: <<
bzip2-shlibs,
+ dbus-shlibs (>= 0.60-1),
gconf2-shlibs (>= 2.8.0-1),
- glib2-shlibs (>= 2.6.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),
- (%N = gnome-vfs2-ssl) openssl097-shlibs,
orbit2-shlibs (>= 2.10.0-1),
popt-shlibs
- <<
- DescPackaging: <<
- share/locale was in %N until 2.10.0-5
- <<
- Conflicts: gnome-vfs2-shlibs, gnome-vfs2-ssl-shlibs
- Replaces: gnome-vfs2-shlibs, gnome-vfs2-ssl-shlibs, 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-shlibs (>=
2.10.1-5) | gnome-vfs2-ssl-shlibs (>= 2.10.1-5)
- DocFiles: AUTHORS COPYING* ChangeLog NEWS README
+ <<
+ DescPackaging: <<
+ share/locale was in %N until 2.10.0-5
+ <<
+ Conflicts: gnome-vfs2-shlibs (<< 2.14.2-1), gnome-vfs2-ssl-shlibs (<<
2.14.2-1)
+ Replaces: gnome-vfs2-shlibs, gnome-vfs2-ssl-shlibs, 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.14.2-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.0-1), libxml2 (>= 2.6.7-1), orbit2-dev (>= 2.10.0-1)
+ 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
- bonobo/monikers/lib*.{a,la} were in %N until 2.10.0-5
- <<
- Conflicts: gnome-vfs2-dev, gnome-vfs2-ssl-dev
- Replaces: gnome-vfs2-dev, gnome-vfs2-ssl-dev, 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
- lib/bonobo/monikers/*a
- <<
- DocFiles: AUTHORS COPYING* ChangeLog NEWS README
+ modules/lib*.{a,la} were in %N-shlibs until 2.10.0-5
+ <<
+ Conflicts: gnome-vfs2-dev (<< 2.14.2-1), gnome-vfs2-ssl-dev (<<
2.14.2-1)
+ Replaces: gnome-vfs2-dev, gnome-vfs2-ssl-dev, 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
<<
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
+ %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
@@ -131,14 +149,14 @@
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)
+ 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.
+ 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]>
-------------------------------------------------------------------------
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
