Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6373/main/finkinfo/gnome
Modified Files: Tag: pangocairo-branch glib2.patch gnome-vfs.info gnucash.info libglademm2.4.info nautilus.patch Log Message: merged from HEAD (tagged as pangocairo-root-2) Index: gnucash.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnucash.info,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -d -r1.10 -r1.10.2.1 --- gnucash.info 4 Aug 2006 17:08:31 -0000 1.10 +++ gnucash.info 20 Dec 2006 18:01:02 -0000 1.10.2.1 @@ -1,8 +1,8 @@ Package: gnucash Version: 1.8.12 -Revision: 10 -Depends: audiofile-shlibs, bonobo-shlibs, esound-shlibs, g-wrap-shlibs (>= 1.3.4-3), g-wrap (>= 1.3.4-3), gal21-shlibs (>= 0.22-1014), gconf-shlibs, gdk-pixbuf-shlibs, glib-shlibs, gnome-libs-shlibs, gnome-print-shlibs, gtk+-shlibs (>= 1.2.10-50), gtkhtml1.1-shlibs, guile16-shlibs (>= 1.6.7-1010), guppi16-shlibs, imlib-shlibs, libghttp-shlibs, libglade-shlibs, libtool14-shlibs (>= 1.4.3-3), libxml-shlibs, oaf-shlibs, orbit-shlibs, popt-shlibs , slib, finance-quote-pm586, date-manip-pm, finance-quotehist-pm586, xml-parser-pm586, guile16 (>= 1.6.7-1010), gconf -BuildDepends: guppi16-dev (>= 0.40.3-2), g-wrap-dev (>= 1.3.4-3), gal21 (>= 0.22-1014), gdk-pixbuf, glib, orbit-dev, libjpeg, libpng3, libtiff, netpbm, giflib, gdbm3, bonobo-dev, control-center-dev (>= 1.4.0.5-6), gconf-dev, glibwww, gnome-core-dev (>= 1.4.1-4), gnome-libs-dev, gnome-print-dev, gtkhtml1.1-dev (>= 1.1.7-12), oaf-dev, expat, guile16-dev (>= 1.6.7-1010), libole2, libwww, gnome-vfs-dev (>= 1.0.5-5) | gnome-vfs-ssl-dev (>= 1.0.5-7), libtool14, libofx1 (>= 0.7.0-1002), doxygen, popt, imlib (>= 1.9.14-2), esound, opensp4-dev (>= 1.5.1-1002), libghttp, libglade, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, texinfo, fink (>= 0.20.1-1), pkgconfig, db44-aes | db44, gtk+ (>= 1.2.10-50), audiofile, libxml, graphviz +Revision: 11 +Depends: audiofile-shlibs, bonobo-shlibs, esound-shlibs, g-wrap-shlibs (>= 1.3.4-3), g-wrap (>= 1.3.4-3), gal21-shlibs (>= 0.22-1014), gconf-shlibs, gdk-pixbuf-shlibs, glib-shlibs, gnome-libs-shlibs, gnome-print-shlibs, gtk+-shlibs (>= 1.2.10-50), gtkhtml1.1-shlibs, guile16-shlibs (>= 1.6.7-1010), guppi16-shlibs, imlib-shlibs, libghttp-shlibs, libglade-shlibs, libtool14-shlibs (>= 1.4.3-3), libxml-shlibs, oaf-shlibs, orbit-shlibs, popt-shlibs , slib, finance-quote-pm586, date-manip-pm, finance-quotehist-pm586, xml-parser-pm586, guile16 (>= 1.6.7-1010), gconf, libgettext3-shlibs +BuildDepends: guppi16-dev (>= 0.40.3-2), g-wrap-dev (>= 1.3.4-3), gal21 (>= 0.22-1014), gdk-pixbuf, glib, orbit-dev, libjpeg, libpng3, libtiff, netpbm, giflib, gdbm3, bonobo-dev, control-center-dev (>= 1.4.0.5-6), gconf-dev, glibwww, gnome-core-dev (>= 1.4.1-4), gnome-libs-dev, gnome-print-dev, gtkhtml1.1-dev (>= 1.1.7-12), oaf-dev, expat, guile16-dev (>= 1.6.7-1010), libole2, libwww, gnome-vfs-dev (>= 1.0.5-5) | gnome-vfs-ssl-dev (>= 1.0.5-7), libtool14, libofx1 (>= 0.7.0-1002), doxygen, popt, imlib (>= 1.9.14-2), esound, opensp4-dev (>= 1.5.1-1002), libghttp, libglade, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, texinfo, fink (>= 0.20.1-1), pkgconfig, db44-aes | db44, gtk+ (>= 1.2.10-50), audiofile, libxml, graphviz Suggests: gnucash-docs (>= 1.8.0) Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 81e7c703db56bb203e106664157779cc Index: libglademm2.4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libglademm2.4.info,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -d -r1.3.2.4 -r1.3.2.5 --- libglademm2.4.info 19 Dec 2006 21:34:25 -0000 1.3.2.4 +++ libglademm2.4.info 20 Dec 2006 18:01:02 -0000 1.3.2.5 @@ -1,6 +1,6 @@ Package: libglademm2.4 Version: 2.6.3 -Revision: 1003 +Revision: 1002 GCC: 4.0 Depends: %N-shlibs (= %v-%r) BuildDepends: << Index: gnome-vfs.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-vfs.info,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- gnome-vfs.info 14 Jun 2006 06:09:33 -0000 1.7 +++ gnome-vfs.info 20 Dec 2006 18:01:02 -0000 1.7.2.1 @@ -1,11 +1,11 @@ Package: gnome-vfs Version: 1.0.5 -Revision: 1034 +Revision: 1035 Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2 Source-MD5: e2a17a6b178f54c43968241258f3e729 Depends: %N-shlibs (= %v-%r) | gnome-vfs-ssl-shlibs (= %v-%r) BuildConflicts: libcdparanoia0-dev -BuildDepends: pkgconfig, libjpeg, libpng3, libtiff, netpbm, audiofile, db3 (>= 3.3.11-1027), esound, glib, orbit-dev (>= 0.5.17-15), readline (>= 4.3-1028), giflib, imlib (>= 1.9.14-14), gconf (>= 1.0.9-21), gconf-dev (>= 1.0.9-21), gnome-libs-dev (>= 1.4.2-19), oaf-dev (>= 0.6.10-22), guile-dev, libxml, popt, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, gtk+ (>= 1.2.10-20) +BuildDepends: pkgconfig, libjpeg, libpng3, libtiff, netpbm, audiofile, db3 (>= 3.3.11-1027), esound, glib, orbit-dev (>= 0.5.17-15), readline (>= 4.3-1028), giflib, imlib (>= 1.9.14-14), gconf (>= 1.0.9-21), gconf-dev (>= 1.0.9-21), gnome-libs-dev (>= 1.4.2-19), oaf-dev (>= 0.6.10-22), guile-dev, libxml, popt, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, gtk+ (>= 1.2.10-20) Conflicts: gnome-vfs-ssl Replaces: gnome-vfs-ssl PatchScript: sed -e 's|<LIBDIR>|%p/lib|g' <%a/%n.patch | patch -p1 @@ -20,7 +20,7 @@ << SplitOff: << Package: %N-shlibs - Depends: gnome-mime-data, gtk+-shlibs (>= 1.2.10-20), oaf (>= 0.6.10-22), gconf-shlibs (>= 1.0.9-21) + Depends: gnome-mime-data, gtk+-shlibs (>= 1.2.10-20), oaf (>= 0.6.10-22), gconf-shlibs (>= 1.0.9-21), libgettext3-shlibs Conflicts: gnome-vfs-ssl-shlibs Replaces: %N (<= 1.0.5-2), gnome-vfs-ssl (<= 1.0.5-2), gnome-vfs-ssl-shlibs Files: lib/libgnomevfs.0.0.0.dylib lib/libgnomevfs.0.dylib Index: nautilus.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/nautilus.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- nautilus.patch 20 Jan 2006 20:25:02 -0000 1.1 +++ nautilus.patch 20 Dec 2006 18:01:02 -0000 1.1.2.1 @@ -53,7 +53,7 @@ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" -+LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`" ++LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 /bin/echo ' -I \c'`" LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-2.0 gnome-vfs-2.0" @@ -62,7 +62,7 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" -+CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`" ++CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 /bin/echo ' -I \c'`" COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" Index: glib2.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.patch,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- glib2.patch 11 Jul 2006 00:34:59 -0000 1.4 +++ glib2.patch 20 Dec 2006 18:01:02 -0000 1.4.2.1 @@ -70,18 +70,6 @@ G_END_DECLS -diff -Nurd -x'*~' glib-2.12.0.orig/glib/gspawn.c glib-2.12.0/glib/gspawn.c ---- glib-2.12.0.orig/glib/gspawn.c 2006-04-04 00:37:39.000000000 -0400 -+++ glib-2.12.0/glib/gspawn.c 2006-07-06 20:37:43.000000000 -0400 -@@ -129,6 +129,8 @@ - return ret; - } - -+#undef READ_OK -+ - typedef enum - { - READ_FAILED = 0, /* FALSE */ diff -Nurd -x'*~' glib-2.12.0.orig/glib/libcharset/Makefile.in glib-2.12.0/glib/libcharset/Makefile.in --- glib-2.12.0.orig/glib/libcharset/Makefile.in 2006-07-02 14:48:02.000000000 -0400 +++ glib-2.12.0/glib/libcharset/Makefile.in 2006-07-06 20:56:51.000000000 -0400 ------------------------------------------------------------------------- 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 Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits