Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26343
Modified Files:
at-spi.info gal199.info gconf-editor.info gdm.info glade2.info
glib2.info glib2.patch gnome-icon-theme.info gnome-libs.info
gnome-libs.patch gnome-panel.info gnome-system-monitor.info
gnome-vfs2.info gnome-vfs2.patch gnumeric.info
nautilus-cd-burner.info
Log Message:
version for 10.4
Index: nautilus-cd-burner.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/nautilus-cd-burner.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nautilus-cd-burner.info 27 Apr 2005 03:38:48 -0000 1.1
+++ nautilus-cd-burner.info 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,8 +1,8 @@
Package: nautilus-cd-burner
Version: 2.6.1
-Revision: 3
+Revision: 13
Depends: nautilus (>= 2.6.0-1)
-BuildDepends: audiofile, gettext-dev, libiconv-dev, libxml2, atk1, eel2-dev
(>= 2.6.0-1), gail17-dev (>= 1.6.0-1), gconf2-dev (>= 2.6.0-1), glib2-dev (>=
2.4.0-1), gnome-vfs2-dev (>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1),
gtk+2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1), libbonobo2-dev (>= 2.6.0-1),
libbonoboui2-dev (>= 2.6.0-1), libgnome2-dev (>= 2.6.0-1), libgnomecanvas2-dev
(>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libjpeg, nautilus-dev (>= 2.6.0-1),
orbit2-dev (>= 2.10.0-1), pango1-xft2-dev (>= 1.4.0-1), pkgconfig,
xml-parser-pm581,libglade2, popt, gnome-keyring-dev
+BuildDepends: audiofile, gettext-dev, libiconv-dev, libxml2, atk1, eel2-dev
(>= 2.6.0-1), gail17-dev (>= 1.6.0-1), gconf2-dev (>= 2.6.0-1), glib2-dev (>=
2.4.0-1), gnome-vfs2-dev (>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1),
gtk+2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1), libbonobo2-dev (>= 2.6.0-1),
libbonoboui2-dev (>= 2.6.0-1), libgnome2-dev (>= 2.6.0-1), libgnomecanvas2-dev
(>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libjpeg, nautilus-dev (>= 2.6.0-1),
orbit2-dev (>= 2.10.0-1), pango1-xft2-dev (>= 1.4.0-1), pkgconfig,
xml-parser-pm586, libglade2, popt, gnome-keyring-dev
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: 7998cbe011e9e0a22d9362a2430d578b
Patch: %n.patch
Index: gnome-vfs2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-vfs2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-vfs2.patch 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-vfs2.patch 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,18 +1,19 @@
-diff -Naur gnome-vfs-2.5.91-old/Makefile.in gnome-vfs-2.5.91/Makefile.in
---- gnome-vfs-2.5.91-old/Makefile.in Mon Mar 15 08:16:08 2004
-+++ gnome-vfs-2.5.91/Makefile.in Sun Mar 21 11:11:22 2004
-@@ -206,7 +206,6 @@
- devel-docs \
- doc \
- programs \
-- test \
- monikers \
- po
+diff -ruN gnome-vfs-2.4.2/Makefile.in gnome-vfs-2.4.2-patched/Makefile.in
+--- gnome-vfs-2.4.2/Makefile.in 2004-01-26 17:18:48.000000000 -0500
++++ gnome-vfs-2.4.2-patched/Makefile.in 2004-12-28 10:55:20.000000000
-0500
+@@ -191,7 +191,7 @@
-diff -Naur gnome-vfs-2.5.91-old/configure gnome-vfs-2.5.91/configure
---- gnome-vfs-2.5.91-old/configure Mon Mar 15 08:16:12 2004
-+++ gnome-vfs-2.5.91/configure Sun Mar 21 11:11:22 2004
-@@ -22370,6 +22370,8 @@
+ SUBDIRS_GNOME = monikers doc schemas
+
+-SUBDIRS = libgnomevfs modules
schemas
devel-docs doc
programs test
monikers
po
++SUBDIRS = libgnomevfs modules
schemas
devel-docs doc
programs monikers
po
+
+
+ EXTRA_DIST = HACKING TODO
autogen.sh
gnome-vfs.spec gnome-vfs-2.0.pc.in
gnome-vfs-module-2.0.pc.in
intltool-extract.in intltool-merge.in
intltool-update.in
+diff -ruN gnome-vfs-2.4.2/configure gnome-vfs-2.4.2-patched/configure
+--- gnome-vfs-2.4.2/configure 2004-01-26 17:03:20.000000000 -0500
++++ gnome-vfs-2.4.2-patched/configure 2004-12-28 10:55:20.000000000 -0500
+@@ -22448,6 +22448,8 @@
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -21,163 +22,9 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22804,117 +22806,6 @@
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e
"\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
--
--
--
--
--for ac_func in ngettext
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares
$ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
--#endif
--
--int
--main ()
--{
--return f != $ac_func;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "$as_ac_var=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-- have_ngettext=yes
--fi
--done
--
--
--if test x"$have_ngettext" != "xyes"; then
-- { { echo "$as_me:$LINENO: error: Your Gettext installation doesn't seem
to support ngettext to handle translation of plural forms. Please install GNU
Gettext" >&5
--echo "$as_me: error: Your Gettext installation doesn't seem to support
ngettext to handle translation of plural forms. Please install GNU Gettext"
>&2;}
-- { (exit 1); exit 1; }; }
--fi;
-
- echo "$as_me:$LINENO: checking for library containing gethostent" >&5
- echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6
-diff -Naur gnome-vfs-2.5.91-old/libgnomevfs/Makefile.in
gnome-vfs-2.5.91/libgnomevfs/Makefile.in
---- gnome-vfs-2.5.91-old/libgnomevfs/Makefile.in Mon Mar 15 08:16:09 2004
-+++ gnome-vfs-2.5.91/libgnomevfs/Makefile.in Sun Mar 21 11:12:53 2004
-@@ -395,7 +395,6 @@
- gnome-vfs-async-ops.c \
- gnome-vfs-cancellable-ops.c \
- gnome-vfs-cancellation.c \
-- gnome-vfs-cdrom.c \
- gnome-vfs-client-call.c \
- gnome-vfs-client.c \
- gnome-vfs-configuration.c \
-@@ -497,7 +496,7 @@
- am_libgnomevfs_2_la_OBJECTS = $(am__objects_1) \
- gnome-vfs-application-registry.lo gnome-vfs-async-job-map.lo \
- gnome-vfs-async-ops.lo gnome-vfs-cancellable-ops.lo \
-- gnome-vfs-cancellation.lo gnome-vfs-cdrom.lo \
-+ gnome-vfs-cancellation.lo \
- gnome-vfs-client-call.lo gnome-vfs-client.lo \
- gnome-vfs-configuration.lo gnome-vfs-context.lo \
- gnome-vfs-daemon-method.lo gnome-vfs-directory.lo \
-@@ -540,7 +539,6 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-async-ops.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-cancellable-ops.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-cancellation.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/gnome-vfs-cdrom.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-client-call.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-client.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gnome-vfs-configuration.Plo \
-@@ -672,7 +670,6 @@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
-diff -Naur gnome-vfs-2.5.91-old/libgnomevfs/gnome-vfs-configuration.c
gnome-vfs-2.5.91/libgnomevfs/gnome-vfs-configuration.c
---- gnome-vfs-2.5.91-old/libgnomevfs/gnome-vfs-configuration.c Fri Oct 17
11:28:59 2003
-+++ gnome-vfs-2.5.91/libgnomevfs/gnome-vfs-configuration.c Sun Mar 21
11:11:22 2004
+diff -ruN gnome-vfs-2.4.2/libgnomevfs/gnome-vfs-configuration.c
gnome-vfs-2.4.2-patched/libgnomevfs/gnome-vfs-configuration.c
+--- gnome-vfs-2.4.2/libgnomevfs/gnome-vfs-configuration.c 2004-01-26
16:18:44.000000000 -0500
++++ gnome-vfs-2.4.2-patched/libgnomevfs/gnome-vfs-configuration.c
2004-12-28 10:55:20.000000000 -0500
@@ -24,6 +24,7 @@
#include <config.h>
#include "gnome-vfs-configuration.h"
@@ -186,56 +33,22 @@
#include <dirent.h>
#include <errno.h>
#include <glib/ghash.h>
-diff -Naur gnome-vfs-2.5.91-old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
gnome-vfs-2.5.91/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
---- gnome-vfs-2.5.91-old/libgnomevfs/gnome-vfs-volume-monitor-daemon.c Fri Jan
30 05:51:15 2004
-+++ gnome-vfs-2.5.91/libgnomevfs/gnome-vfs-volume-monitor-daemon.c Sun Mar
21 11:14:47 2004
-@@ -31,7 +31,6 @@
- #include "gnome-vfs-volume-monitor-daemon.h"
- #include "gnome-vfs-volume-monitor-private.h"
- #include "gnome-vfs-unix-mounts.h"
--#include "gnome-vfs-cdrom.h"
- #include "gnome-vfs-filesystem-type.h"
-
- static void gnome_vfs_volume_monitor_daemon_class_init
(GnomeVFSVolumeMonitorDaemonClass *klass);
-@@ -727,35 +726,6 @@
- vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_HARDDRIVE;
- }
+diff -ruN gnome-vfs-2.4.2/libgnomevfs/gnome-vfs-mime-magic.c
gnome-vfs-2.4.2-patched/libgnomevfs/gnome-vfs-mime-magic.c
+--- gnome-vfs-2.4.2/libgnomevfs/gnome-vfs-mime-magic.c 2004-01-26
16:18:48.000000000 -0500
++++ gnome-vfs-2.4.2-patched/libgnomevfs/gnome-vfs-mime-magic.c 2004-12-28
10:58:16.000000000 -0500
+@@ -31,8 +31,8 @@
+ #include <stdlib.h>
-- if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_CDROM) {
-- fd = 0;
-- disctype = _gnome_vfs_get_cdrom_type (mount->device_path, &fd);
--
-- switch (disctype) {
-- case CDS_AUDIO:
-- display_name = g_strdup (_("Audio CD"));
-- vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_AUDIO_CD;
-- break;
--
-- case CDS_DATA_1:
-- case CDS_DATA_2:
-- case CDS_XA_2_1:
-- case CDS_XA_2_2:
-- case CDS_MIXED:
-- /* Get volume name */
-- tmp_name = _gnome_vfs_get_iso9660_volume_name (fd);
-- display_name = modify_volume_name_for_display
(tmp_name);
-- g_free (tmp_name);
-- break;
--
-- default:
-- break;
-- }
--
-- if (fd > 0) {
-- close (fd);
-- }
-- }
+ #ifdef HAVE_WCTYPE_H
+-#include <wctype.h>
+ #include <wchar.h>
++#include <wctype.h>
+ #endif
- if (display_name == NULL) {
- display_name = make_volume_name_from_path_and_fs
(mount->mount_path, mount->filesystem_type);
-diff -Naur gnome-vfs-2.5.91-old/ltmain.sh gnome-vfs-2.5.91/ltmain.sh
---- gnome-vfs-2.5.91-old/ltmain.sh Sun Jan 11 17:28:53 2004
-+++ gnome-vfs-2.5.91/ltmain.sh Sun Mar 21 11:11:22 2004
+ #include <glib/garray.h>
+diff -ruN gnome-vfs-2.4.2/ltmain.sh gnome-vfs-2.4.2-patched/ltmain.sh
+--- gnome-vfs-2.4.2/ltmain.sh 2003-10-28 14:01:29.000000000 -0500
++++ gnome-vfs-2.4.2-patched/ltmain.sh 2004-12-28 10:55:20.000000000 -0500
@@ -5145,10 +5145,10 @@
# Directory that this library needs to be installed in:
@@ -251,95 +64,18 @@
done
fi
-diff -Naur gnome-vfs-2.5.91-old/modules/Makefile.in
gnome-vfs-2.5.91/modules/Makefile.in
---- gnome-vfs-2.5.91-old/modules/Makefile.in Mon Mar 15 08:16:09 2004
-+++ gnome-vfs-2.5.91/modules/Makefile.in Sun Mar 21 11:16:55 2004
-@@ -261,7 +261,6 @@
- libvfs-translate.la \
- $(CDEMENU_LTLIBS) \
- $(SMB_LTLIBS) \
-- libsftp.la \
- libssh.la \
- libtar.la \
- $(NULL)
-@@ -332,12 +331,6 @@
- libsmb_la_LIBADD = $(SAMBA_LIBS) $(MODULES_LIBS)
../libgnomevfs/libgnomevfs-2.la
-
-
--### `sftp' method
--libsftp_la_SOURCES = sftp-method.c pty-open.c sftp.h pty-open.h
--libsftp_la_LDFLAGS = $(module_flags)
--libsftp_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la
--
--
- ### `ssh' method
- libssh_la_SOURCES = ssh-method.c
- libssh_la_LDFLAGS = $(module_flags)
-@@ -446,9 +439,6 @@
- libnntp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la
- am_libnntp_la_OBJECTS = nntp-method.lo
- libnntp_la_OBJECTS = $(am_libnntp_la_OBJECTS)
--libsftp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la
--am_libsftp_la_OBJECTS = sftp-method.lo pty-open.lo
--libsftp_la_OBJECTS = $(am_libsftp_la_OBJECTS)
- libsmb_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la
- am_libsmb_la_OBJECTS = smb-method.lo
- libsmb_la_OBJECTS = $(am_libsmb_la_OBJECTS)
-@@ -489,7 +479,6 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/nntp-method.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/pipe-method.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/pty-open.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/sftp-method.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/smb-method.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/ssh-method.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/tar-method.Plo \
-@@ -507,7 +496,7 @@
- $(libextfs_la_SOURCES) $(libfile_la_SOURCES) \
- $(libftp_la_SOURCES) $(libgzip_la_SOURCES) \
- $(libhttp_la_SOURCES) $(libnetwork_la_SOURCES) \
-- $(libnntp_la_SOURCES) $(libsftp_la_SOURCES) \
-+ $(libnntp_la_SOURCES) \
- $(libsmb_la_SOURCES) $(libssh_la_SOURCES) $(libtar_la_SOURCES) \
- $(libvfs_pipe_la_SOURCES) $(libvfs_test_la_SOURCES) \
- $(libvfs_translate_la_SOURCES)
-@@ -520,7 +509,7 @@
- uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = Makefile.am Makefile.in
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(libbzip2_la_SOURCES) $(libcdda_la_SOURCES)
$(libcdemenu_desktop_la_SOURCES) $(libcomputer_la_SOURCES)
$(libextfs_la_SOURCES) $(libfile_la_SOURCES) $(libftp_la_SOURCES)
$(libgzip_la_SOURCES) $(libhttp_la_SOURCES) $(libnetwork_la_SOURCES)
$(libnntp_la_SOURCES) $(libsftp_la_SOURCES) $(libsmb_la_SOURCES)
$(libssh_la_SOURCES) $(libtar_la_SOURCES) $(libvfs_pipe_la_SOURCES)
$(libvfs_test_la_SOURCES) $(libvfs_translate_la_SOURCES)
-+SOURCES = $(libbzip2_la_SOURCES) $(libcdda_la_SOURCES)
$(libcdemenu_desktop_la_SOURCES) $(libcomputer_la_SOURCES)
$(libextfs_la_SOURCES) $(libfile_la_SOURCES) $(libftp_la_SOURCES)
$(libgzip_la_SOURCES) $(libhttp_la_SOURCES) $(libnetwork_la_SOURCES)
$(libnntp_la_SOURCES) $(libsmb_la_SOURCES) $(libssh_la_SOURCES)
$(libtar_la_SOURCES) $(libvfs_pipe_la_SOURCES) $(libvfs_test_la_SOURCES)
$(libvfs_translate_la_SOURCES)
-
- all: all-recursive
-
-@@ -581,8 +570,6 @@
- $(LINK) -rpath $(modulesdir) $(libnetwork_la_LDFLAGS)
$(libnetwork_la_OBJECTS) $(libnetwork_la_LIBADD) $(LIBS)
- libnntp.la: $(libnntp_la_OBJECTS) $(libnntp_la_DEPENDENCIES)
- $(LINK) -rpath $(modulesdir) $(libnntp_la_LDFLAGS)
$(libnntp_la_OBJECTS) $(libnntp_la_LIBADD) $(LIBS)
--libsftp.la: $(libsftp_la_OBJECTS) $(libsftp_la_DEPENDENCIES)
-- $(LINK) -rpath $(modulesdir) $(libsftp_la_LDFLAGS)
$(libsftp_la_OBJECTS) $(libsftp_la_LIBADD) $(LIBS)
- libsmb.la: $(libsmb_la_OBJECTS) $(libsmb_la_DEPENDENCIES)
- $(LINK) -rpath $(modulesdir) $(libsmb_la_LDFLAGS) $(libsmb_la_OBJECTS)
$(libsmb_la_LIBADD) $(LIBS)
- libssh.la: $(libssh_la_OBJECTS) $(libssh_la_DEPENDENCIES)
-@@ -619,7 +606,6 @@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
-diff -Naur gnome-vfs-2.5.91-old/modules/file-method.c
gnome-vfs-2.5.91/modules/file-method.c
---- gnome-vfs-2.5.91-old/modules/file-method.c Wed Mar 3 05:20:28 2004
-+++ gnome-vfs-2.5.91/modules/file-method.c Sun Mar 21 11:11:22 2004
-@@ -38,6 +38,7 @@
+diff -ruN gnome-vfs-2.4.2/modules/file-method.c
gnome-vfs-2.4.2-patched/modules/file-method.c
+--- gnome-vfs-2.4.2/modules/file-method.c 2004-01-26 16:19:03.000000000
-0500
++++ gnome-vfs-2.4.2-patched/modules/file-method.c 2004-12-28
10:55:20.000000000 -0500
+@@ -36,6 +36,7 @@
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ #include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-monitor-private.h>
- #include <libgnomevfs/gnome-vfs-private-utils.h>
- #include <libgnomevfs/gnome-vfs-ops.h>
+#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-@@ -48,7 +49,6 @@
+@@ -46,7 +47,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
@@ -347,9 +83,9 @@
#include <unistd.h>
#include <utime.h>
#include <string.h>
-diff -Naur gnome-vfs-2.5.91-old/modules/fstype.c
gnome-vfs-2.5.91/modules/fstype.c
---- gnome-vfs-2.5.91-old/modules/fstype.c Thu Jan 22 10:28:47 2004
-+++ gnome-vfs-2.5.91/modules/fstype.c Sun Mar 21 11:11:22 2004
+diff -ruN gnome-vfs-2.4.2/modules/fstype.c
gnome-vfs-2.4.2-patched/modules/fstype.c
+--- gnome-vfs-2.4.2/modules/fstype.c 2004-01-26 16:19:03.000000000 -0500
++++ gnome-vfs-2.4.2-patched/modules/fstype.c 2004-12-28 10:55:20.000000000
-0500
@@ -363,7 +363,7 @@
char *p;
Index: gconf-editor.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gconf-editor.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gconf-editor.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gconf-editor.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,8 +1,8 @@
Package: gconf-editor
Version: 2.6.2
-Revision: 9
+Revision: 19
Depends: atk1-shlibs (>= 1.6.0-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.4.0-1), gtk+2 (>= 2.4.0-1), libiconv, orbit2 (>= 2.10.0-1), pango1-xft2 (>=
1.4.0-1), popt-shlibs
-BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), gconf2-dev (>=
2.6.0-1), pkgconfig, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
xml-parser-pm581, popt
+BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), gconf2-dev (>=
2.6.0-1), pkgconfig, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
xml-parser-pm586, popt
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: 4b739532de350969c71f96c3b97f1093
SetCPPFLAGS: -no-cpp-precomp
Index: gnome-system-monitor.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-system-monitor.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-system-monitor.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-system-monitor.info 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,10 +1,10 @@
Package: gnome-system-monitor
Version: 2.6.0
-Revision: 5
+Revision: 15
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: 1bc8709baa43fdca7eee8cad1dc76b17
Depends: atk1-shlibs (>= 1.6.0-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.4.0-1), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), gtk+2 (>=
2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libbonoboui2
(>= 2.6.0-1), libgnome2 (>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libgnomeui2
(>= 2.6.0-1), libgtop2 (>= 2.5.2-1), libiconv, libwnck1-shlibs (>= 2.6.0-1),
libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>= 1.4.0-1),
popt-shlibs, scrollkeeper (>= 0.3.12-2)
-BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), gconf2-dev (>=
2.6.0-1), libxml2 (>= 2.6.7-1), gnome-vfs2-dev (>= 2.6.0-1) |
gnome-vfs2-ssl-dev (>= 2.6.0-1), libbonobo2-dev (>= 2.6.0-1), libgnome2-dev (>=
2.6.0-1), libart2 (>= 2.3.16-1), libgnomecanvas2-dev (>= 2.6.0-1),
libbonoboui2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libwnck1 (>=
2.6.0-1), libgtop2-dev (>= 2.5.2-1), libgtop2 (>= 2.5.2-1), pkgconfig,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, popt, xml-parser-pm581
+BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), gconf2-dev (>=
2.6.0-1), libxml2 (>= 2.6.7-1), gnome-vfs2-dev (>= 2.6.0-1) |
gnome-vfs2-ssl-dev (>= 2.6.0-1), libbonobo2-dev (>= 2.6.0-1), libgnome2-dev (>=
2.6.0-1), libart2 (>= 2.3.16-1), libgnomecanvas2-dev (>= 2.6.0-1),
libbonoboui2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libwnck1 (>=
2.6.0-1), libgtop2-dev (>= 2.5.2-1), libgtop2 (>= 2.5.2-1), pkgconfig,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, popt, xml-parser-pm586
Provides: gtop
Conflicts: gtop
Replaces: gtop
Index: glade2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/glade2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glade2.info 27 Apr 2005 03:38:48 -0000 1.1
+++ glade2.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,11 +1,11 @@
Package: glade2
Version: 2.6.8
-Revision: 2
+Revision: 12
Source: mirror:gnome:sources/glade/2.6/glade-%v.tar.bz2
Source-MD5: 712c99eb5bfbf0fe063234c7f7c73ad9
GCC: 3.3
Depends: x11, libgnomedb-shlibs (>= 1.0.3-4), gtksourceview-shlibs (>=
1.0.1-7), libgnomeprint2.2-shlibs (>= 2.6.2-9), libgda-shlibs (>= 1.0.4-3),
libgnomeui2-shlibs (>= 2.6.1.1-8), gnome-keyring-shlibs (>= 0.2.1-3),
libjpeg-shlibs (>= 6b-16), libglade2-shlibs (>=2.3.6-16), libxslt-shlibs (>=
1.1.8-1), libbonoboui2-shlibs (>= 2.6.1-9), libgnomecanvas2-shlibs (>=
2.6.1.1-7), libgnome2-shlibs (>= 2.6.1.2-8), esound-shlibs (>= 0.2.35-8),
audiofile-shlibs (>= 0.2.6-10), libart2-shlibs (>= 2.3.16-2),
pango1-xft2-shlibs (>= 1.4.0-27), gnome-vfs2-shlibs (>= 2.6.1.1-13) |
gnome-vfs2-ssl-shlibs (>= 2.6.1.1-13), gconf2-shlibs (>= 2.6.3-9),
libbonobo2-shlibs (>= 2.6.2-8), libgail-gnome (>= 1.0.4-5), orbit2-shlibs (>=
2.10.3-8), popt-shlibs, glib2-shlibs (>= 2.4.6-6), gtk+2-shlibs (>= 2.4.9-8),
libxml2-shlibs (>= 2.6.11-1), atk1-shlibs (>= 1.6.1-3), gettext, libiconv,
scrollkeeper, libgail-gnome, gnome-panel-shlibs (>= 2.6.2-12)
-BuildDepends: pkgconfig, automake1.4, x11-dev, libgnomedb-dev (>= 1.0.3-4),
gtksourceview-dev (>= 1.0.1-7), libgda-dev (>= 1.0.4-3), libgnomeui2-dev (>=
2.6.1.1-8), libjpeg (>= 6b-16), libglade2 (>= 2.3.6-16), libxslt (>= 1.1.8-1),
libbonoboui2-dev (>= 2.6.1-9), libgnomecanvas2-dev (>= 2.6.1.1-7),
libgnome2-dev (>= 2.6.1.2-8), esound (>= 0.2.35-8), audiofile (>= 0.2.6-10),
libart2 (>= 2.3.16-2), pango1-dev | pango1-xft2-dev (>= 1.4.0-27),
gnome-vfs2-dev (>= 2.6.1.1-13) | gnome-vfs2-ssl-dev (>= 2.6.1.1-13), gconf2-dev
(>= 2.6.3-9), gconf2 (>= 2.6.3-9), libbonobo2-dev (>= 2.6.2-8), orbit2-dev (>=
2.10.3-8), popt, glib2-dev (>= 2.4.6-6), glib2 (>= 2.4.6-6), gtk+2-dev (>=
2.4.9-8), gtk+2 (>= 2.4.9-8), libxml2 (>= 2.6.11-1), atk1 (>= 1.6.1-3),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, gnome-panel-dev (>=
2.6.2), gnome-panel (>= 2.6.2-12), xml-parser-pm581, libgnomeprint2.2-dev,
gnome-keyring-dev
+BuildDepends: pkgconfig, automake1.4, x11-dev, libgnomedb-dev (>= 1.0.3-4),
gtksourceview-dev (>= 1.0.1-7), libgda-dev (>= 1.0.4-3), libgnomeui2-dev (>=
2.6.1.1-8), libjpeg (>= 6b-16), libglade2 (>= 2.3.6-16), libxslt (>= 1.1.8-1),
libbonoboui2-dev (>= 2.6.1-9), libgnomecanvas2-dev (>= 2.6.1.1-7),
libgnome2-dev (>= 2.6.1.2-8), esound (>= 0.2.35-8), audiofile (>= 0.2.6-10),
libart2 (>= 2.3.16-2), pango1-dev | pango1-xft2-dev (>= 1.4.0-27),
gnome-vfs2-dev (>= 2.6.1.1-13) | gnome-vfs2-ssl-dev (>= 2.6.1.1-13), gconf2-dev
(>= 2.6.3-9), gconf2 (>= 2.6.3-9), libbonobo2-dev (>= 2.6.2-8), orbit2-dev (>=
2.10.3-8), popt, glib2-dev (>= 2.4.6-6), glib2 (>= 2.4.6-6), gtk+2-dev (>=
2.4.9-8), gtk+2 (>= 2.4.9-8), libxml2 (>= 2.6.11-1), atk1 (>= 1.6.1-3),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, gnome-panel-dev (>=
2.6.2), gnome-panel (>= 2.6.2-12), xml-parser-pm586, libgnomeprint2.2-dev,
gnome-keyring-dev
Patchscript: <<
perl -pi.bak -e 's|-scrollkeeper-update|#-scrollkeeper-update|g'
omf-install/Makefile.in
perl -pi.bak -e 's|localedir \= \$libdir\/locale|localedir \=
\$\(prefix\)\/share\/locale|' po/Makefile.in.in
Index: at-spi.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/at-spi.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- at-spi.info 27 Apr 2005 03:38:47 -0000 1.1
+++ at-spi.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,9 +1,9 @@
Package: at-spi
Version: 1.4.2
-Revision: 9
+Revision: 19
BuildDependsOnly: True
Depends: %N-shlibs (>= 1.4.0-1), atk1-shlibs (>= 1.6.0-1), gail17 (>=
1.6.0-1), gettext, glib2 (>= 2.4.0-1), gtk+2 (>= 2.4.0-1), libart2-shlibs (>=
2.3.16-1), libbonobo2 (>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libiconv,
orbit2 (>= 2.10.0-1), pango1-xft2 (>= 1.4.0-1), popt-shlibs
-BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1), libgnomecanvas2-dev
(>= 2.6.0-1), orbit2-dev (>= 2.10.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-dev
(>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1), libxml2 (>= 2.6.7-1),
libbonobo2-dev (>= 2.6.0-1), libgnome2-dev (>= 2.6.0-1), libbonoboui2-dev (>=
2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), gail17-dev (>= 1.6.0-1), libgtkhtml2
(>= 2.6.0-1), libxslt, esound, pkgconfig, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, popt, xml-parser-pm581
+BuildDepends: glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1), libgnomecanvas2-dev
(>= 2.6.0-1), orbit2-dev (>= 2.10.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-dev
(>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1), libxml2 (>= 2.6.7-1),
libbonobo2-dev (>= 2.6.0-1), libgnome2-dev (>= 2.6.0-1), libbonoboui2-dev (>=
2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), gail17-dev (>= 1.6.0-1), libgtkhtml2
(>= 2.6.0-1), libxslt, esound, pkgconfig, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, popt, xml-parser-pm586
Source: mirror:gnome:sources/%n/1.4/%n-%v.tar.bz2
Source-MD5: e36683a6e55fcb5ef2e6ef05806f9c3e
SetCPPFLAGS: -no-cpp-precomp
Index: gal199.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gal199.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gal199.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gal199.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,11 +1,11 @@
Package: gal199
Version: 1.99.11
-Revision: 10
+Revision: 20
Replaces: gal
Conflicts: gal
Depends: %N-shlibs (= %v-%r), gettext, libart2-shlibs (>= 2.3.16-1), libiconv
Recommends: atk1 (>= 1.4.0-1), glib2 (>= 2.2.3-1), gtk+2 (>= 2.2.4-1),
libgnomeprint2.2-shlibs (>= 2.4.0-1), libgnomeprintui2.2-shlibs (>= 2.4.0-1),
libgnomecanvas2 (>= 2.4.0-1), pango1-xft2 (>= 1.2.5-1)
-BuildDepends: audiofile, esound, libjpeg, libbonoboui2-dev, gnome-vfs2-dev,
gconf2-dev, libbonobo2-dev, orbit2-dev, libgnome2-dev, libxml2,
xml-parser-pm581 | xml-parser-pm586, glib2-dev (>= 2.2.3-1), atk1 (>= 1.4.0-1),
pango1-xft2-dev (>= 1.2.5-1), gtk+2-dev (>= 2.2.4-1), libart2 (>= 2.3.16-1),
libgnomeprintui2.2-dev (>= 2.4.0-1), libgnomeprint2.2-dev (>= 2.4.0-1),
libgnomecanvas2-dev (>= 2.4.0-1), libgnomeui2-dev (>= 2.4.0.1-1), pkgconfig,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, gtk-doc (>= 1.1-1),
libglade2, gnome-keyring-dev, gcc3.3
+BuildDepends: audiofile, esound, libjpeg, libbonoboui2-dev, gnome-vfs2-dev,
gconf2-dev, libbonobo2-dev, orbit2-dev, libgnome2-dev, libxml2,
xml-parser-pm586, glib2-dev (>= 2.2.3-1), atk1 (>= 1.4.0-1), pango1-xft2-dev
(>= 1.2.5-1), gtk+2-dev (>= 2.2.4-1), libart2 (>= 2.3.16-1),
libgnomeprintui2.2-dev (>= 2.4.0-1), libgnomeprint2.2-dev (>= 2.4.0-1),
libgnomecanvas2-dev (>= 2.4.0-1), libgnomeui2-dev (>= 2.4.0.1-1), pkgconfig,
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, gtk-doc (>= 1.1-1),
libglade2, gnome-keyring-dev, gcc3.3
Source: mirror:gnome:sources/gal/1.99/gal-%v.tar.bz2
Source-MD5: 906c0640d3160a55aac98974aecfb316
Patch: %n.patch
Index: gnumeric.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnumeric.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnumeric.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gnumeric.info 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,6 +1,6 @@
Package: gnumeric
Version: 1.4.1
-Revision: 1
+Revision: 11
Source: gnome
Source-MD5: 20708834b7fedfbae364e68772761065
BuildConflicts: freetype, freetype-hinting
@@ -38,7 +38,7 @@
libgsf-dev (>= 1.10.0-1),
libglade2 (>= 2.3.6-1),
intltool (>= 0.28-1),
- xml-parser-pm581 | xml-parser-pm586,
+ xml-parser-pm586,
popt
<<
Depends: <<
Index: gnome-libs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-libs.patch 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-libs.patch 28 Apr 2005 14:14:04 -0000 1.2
@@ -107,3 +107,15 @@
}
}
+diff -ruN gnome-libs-1.4.2/libgnorba/Makefile.in
gnome-libs-1.4.2-patched/libgnorba/Makefile.in
+--- gnome-libs-1.4.2/libgnorba/Makefile.in 2002-08-15 18:25:44.000000000
-0400
++++ gnome-libs-1.4.2-patched/libgnorba/Makefile.in 2004-12-30
14:34:29.000000000 -0500
+@@ -229,7 +229,7 @@
+
+
+ libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
+-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
++libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) ../libgnome/libgnome.la
$(GNOME_LIBS) $(GTK_LIBS) -lm
+
+ loadshlib_SOURCES = loadshlib.c
+
Index: glib2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glib2.info 27 Apr 2005 03:38:48 -0000 1.1
+++ glib2.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,13 +1,13 @@
Package: glib2
-Version: 2.4.6
-Revision: 6
+Version: 2.2.3
+Revision: 12
Depends: %N-shlibs (>= %v-%r)
-BuildDepends: pkgconfig (>= 0.15.0-2), gettext-dev, gettext-bin,
gettext-tools, libiconv-dev
+BuildDepends: pkgconfig (>= 0.15.0-2), gtk-doc (>= 1.1-1), gettext-dev,
gettext-bin, gettext-tools, libiconv-dev
DescPackaging: Uses pkgconfig, but there are no pkgconfig-related dependencies.
Replaces: %N-common
Conflicts: %N-common
-Source: mirror:gnome:sources/glib/2.4/glib-%v.tar.bz2
-Source-MD5: a45db7d82480da431f6cd00ea041a534
+Source: mirror:gnome:sources/glib/2.2/glib-%v.tar.bz2
+Source-MD5: aa214a10d873b68ddd67cd9de2ccae55
Patch: %n.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -15,35 +15,38 @@
SetCPPFLAGS: -no-cpp-precomp -isystem %p/include
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBRARY_PATH: %p/lib
-ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
-CompileScript: ./configure %c; make -j2
-InstallScript: make install DESTDIR=%d
+ConfigureParams: --mandir=%p/share/man
+CompileScript: <<
+ LD_TWOLEVEL_NAMESPACE=1 ./configure %c; make -j2
+<<
+InstallScript: <<
+ make install DESTDIR=%d
+ rm -f %i/lib/charset.alias
+<<
SplitOff: <<
Package: %N-shlibs
Depends: gettext, libiconv
Files: lib/lib*-2.0.*.dylib
Shlibs: <<
- %p/lib/libglib-2.0.0.dylib 232.0.0 %n (>= 2.4.0-1)
- %p/lib/libgmodule-2.0.0.dylib 232.0.0 %n (>= 2.4.0-1)
- %p/lib/libgobject-2.0.0.dylib 232.0.0 %n (>= 2.4.0-1)
- %p/lib/libgthread-2.0.0.dylib 232.0.0 %n (>= 2.4.0-1)
+ %p/lib/libglib-2.0.0.dylib 201.0.0 %n (>= 2.2.1-1)
+ %p/lib/libgmodule-2.0.0.dylib 201.0.0 %n (>= 2.2.1-1)
+ %p/lib/libgobject-2.0.0.dylib 201.0.0 %n (>= 2.2.1-1)
+ %p/lib/libgthread-2.0.0.dylib 201.0.0 %n (>= 2.2.1-1)
<<
+ Description: GTK+ - low-level core libraries
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
SplitOff2: <<
Package: %N-dev
Depends: %N (>= %v-%r)
- Replaces: %N (<< 2.4.0-1)
+ Replaces: %N (<< 2.2.1-1)
BuildDependsOnly: True
Files: bin include lib/glib-2.0 lib/lib*-2.0.* lib/pkgconfig share/aclocal
share/glib-2.0 share/gtk-doc share/man
+ Description: GTK+ - low-level core development libraries and headers
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
-Description: Handy library of utility functions
-DescPort: <<
-glib2 provides etc/glib-2.0/charset.alias for darwin because there's no
-system-wide charset.alias.
-<<
+Description: GTK+ - low-level core shared libraries
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gtk.org
Index: gnome-vfs2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-vfs2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-vfs2.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-vfs2.info 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,13 +1,13 @@
Package: gnome-vfs2
-Version: 2.6.1.1
-Revision: 16
-Depends: %N-shlibs (>= %v-%r), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.4.0-1), libbonobo2 (>= 2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1),
orbit2 (>= 2.10.0-1), popt-shlibs
+Version: 2.4.2
+Revision: 18
+Depends: %N-shlibs (>= %v-%r), gconf2 (>= 2.4.0.1-1), gettext, glib2 (>=
2.2.3-1), libbonobo2 (>= 2.4.0-1), libiconv, libxml2-shlibs (>= 2.6.1-1),
orbit2 (>= 2.8.1-1), popt
BuildConflicts: openssl-dev, openssl097-dev
-BuildDepends: glib2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), libbonobo2-dev
(>= 2.6.0-1), gconf2-dev (>= 2.6.0-1), libxml2 (>= 2.6.7-1), pkgconfig, gtk-doc
(>= 1.2-1), intltool (>= 0.30-1), bzip2-dev, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, popt
+BuildDepends: glib2-dev (>= 2.2.3-1), orbit2-dev (>= 2.8.1-1), libbonobo2-dev
(>= 2.4.0-1), gconf2-dev (>= 2.4.0.1-1), libxml2 (>= 2.6.1-1), pkgconfig,
gtk-doc (>= 1.1-1), intltool (>= 0.30-1), bzip2-dev, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev
Conflicts: gnome-vfs2-ssl
-Replaces: gnome-vfs2-ssl, libgnome2 (<< 2.6.0-6)
-Source: mirror:gnome:sources/gnome-vfs/2.6/gnome-vfs-%v.tar.bz2
-Source-MD5: a5a7e86dbe539d64c7be99ccef5bc8db
+Replaces: gnome-vfs2-ssl
+Source: mirror:gnome:sources/gnome-vfs/2.4/gnome-vfs-%v.tar.bz2
+Source-MD5: a0f0e40739214143bbf3050311ff10cd
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
@@ -30,11 +30,11 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: bzip2-shlibs, gconf2-shlibs (>= 2.6.0-1), gettext, glib2-shlibs (>=
2.4.0-1), gnome-mime-data (>= 2.4.0-1), libbonobo2-shlibs (>= 2.4.0-1),
libiconv, libxml2-shlibs (>= 2.6.7-1), orbit2-shlibs (>= 2.10.0-1)
+ Depends: bzip2-shlibs, gconf2-shlibs (>= 2.4.0.1-1), gettext, glib2-shlibs
(>= 2.2.3-1), gnome-mime-data (>= 2.4.0-1), libbonobo2-shlibs (>= 2.4.0-1),
libiconv, libxml2-shlibs (>= 2.6.1-1), orbit2-shlibs (>= 2.8.1-1)
Conflicts: gnome-vfs2-ssl-shlibs
Replaces: gnome-vfs2-ssl-shlibs
Files: lib/libgnomevfs-2.*.dylib lib/gnome-vfs-2.0/modules lib/vfs
- Shlibs: %p/lib/libgnomevfs-2.0.dylib 601.0.0 gnome-vfs2-shlibs (>=
2.6.1.1-1) | gnome-vfs2-ssl-shlibs (>= 2.6.1.1-1)
+ Shlibs: %p/lib/libgnomevfs-2.0.dylib 400.1.0 gnome-vfs2-shlibs (>= 2.4.0-1)
| gnome-vfs2-ssl-shlibs (>= 2.4.0-1)
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
SplitOff2: <<
@@ -43,7 +43,7 @@
DescPackaging: <<
Uses pkgconfig.
Any package which BuildDepends on this one must also BuildDepend on:
- glib2-dev (>= 2.4.0-1), libxml2 (>= 2.6.7-1), orbit2-dev (>= 2.10.0-1)
+ glib2-dev (>= 2.2.3-1), libxml2 (>= 2.4.20-1), orbit2-dev (>= 2.4.0-1)
<<
Conflicts: gnome-vfs2-ssl-dev
Replaces: %N (<< 2.0.2-2), gnome-vfs2-ssl-dev
@@ -51,7 +51,7 @@
Files: include lib/gnome-vfs-2.0/include lib/libgnomevfs-2.* lib/pkgconfig
share/gtk-doc
DocFiles: AUTHORS COPYING* ChangeLog NEWS README
<<
-ConfFiles: <<
+ConfFiles: <<
%p/etc/gnome-vfs-2.0/modules/default-modules.conf
%p/etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
%p/etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
Index: gdm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gdm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gdm.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gdm.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,9 +1,9 @@
Package: gdm
Version: 2.6.0.3
Source: gnome
-Revision: 9
+Revision: 19
Depends: atk1-shlibs (>= 1.6.0-1), audiofile-shlibs (>= 0.2.5-1), esound (>=
0.2.34-1), file-roller (>= 2.6.0-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.4.0-1), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), gtk+2 (>=
2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>= 2.6.0-1), libbonoboui2
(>= 2.6.0-1), libglade2-shlibs (>= 2.3.6-1), libgnome2 (>= 2.6.0-1),
libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libiconv, librsvg2 (>=
2.6.0-1), libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1), pango1-xft2 (>=
1.4.0-1), popt-shlibs
-BuildDepends: audiofile, libcroco1, libgsf-dev, xml-parser-pm581 |
xml-parser-pm586, atk1 (>= 1.6.0-1), esound (>= 0.2.34-1), gconf2-dev (>=
2.6.0-1), gettext-dev, glib2-dev (>= 2.4.0-1), gnome-keyring-dev,
gnome-vfs2-dev (>= 2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1), gtk+2-dev (>=
2.4.0-1), libart2 (>= 2.3.16-1), libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev
(>= 2.6.0-1), libglade2 (>= 2.3.6-1), libgnome2-dev (>= 2.6.0-1),
libgnomecanvas2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), libiconv-dev,
libjpeg, librsvg2 (>= 2.6.0-1), libxml2 (>= 2.6.7-1), orbit2-dev (>= 2.10.0-1),
pango1-xft2-dev (>= 1.4.0-1), pkgconfig, scrollkeeper (>= 0.3.12-2), popt
+BuildDepends: audiofile, libcroco1, libgsf-dev, xml-parser-pm586, atk1 (>=
1.6.0-1), esound (>= 0.2.34-1), gconf2-dev (>= 2.6.0-1), gettext-dev, glib2-dev
(>= 2.4.0-1), gnome-keyring-dev, gnome-vfs2-dev (>= 2.6.0-1) |
gnome-vfs2-ssl-dev (>= 2.6.0-1), gtk+2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1),
libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev (>= 2.6.0-1), libglade2 (>=
2.3.6-1), libgnome2-dev (>= 2.6.0-1), libgnomecanvas2-dev (>= 2.6.0-1),
libgnomeui2-dev (>= 2.6.0-1), libiconv-dev, libjpeg, librsvg2 (>= 2.6.0-1),
libxml2 (>= 2.6.7-1), orbit2-dev (>= 2.10.0-1), pango1-xft2-dev (>= 1.4.0-1),
pkgconfig, scrollkeeper (>= 0.3.12-2), popt
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
NoSetMAKEFLAGS: true
Index: gnome-icon-theme.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-icon-theme.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-icon-theme.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-icon-theme.info 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,7 +1,7 @@
Package: gnome-icon-theme
Version: 1.2.3
-Revision: 5
-BuildDepends: intltool, xml-parser-pm581 | xml-parser-pm586
+Revision: 15
+BuildDepends: intltool, xml-parser-pm586
DescPackaging: Uses pkgconfig, but there are no pkgconfig-related dependencies.
Replaces: gnome-vfs (<< 1.0.5), gnome-vfs-ssl (<< 1.0.5)
Source: mirror:gnome:sources/%n/1.2/%n-%v.tar.bz2
Index: gnome-libs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-libs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-libs.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-libs.info 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,6 +1,6 @@
Package: gnome-libs
Version: 1.4.2
-Revision: 19
+Revision: 29
BuildDepends: glib, gtk+ (>= 1.2.10-20), imlib (>= 1.9.14-14), orbit-dev (>=
0.5.17-15), libjpeg, libtiff, libpng3, giflib, audiofile, esound, gtk-doc (>=
0.9-4), gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, gcc3.3
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype2 (<< 2.1.3-11), freetype2-hinting (<< 2.0.9-10)
@@ -40,7 +40,7 @@
%p/lib/libgnome.32.dylib 37.0.0 %n (>= 1.4.2-1)
%p/lib/libgnomesupport.0.dylib 1.0.0 %n (>= 1.4.2-1)
%p/lib/libgnomeui.32.dylib 47.0.0 %n (>= 1.4.2-1)
- %p/lib/libgnorba.27.dylib 29.0.0 %n (>= 1.4.2-1)
+ %p/lib/libgnorba.27.dylib 29.0.0 %n (>= 1.4.2-29)
%p/lib/libgnorbagtk.0.dylib 1.0.0 %n (>= 1.4.2-1)
%p/lib/libgtkxmhtml.1.dylib 2.0.0 %n (>= 1.4.2-1)
%p/lib/libzvt.2.dylib 6.0.0 %n (>= 1.4.2-1)
Index: gnome-panel.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-panel.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-panel.info 27 Apr 2005 03:38:48 -0000 1.1
+++ gnome-panel.info 28 Apr 2005 14:14:04 -0000 1.2
@@ -1,8 +1,8 @@
Package: gnome-panel
Version: 2.6.2
-Revision: 15
+Revision: 25
Depends: %N-shlibs (>= %v-%r), atk1-shlibs (>= 1.6.0-1), audiofile-shlibs (>=
0.2.5-1), esound (>= 0.2.34-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.4.0-1), gnome-desktop (>= 2.6.0-1), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl
(>= 2.6.0-1), gtk+2 (>= 2.4.0-1), libart2-shlibs (>= 2.3.16-1), libbonobo2 (>=
2.6.0-1), libbonoboui2 (>= 2.6.0-1), libglade2-shlibs (>= 2.3.6-1), libgnome2
(>= 2.6.0-1), libgnomecanvas2 (>= 2.6.0-1), libgnomeui2 (>= 2.6.0-1), libiconv,
libpng3-shlibs (>= 1.2.5-4), libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1),
pango1-xft2 (>= 1.4.0-1), popt-shlibs, scrollkeeper (>= 0.3.12-2),
default-icon-theme
-BuildDepends: xml-parser-pm560 | xml-parser-pm561 | xml-parser-pm581 |
xml-parser-pm586, libpng3, glib2-dev (>= 2.4.0-1), atk1 (>= 1.6.0-1),
pango1-xft2-dev (>= 1.4.0-1), gtk+2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1),
gconf2-dev (>= 2.6.0-1), gnome-vfs2-dev (>= 2.6.0-1) | gnome-vfs2-ssl-dev (>=
2.6.0-1), libglade2 (>= 2.3.6-1), libart2 (>= 2.3.16-1), libgnomecanvas2-dev
(>= 2.6.0-1), libxml2 (>= 2.6.7-1), libbonobo2-dev (>= 2.6.0-1), libgnome2-dev
(>= 2.6.0-1), libbonoboui2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1),
libwnck1 (>= 2.6.0-1), gnome-desktop4-dev (>= 2.6.0-1), audiofile (>= 0.2.5-1),
esound, pkgconfig, gtk-doc (>= 1.2-1), intltool, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, libjpeg, startup-notification-dev,
gnome-keyring-dev, gdk-pixbuf, popt
+BuildDepends: xml-parser-pm586, libpng3, glib2-dev (>= 2.4.0-1), atk1 (>=
1.6.0-1), pango1-xft2-dev (>= 1.4.0-1), gtk+2-dev (>= 2.4.0-1), orbit2-dev (>=
2.10.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-dev (>= 2.6.0-1) |
gnome-vfs2-ssl-dev (>= 2.6.0-1), libglade2 (>= 2.3.6-1), libart2 (>= 2.3.16-1),
libgnomecanvas2-dev (>= 2.6.0-1), libxml2 (>= 2.6.7-1), libbonobo2-dev (>=
2.6.0-1), libgnome2-dev (>= 2.6.0-1), libbonoboui2-dev (>= 2.6.0-1),
libgnomeui2-dev (>= 2.6.0-1), libwnck1 (>= 2.6.0-1), gnome-desktop4-dev (>=
2.6.0-1), audiofile (>= 0.2.5-1), esound, pkgconfig, gtk-doc (>= 1.2-1),
intltool, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, libjpeg,
startup-notification-dev, gnome-keyring-dev, gdk-pixbuf, popt
Conflicts: gnome-core (<< 2.0.0)
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
Source-MD5: 41318b24e18f497b4418c7d60aaf33f6
Index: glib2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glib2.patch 27 Apr 2005 03:38:48 -0000 1.1
+++ glib2.patch 28 Apr 2005 14:14:03 -0000 1.2
@@ -1,19 +1,19 @@
-diff -uNr glib-2.4.6/Makefile.in glib-2.4.6-new/Makefile.in
---- glib-2.4.6/Makefile.in 2004-08-13 08:53:11.000000000 -0500
-+++ glib-2.4.6-new/Makefile.in 2004-11-03 08:47:15.000000000 -0600
-@@ -226,7 +226,7 @@
+diff -Naur glib-2.2.3-old/Makefile.in glib-2.2.3/Makefile.in
+--- glib-2.2.3-old/Makefile.in Tue Aug 26 12:45:11 2003
++++ glib-2.2.3/Makefile.in Mon Oct 13 11:07:17 2003
+@@ -145,7 +145,7 @@
- AUTOMAKE_OPTIONS = 1.7
+ AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
bin_SCRIPTS = glib-gettextize
-diff -uNr glib-2.4.6/configure glib-2.4.6-new/configure
---- glib-2.4.6/configure 2004-08-13 08:53:23.000000000 -0500
-+++ glib-2.4.6-new/configure 2004-11-03 08:47:15.000000000 -0600
-@@ -30353,10 +30353,11 @@
+diff -Naur glib-2.2.3-old/configure glib-2.2.3/configure
+--- glib-2.2.3-old/configure Tue Aug 26 12:42:14 2003
++++ glib-2.2.3/configure Mon Oct 13 11:07:18 2003
+@@ -27714,10 +27714,11 @@
echo "$as_me:$LINENO: result: $glib_cv___va_copy" >&5
echo "${ECHO_T}$glib_cv___va_copy" >&6
@@ -28,30 +28,30 @@
fi
fi
-@@ -31724,9 +31725,9 @@
- # skip cygwin -pthread or -pthreads test
- ;;
- *)
-- for flag in pthread pthreads; do
-+ for flag in '-pthread' '-pthreads' ''; do
- glib_save_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -$flag"
-+ CFLAGS="$CFLAGS $flag"
- if test "$cross_compiling" = yes; then
+@@ -28920,9 +28921,9 @@
+ # both CPPFLAG and LIBS.
+ # One of them does for most gcc versions and some other
platforms/compilers
+ # too and could be considered as the canonical way to go.
+- for flag in pthread pthreads; do
++ for flag in '-pthread' '-pthreads' ''; do
+ glib_save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -$flag"
++ CFLAGS="$CFLAGS $flag"
+ if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -31815,8 +31816,8 @@
+@@ -29001,8 +29002,8 @@
fi
- CFLAGS="$glib_save_CFLAGS"
- if test $glib_flag_works = yes ; then
-- G_THREAD_CFLAGS=-$flag
-- G_THREAD_LIBS=-$flag
-+ G_THREAD_CFLAGS=$flag
-+ G_THREAD_LIBS=$flag
- fi
- done
- ;;
-@@ -31846,6 +31847,9 @@
+ CFLAGS="$glib_save_CFLAGS"
+ if test $glib_flag_works = yes ; then
+- G_THREAD_CFLAGS=-$flag
+- G_THREAD_LIBS=-$flag
++ G_THREAD_CFLAGS=$flag
++ G_THREAD_LIBS=$flag
+ fi
+ done
+ fi
+@@ -29030,6 +29031,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
@@ -61,7 +61,7 @@
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
-@@ -38059,9 +38063,10 @@
+@@ -34395,9 +34399,10 @@
#define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
"
@@ -73,7 +73,7 @@
*) glib_vacopy=''
esac
-@@ -39311,8 +39316,11 @@
+@@ -35430,8 +35435,11 @@
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
* is passed ISO vararg support is turned off, and there is no work
* around to turn it on, so we unconditionally turn it off.
@@ -86,31 +86,19 @@
# undef G_HAVE_ISO_VARARGS
#endif
-diff -uNr glib-2.4.6/glib/gspawn.c glib-2.4.6-new/glib/gspawn.c
---- glib-2.4.6/glib/gspawn.c 2004-03-14 12:26:47.000000000 -0600
-+++ glib-2.4.6-new/glib/gspawn.c 2004-11-03 08:47:33.000000000 -0600
-@@ -142,6 +142,8 @@
- return ret;
- }
-
-+#undef READ_OK
-+
- typedef enum
- {
- READ_FAILED = 0, /* FALSE */
-diff -uNr glib-2.4.6/glib/libcharset/Makefile.in
glib-2.4.6-new/glib/libcharset/Makefile.in
---- glib-2.4.6/glib/libcharset/Makefile.in 2004-08-13 08:53:15.000000000
-0500
-+++ glib-2.4.6-new/glib/libcharset/Makefile.in 2004-11-03 08:47:15.000000000
-0600
-@@ -225,7 +225,7 @@
- target_alias = @target_alias@
+diff -Naur glib-2.2.3-old/glib/libcharset/Makefile.in
glib-2.2.3/glib/libcharset/Makefile.in
+--- glib-2.2.3-old/glib/libcharset/Makefile.in Tue Aug 26 12:45:13 2003
++++ glib-2.2.3/glib/libcharset/Makefile.in Mon Oct 13 11:07:18 2003
+@@ -144,7 +144,7 @@
+ ms_librarian = @ms_librarian@
INCLUDES = \
-- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-+ -DLIBDIR=\"$(sysconfdir)/glib-2.0\" -I$(top_srcdir)
+- -DLIBDIR=\"$(libdir)\"
++ -DLIBDIR=\"$(sysconfdir)/glib-2.0\"
noinst_LTLIBRARIES = libcharset.la
-@@ -246,8 +246,8 @@
+@@ -165,8 +165,8 @@
make-patch.sh
@@ -121,8 +109,8 @@
SUFFIXES = .sed .sin
-@@ -528,7 +528,7 @@
- uninstall-am uninstall-info-am uninstall-local
+@@ -389,7 +389,7 @@
+ mostlyclean distclean maintainer-clean
install-exec-local: all-local
- $(mkinstalldirs) $(DESTDIR)$(libdir)
@@ -130,9 +118,9 @@
if test -f $(charset_alias); then \
sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
$(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-diff -uNr glib-2.4.6/glib/libcharset/charset.alias
glib-2.4.6-new/glib/libcharset/charset.alias
---- glib-2.4.6/glib/libcharset/charset.alias 1969-12-31 18:00:00.000000000
-0600
-+++ glib-2.4.6-new/glib/libcharset/charset.alias 2004-11-03
08:47:15.000000000 -0600
+diff -Naur glib-2.2.3-old/glib/libcharset/charset.alias
glib-2.2.3/glib/libcharset/charset.alias
+--- glib-2.2.3-old/glib/libcharset/charset.alias Wed Dec 31 19:00:00 1969
++++ glib-2.2.3/glib/libcharset/charset.alias Mon Oct 13 11:07:18 2003
@@ -0,0 +1,111 @@
+# This file contains a table of character encoding aliases,
+# suitable for operating system 'darwin'.
@@ -245,10 +233,10 @@
+zh_CN.EUC GB2312
+zh_TW UTF-8
+zh_TW.Big5 BIG5
-diff -uNr glib-2.4.6/ltmain.sh glib-2.4.6-new/ltmain.sh
---- glib-2.4.6/ltmain.sh 2004-04-08 08:34:47.000000000 -0500
-+++ glib-2.4.6-new/ltmain.sh 2004-11-03 08:47:15.000000000 -0600
-@@ -5247,10 +5247,10 @@
+diff -Naur glib-2.2.3-old/ltmain.sh glib-2.2.3/ltmain.sh
+--- glib-2.2.3-old/ltmain.sh Thu Jul 17 00:47:23 2003
++++ glib-2.2.3/ltmain.sh Mon Oct 13 11:38:16 2003
+@@ -5145,10 +5145,10 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -263,9 +251,9 @@
done
fi
-diff -uNr glib-2.4.6/po/Makefile.in.in glib-2.4.6-new/po/Makefile.in.in
---- glib-2.4.6/po/Makefile.in.in 2003-03-04 04:10:46.000000000 -0600
-+++ glib-2.4.6-new/po/Makefile.in.in 2004-11-03 08:47:15.000000000 -0600
+diff -Naur glib-2.2.3-old/po/Makefile.in.in glib-2.2.3/po/Makefile.in.in
+--- glib-2.2.3-old/po/Makefile.in.in Wed Mar 5 19:26:35 2003
++++ glib-2.2.3/po/Makefile.in.in Mon Oct 13 11:07:18 2003
@@ -27,7 +27,7 @@
exec_prefix = @exec_prefix@
datadir = @datadir@
@@ -275,3 +263,15 @@
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
+diff -ruN glib-2.2.3/glib/gspawn.c glib-2.2.3-patched/glib/gspawn.c
+--- glib-2.2.3/glib/gspawn.c 2003-06-02 14:20:38.000000000 -0400
++++ glib-2.2.3-patched/glib/gspawn.c 2004-12-26 21:22:51.000000000 -0500
+@@ -131,6 +131,8 @@
+ return ret;
+ }
+
++#undef READ_OK
++
+ typedef enum
+ {
+ READ_FAILED = 0, /* FALSE */
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
