Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv8223
Modified Files:
Tag: pangocairo-branch
gnome-vfs2-unified.info gnome-vfs2-unified.patch
Log Message:
think this is finally clean (NB: not sane)
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.28
retrieving revision 1.10.2.29
diff -u -d -r1.10.2.28 -r1.10.2.29
--- gnome-vfs2-unified.info 21 Jan 2008 19:47:16 -0000 1.10.2.28
+++ gnome-vfs2-unified.info 23 Jan 2008 00:33:40 -0000 1.10.2.29
@@ -2,54 +2,54 @@
Version: 2.20.1
Epoch: 1
-Revision: 1
+Revision: 2
-Depends: %N-shlibs (>= %e:%v-%r), gconf2 (>= 2.20.0-1)
+Depends: %N-shlibs (= %e:%v-%r), gconf2 (>= 2.20.0-1)
BuildDepends: <<
+ autoconf (>= 2.60),
+ automake1.9,
avahi-dev,
libavahi-glib1-dev,
+ libtool14,
bzip2-dev,
- dbus-dev (>= 1.0-1),
+ dbus-dev (>= 1.0.2-1),
fink (>= 0.24.12-1),
gconf2-dev (>= 2.20.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.12.0-1),
+ glib2-dev (>= 2.14.0-1),
+ gnome-common (>= 2.20.0-1),
gtk-doc (>= 1.8-1),
intltool (>= 0.36.0-1),
libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
libgettext3-dev,
libiconv-dev,
libxml2 (>= 2.6.7-1),
libxslt,
- orbit2-dev (>= 2.14.9-1),
- pkgconfig,
- popt,
+ orbit2-dev (>= 2.14.10-1),
+ pkgconfig (>= 0.21-1),
system-openssl-dev
<<
Replaces: gnome-vfs2 (<< 2.15.0-1), gnome-vfs2-ssl (<< 2.15.0-1), libgnome2
(<< 2.6.0-6)
Source: mirror:gnome:sources/gnome-vfs/2.20/gnome-vfs-%v.tar.bz2
Source-MD5: a350a5a3e201951d7e7867d0900df423
PatchFile: %n.patch
-PatchFile-MD5: 940b5d914eda455ba382ecc71951b667
+PatchFile-MD5: 2c8fb12203b1989ba52660216cf21daa
PatchScript: <<
%{default_script}
- perl -pi -e 's|open64|||g; s|posix_fadvise||g' configure
+ perl -pi -e 's|open64|||g; s|posix_fadvise||g' configure.in
+ autoreconf -f -i
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
+SetCPPFLAGS: -fno-common
SetCFLAGS: -Os
-SetLDFLAGS: -L%p/lib/system-openssl/lib -lresolv
-SetLIBS: -L%p/lib
+SetLDFLAGS: -L%p/lib/system-openssl/lib
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-ConfigureParams: --enable-ipv6 --enable-avahi --disable-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
+ConfigureParams: --enable-ipv6 --enable-avahi --disable-howl --disable-gnutls
--disable-samba --libexecdir=%p/sbin --enable-static --enable-shared
--disable-dependency-tracking --disable-schemas-install
PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
-#!/bin/sh -ev
-
- SSH_PROGRAM=/usr/bin/ssh ./configure %c --libdir=%p/lib/gnome-vfs2.16
+ SSH_PROGRAM=/usr/bin/ssh gvfs_cv_HAVE_POSIX_ACLS=no ./configure %c
--libdir=%p/lib/gnome-vfs2.16
make
perl -pi -e 's/-lssl//g; s/-lcrypto//g'
libgnomevfs/.libs/libgnomevfs-2.lai
<<
@@ -76,21 +76,19 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- bzip2-shlibs,
- dbus-shlibs (>= 1.0-1),
- gconf2-shlibs (>= 2.20.0-1),
- glib2-shlibs (>= 2.12.0-1),
- gnome-mime-data (>= 2.18.0-1),
- libavahi-client3-shlibs,
- libavahi-common3-shlibs,
- libavahi-glib1-shlibs,
- libbonobo2-shlibs (>= 2.20.0-1),
- libgettext3-shlibs,
- libhowl-shlibs,
- libiconv,
- libxml2-shlibs (>= 2.6.7-1),
- orbit2-shlibs (>= 2.14.9-1),
- popt-shlibs
+ bzip2-shlibs,
+ dbus-shlibs (>= 1.0.2-1),
+ gconf2-shlibs (>= 2.20.0-1),
+ glib2-shlibs (>= 2.14.0-1),
+ gnome-mime-data (>= 2.18.0-1),
+ libavahi-client3-shlibs,
+ libavahi-common3-shlibs,
+ libavahi-glib1-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libxml2-shlibs (>= 2.6.7-1),
+ orbit2-shlibs (>= 2.14.10-1),
+ xdg-base
<<
DescPackaging: <<
share/locale was in %N until 2.10.0-5
@@ -111,9 +109,8 @@
Depends: %N-shlibs (= %e:%v-%r)
DescPackaging: <<
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
<<
- Replaces: gnome-vfs2-dev (<< 2.15.0-1), gnome-vfs2-ssl-dev (<<
2.15.0-1), 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)
+ Replaces: gnome-vfs2-dev (<< 2.15.0-1), gnome-vfs2-ssl-dev (<<
2.15.0-1), gnome-vfs2-shlibs (<< 2.10.0-5), gnome-vfs2-ssl-shlibs (<< 2.10.0-5)
BuildDependsOnly: True
Files: <<
include share/gtk-doc
@@ -141,10 +138,10 @@
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)
+ own flags. (avoids accidental linking of fink's openssl)
- 2.15.3 will probably have no popt, bonobo, or orbit2 dependencies
- 2.15.3 will not have monikers
+ Play many games to place openssl flags first in order to
+ assure system-openssl-dev trumps fink's opensslX packages
<<
DescUsage: <<
ABI BREAKAGE! Between 2.15.2 and 2.15.3, several symbols were
@@ -159,11 +156,16 @@
really need it.
<<
DescPort: <<
- 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
+ Need -lresolv to get res_9_ symbols due to <resolv.h>. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=509715
+
+ Clean up neon compiler flags. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=511189
+ And also don't bother with NEON_CFLAGS that are not
+ appropriate when compiling neon in its own directory.
+
+ Not fixing ACL-support test. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=511195
<<
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.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- gnome-vfs2-unified.patch 21 Jan 2008 18:48:38 -0000 1.3.2.4
+++ gnome-vfs2-unified.patch 23 Jan 2008 00:33:40 -0000 1.3.2.5
@@ -1,40 +1,146 @@
-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
-@@ -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>
- #endif
-@@ -49,10 +50,12 @@
- #ifdef HAVE_POSIX_ACL
- # include <acl/libacl.h>
- #define HAVE_ACL 1
-+#define HAVE_ACL
- #endif
+diff -Nurd -x'*~' gnome-vfs-2.20.1.orig/acinclude.m4
gnome-vfs-2.20.1/acinclude.m4
+--- gnome-vfs-2.20.1.orig/acinclude.m4 2007-11-12 03:37:06.000000000 -0500
++++ gnome-vfs-2.20.1/acinclude.m4 2008-01-22 16:32:14.000000000 -0500
+@@ -235,7 +235,6 @@
+ AC_MSG_NOTICE([using bundled neon ($NEON_VERSION)])
+ NEON_BUILD_BUNDLED="yes"
+ LIBNEON_SOURCE_CHECKS
+-NEON_CFLAGS="$CFLAGS -I.. -I../.. -I$srcdir/$neon_bundled_srcdir"
+ NEON_NEED_XML_PARSER=yes
+ neon_library_message="included libneon (${NEON_VERSION})"
- #ifdef HAVE_SOLARIS_ACL
- # include <sys/acl.h>
-+#define HAVE_ACL
- #define HAVE_ACL 1
- #endif
+@@ -267,8 +266,8 @@
-@@ -63,6 +66,7 @@
- #define CMD_PERM_EXECUTE 1
- #define CMD_PERM_COND_EXECUTE 8
+ #xml parser stuff
+ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $XML_REQUIRED)
+-NEON_CFLAGS="$NEON_CFLAGS $LIBXML_CFLAGS"
+-NEON_LIBS="$NEON_LIBS $LIBXML_LIBS"
++NEON_CFLAGS="$NEON_CFLAGS $OPENSSL_CFLAGS $LIBXML_CFLAGS"
++NEON_LIBS="$NEON_LIBS $OPENSSL_LIBS $LIBXML_LIBS"
-+#ifdef HAVE_ACL
+ AC_DEFINE(HAVE_LIBXML, 1, [Define if you have libxml])
- #ifdef HAVE_ACL
+@@ -324,7 +323,7 @@
-@@ -693,6 +697,7 @@
- #endif /* HAVE_SOLARIS_ACL */
+ if test "x$have_gssapi" = "xyes"; then
+- NEON_CFLAGS="$NEON_CFALGS $GSSAPI_CFLAGS"
++ NEON_CFLAGS="$NEON_CFLAGS $GSSAPI_CFLAGS"
+ NEON_LIBS="$NEON_LIBS $GSSAPI_LIBS"
-+#endif /* HAVE_ACL */
+ fi
+@@ -403,10 +402,11 @@
+ Darwin) ne_cv_os_macosx=yes ;;
+ *) ne_cv_os_macosx=no ;;
+ esac])
+-if test $ne_cv_os_macosx = yes; then
+- CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+- LDFLAGS="$LDFLAGS -flat_namespace"
+-fi
++dnl not appropriate for modern darwin (back at least to 10.3)
++dnl if test $ne_cv_os_macosx = yes; then
++dnl CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
++dnl LDFLAGS="$LDFLAGS -flat_namespace"
++dnl fi
+ ])
- /* **************************************************************************
*/
- /* Common */
+ AC_DEFUN([NEON_FORMAT_PREP], [
+@@ -540,6 +540,7 @@
+ AC_REQUIRE([AC_TYPE_SIZE_T])
+ AC_REQUIRE([AC_TYPE_OFF_T])
+
++
+ AC_REQUIRE([NE_MACOSX])
+
+ AC_REQUIRE([AC_PROG_MAKE_SET])
+diff -Nurd -x'*~' gnome-vfs-2.20.1.orig/configure.in
gnome-vfs-2.20.1/configure.in
+--- gnome-vfs-2.20.1.orig/configure.in 2007-11-12 03:37:06.000000000 -0500
++++ gnome-vfs-2.20.1/configure.in 2008-01-22 17:27:12.000000000 -0500
+@@ -451,8 +451,8 @@
+ AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+
+ if test "x$KRB5_CONFIG" != "xnone"; then
+- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
++ GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi | sed -e 's,-L/usr/lib,,'`"
++ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi | sed -e
's,-L/usr/include,,'`"
+
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+@@ -489,7 +489,6 @@
+ dnl ******************************
+ dnl http-method (neon checks)
+ dnl ******************************
+-VFS_NEON_BUNDLED(imported/neon)
+
+ AC_ARG_ENABLE(http-debug,
+ [AS_HELP_STRING([--enable-http-debug],[Enable HTTP method debugging])],
+@@ -658,6 +657,10 @@
+ dnl end of PKG_CHECK_MODULES(openssl)
+ fi
+
++# this is patched (acinclude.m4) to slurp OPENSSL_, so must be after
++# openssl tests, cf http://bugzilla.gnome.org/show_bug.cgi?id=511189
++VFS_NEON_BUNDLED(imported/neon)
++
+ dnl ****************************
+ dnl GNUTLS
+ dnl ****************************
+@@ -1045,8 +1048,8 @@
+ dnl
==============================================================================
+
+ PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED
gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED
gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >=
$XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS
$HOWL_CFLAGS $AVAHI_CFLAGS"
+-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS
$AVAHI_LIBS $RESOLVER_LIBS"
++LIBGNOMEVFS_CFLAGS="$OPENSSL_CFLAGS $LIBGNOMEVFS_CFLAGS $LIBGNUTLS_CFLAGS
$HOWL_CFLAGS $AVAHI_CFLAGS"
++LIBGNOMEVFS_LIBS="$OPENSSL_LIBS $LIBGNOMEVFS_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS
$AVAHI_LIBS $RESOLVER_LIBS"
+ AC_SUBST(LIBGNOMEVFS_CFLAGS)
+ AC_SUBST(LIBGNOMEVFS_LIBS)
+
+@@ -1095,7 +1098,7 @@
+
+ AC_CACHE_CHECK([for POSIX ACL], gvfs_cv_HAVE_POSIX_ACLS,[
+ acl_LIBS=$LIBS
+- LIBS="$LIBS -lacl"
++ LIBS="$LIBS $ACL_LIBS"
+ AC_TRY_LINK([#include <sys/types.h>
+ #include <sys/acl.h>],
+ [ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry (acl,
entry_id, entry_p);],
+diff -Nurd -x'*~' gnome-vfs-2.20.1.orig/imported/neon/Makefile.am
gnome-vfs-2.20.1/imported/neon/Makefile.am
+--- gnome-vfs-2.20.1.orig/imported/neon/Makefile.am 2007-11-12
03:37:01.000000000 -0500
++++ gnome-vfs-2.20.1/imported/neon/Makefile.am 2008-01-22 03:16:13.000000000
-0500
+@@ -9,13 +9,12 @@
+ INCLUDES = \
+ -DNE_HAVE_DAV \
+ $(SSL_DEFINES) \
+- $(NEON_CFLAGS) \
+- $(LIBGNOMEVFS_CFLAGS) \
+- $(GSSAPI_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/libgnomevfs \
+ -I$(top_builddir)/libgnomevfs \
++ $(NEON_CFLAGS) \
++ $(LIBGNOMEVFS_CFLAGS) \
+ $(NULL)
+
+ noinst_LTLIBRARIES = libneon.la
+@@ -64,6 +63,7 @@
+
+ libneon_la_LIBADD = \
+ $(NEON_LIBS) $(NEON_LTLIBS) \
++ $(LIBGNOMEVFS_LIBS) \
+ $(NULL)
+
+ libneon_la_LDFLAGS = \
+diff -Nurd -x'*~' gnome-vfs-2.20.1.orig/libgnomevfs/Makefile.am
gnome-vfs-2.20.1/libgnomevfs/Makefile.am
+--- gnome-vfs-2.20.1.orig/libgnomevfs/Makefile.am 2007-11-12
03:36:48.000000000 -0500
++++ gnome-vfs-2.20.1/libgnomevfs/Makefile.am 2008-01-22 18:55:49.000000000
-0500
+@@ -114,6 +114,7 @@
+ $(SOCKET_LIBS) \
+ $(INTLLIBS) \
+ $(SELINUX_LIBS) \
++ -lresolv \
+ $(NULL)
+
+ libgnomevfs_2_la_LDFLAGS = \
-------------------------------------------------------------------------
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
