Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv17761

Modified Files:
        glib2-shlibs.info glib2-shlibs.patch 
Log Message:
Clean up gdbus interactions with fink-supplied dbus daemon


Index: glib2-shlibs.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/glib2-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glib2-shlibs.info   19 May 2011 09:02:18 -0000      1.3
+++ glib2-shlibs.info   20 May 2011 05:56:38 -0000      1.4
@@ -20,6 +20,7 @@
        pkgconfig (>= 0.25)
 <<
 Depends: <<
+       dbus (>= 1.2.1-1),
        libgettext8-shlibs,
        libiconv,
        xdg-base
@@ -32,7 +33,7 @@
 Source: mirror:gnome:sources/glib/2.28/glib-%v.tar.bz2
 Source-MD5: 7d8fc15ae70d5111c0cf2a79d50ef717
 PatchFile: %n.patch
-PatchFile-MD5: 95af183b543b413fefc2ce5c3da5434f
+PatchFile-MD5: 4edbf362ae121e1ba79dc590c0946549
 PatchScript: <<
        sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
 #      perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g' 
docs/reference/*/html/*.html
@@ -51,7 +52,7 @@
                desktop-file-utils (>= 0.15-1),
                shared-mime-info (>= 0.51-1)
        <<
-       TestScript: LANG=C make check || exit 2
+       TestScript: LANG=C make check -j 1 || exit 2
 <<
 InstallScript: <<
        make install DESTDIR=%d

Index: glib2-shlibs.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/glib2-shlibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glib2-shlibs.patch  16 Mar 2011 09:17:14 -0000      1.2
+++ glib2-shlibs.patch  20 May 2011 05:56:38 -0000      1.3
@@ -1,7 +1,7 @@
-diff -Nurd -x'*~' glib-2.28.2.orig/configure glib-2.28.2/configure
---- glib-2.28.2.orig/configure 2011-03-07 12:06:44.000000000 -0500
-+++ glib-2.28.2/configure      2011-03-16 04:12:49.000000000 -0400
-@@ -5121,7 +5121,7 @@
+diff -Nurd -x'*~' glib-2.28.6.orig/configure glib-2.28.6/configure
+--- glib-2.28.6.orig/configure 2011-04-13 18:58:04.000000000 -0400
++++ glib-2.28.6/configure      2011-05-20 01:43:43.000000000 -0400
+@@ -5113,7 +5113,7 @@
  
  $as_echo "#define HAVE_CARBON 1" >>confdefs.h
  
@@ -10,7 +10,7 @@
  fi
  
  
-@@ -7104,13 +7104,13 @@
+@@ -7096,13 +7096,13 @@
  
          if test -n "$PYTHON"; then
        # If the user set $PYTHON, use it and don't search something else.
@@ -27,7 +27,7 @@
  minverhex = 0
  # xrange is not present in Python 3.0 and range returns an iterator
  for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-@@ -25688,6 +25688,9 @@
+@@ -25692,6 +25692,9 @@
                        G_THREAD_CFLAGS="-D_THREAD_SAFE"
                fi
                ;;
@@ -37,9 +37,9 @@
        *-dg-dgux*)  # DG/UX
                G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
                ;;
-diff -Nurd -x'*~' glib-2.28.2.orig/docs/reference/gio/Makefile.in 
glib-2.28.2/docs/reference/gio/Makefile.in
---- glib-2.28.2.orig/docs/reference/gio/Makefile.in    2011-03-07 
12:06:40.000000000 -0500
-+++ glib-2.28.2/docs/reference/gio/Makefile.in 2011-03-16 04:22:48.000000000 
-0400
+diff -Nurd -x'*~' glib-2.28.6.orig/docs/reference/gio/Makefile.in 
glib-2.28.6/docs/reference/gio/Makefile.in
+--- glib-2.28.6.orig/docs/reference/gio/Makefile.in    2011-04-13 
18:57:59.000000000 -0400
++++ glib-2.28.6/docs/reference/gio/Makefile.in 2011-05-20 01:43:43.000000000 
-0400
 @@ -495,6 +495,9 @@
        version.xml.in          \
        gvfs-overview.odg
@@ -50,9 +50,9 @@
  @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile 
$(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) 
$(AM_LDFLAGS) $(LDFLAGS)
-diff -Nurd -x'*~' glib-2.28.2.orig/docs/reference/glib/Makefile.in 
glib-2.28.2/docs/reference/glib/Makefile.in
---- glib-2.28.2.orig/docs/reference/glib/Makefile.in   2011-03-07 
12:06:40.000000000 -0500
-+++ glib-2.28.2/docs/reference/glib/Makefile.in        2011-03-16 
04:07:23.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/docs/reference/glib/Makefile.in 
glib-2.28.6/docs/reference/glib/Makefile.in
+--- glib-2.28.6.orig/docs/reference/glib/Makefile.in   2011-04-13 
18:58:00.000000000 -0400
++++ glib-2.28.6/docs/reference/glib/Makefile.in        2011-05-20 
01:43:43.000000000 -0400
 @@ -409,7 +409,7 @@
  
  
@@ -62,9 +62,9 @@
  @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile 
$(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) 
$(AM_LDFLAGS) $(LDFLAGS)
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/Makefile.in glib-2.28.2/gio/Makefile.in
---- glib-2.28.2.orig/gio/Makefile.in   2011-03-07 12:06:40.000000000 -0500
-+++ glib-2.28.2/gio/Makefile.in        2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/Makefile.in glib-2.28.6/gio/Makefile.in
+--- glib-2.28.6.orig/gio/Makefile.in   2011-04-13 18:58:00.000000000 -0400
++++ glib-2.28.6/gio/Makefile.in        2011-05-20 01:43:43.000000000 -0400
 @@ -928,6 +928,7 @@
        $(SELINUX_LIBS)                                 \
        $(GLIB_LIBS)                                    \
@@ -73,9 +73,39 @@
        $(NULL)
  
  @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gdesktopappinfo.c 
glib-2.28.2/gio/gdesktopappinfo.c
---- glib-2.28.2.orig/gio/gdesktopappinfo.c     2011-03-04 12:49:45.000000000 
-0500
-+++ glib-2.28.2/gio/gdesktopappinfo.c  2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gdbusaddress.c 
glib-2.28.6/gio/gdbusaddress.c
+--- glib-2.28.6.orig/gio/gdbusaddress.c        2011-04-13 18:55:29.000000000 
-0400
++++ glib-2.28.6/gio/gdbusaddress.c     2011-05-20 01:45:09.000000000 -0400
+@@ -1208,7 +1208,7 @@
+       ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
+       if (ret == NULL)
+         {
+-          ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket");
++          ret = g_strdup 
("unix:path=@PREFIX@/var/run/dbus/system_bus_socket");
+         }
+       break;
+ 
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gdbusprivate.c 
glib-2.28.6/gio/gdbusprivate.c
+--- glib-2.28.6.orig/gio/gdbusprivate.c        2011-04-13 18:55:29.000000000 
-0400
++++ glib-2.28.6/gio/gdbusprivate.c     2011-05-20 01:44:18.000000000 -0400
+@@ -1760,12 +1760,12 @@
+   gchar *ret;
+   /* TODO: use PACKAGE_LOCALSTATEDIR ? */
+   ret = NULL;
+-  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
++  if (!g_file_get_contents ("@PREFIX@/var/lib/dbus/machine-id",
+                             &ret,
+                             NULL,
+                             error))
+     {
+-      g_prefix_error (error, _("Unable to load /var/lib/dbus/machine-id: "));
++      g_prefix_error (error, _("Unable to load 
@PREFIX@/var/lib/dbus/machine-id: "));
+     }
+   else
+     {
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gdesktopappinfo.c 
glib-2.28.6/gio/gdesktopappinfo.c
+--- glib-2.28.6.orig/gio/gdesktopappinfo.c     2011-03-29 12:34:52.000000000 
-0400
++++ glib-2.28.6/gio/gdesktopappinfo.c  2011-05-20 01:43:43.000000000 -0400
 @@ -1721,7 +1721,7 @@
        g_file_set_contents (filename, contents, -1, NULL);
        g_free (contents);
@@ -94,9 +124,9 @@
    
    return TRUE;
  }
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gdrive.h glib-2.28.2/gio/gdrive.h
---- glib-2.28.2.orig/gio/gdrive.h      2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/gio/gdrive.h   2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gdrive.h glib-2.28.6/gio/gdrive.h
+--- glib-2.28.6.orig/gio/gdrive.h      2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/gio/gdrive.h   2011-05-20 01:43:43.000000000 -0400
 @@ -164,7 +164,7 @@
  gboolean g_drive_is_media_check_automatic (GDrive               *drive);
  gboolean g_drive_can_poll_for_media       (GDrive               *drive);
@@ -106,9 +136,9 @@
  void     g_drive_eject                    (GDrive               *drive,
                                           GMountUnmountFlags    flags,
                                             GCancellable         *cancellable,
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gfile.h glib-2.28.2/gio/gfile.h
---- glib-2.28.2.orig/gio/gfile.h       2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/gio/gfile.h    2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gfile.h glib-2.28.6/gio/gfile.h
+--- glib-2.28.6.orig/gio/gfile.h       2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/gio/gfile.h    2011-05-20 01:43:43.000000000 -0400
 @@ -869,7 +869,7 @@
  GFile *                 g_file_mount_mountable_finish     (GFile              
        *file,
                                                           GAsyncResult         
      *result,
@@ -127,9 +157,9 @@
  void                    g_file_eject_mountable            (GFile              
        *file,
                                                           GMountUnmountFlags   
       flags,
                                                           GCancellable         
      *cancellable,
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gmount.h glib-2.28.2/gio/gmount.h
---- glib-2.28.2.orig/gio/gmount.h      2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/gio/gmount.h   2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gmount.h glib-2.28.6/gio/gmount.h
+--- glib-2.28.6.orig/gio/gmount.h      2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/gio/gmount.h   2011-05-20 01:43:43.000000000 -0400
 @@ -170,7 +170,7 @@
  gboolean    g_mount_can_unmount               (GMount              *mount);
  gboolean    g_mount_can_eject                 (GMount              *mount);
@@ -139,9 +169,9 @@
  void        g_mount_unmount                   (GMount              *mount,
                                                 GMountUnmountFlags   flags,
                                                 GCancellable        
*cancellable,
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gunixmounts.c 
glib-2.28.2/gio/gunixmounts.c
---- glib-2.28.2.orig/gio/gunixmounts.c 2011-01-17 15:54:00.000000000 -0500
-+++ glib-2.28.2/gio/gunixmounts.c      2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gunixmounts.c 
glib-2.28.6/gio/gunixmounts.c
+--- glib-2.28.6.orig/gio/gunixmounts.c 2011-01-17 15:54:00.000000000 -0500
++++ glib-2.28.6/gio/gunixmounts.c      2011-05-20 01:43:43.000000000 -0400
 @@ -243,6 +243,7 @@
      "/sbin",
      "/net",
@@ -150,9 +180,9 @@
      NULL
    };
  
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gvolume.h glib-2.28.2/gio/gvolume.h
---- glib-2.28.2.orig/gio/gvolume.h     2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/gio/gvolume.h  2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gvolume.h glib-2.28.6/gio/gvolume.h
+--- glib-2.28.6.orig/gio/gvolume.h     2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/gio/gvolume.h  2011-05-20 01:43:43.000000000 -0400
 @@ -180,7 +180,7 @@
  gboolean g_volume_mount_finish          (GVolume              *volume,
                                         GAsyncResult         *result,
@@ -162,9 +192,9 @@
  void     g_volume_eject                 (GVolume              *volume,
                                         GMountUnmountFlags    flags,
                                         GCancellable         *cancellable,
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/gvolumemonitor.h 
glib-2.28.2/gio/gvolumemonitor.h
---- glib-2.28.2.orig/gio/gvolumemonitor.h      2010-09-27 14:48:33.000000000 
-0400
-+++ glib-2.28.2/gio/gvolumemonitor.h   2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/gvolumemonitor.h 
glib-2.28.6/gio/gvolumemonitor.h
+--- glib-2.28.6.orig/gio/gvolumemonitor.h      2010-09-27 14:48:33.000000000 
-0400
++++ glib-2.28.6/gio/gvolumemonitor.h   2011-05-20 01:43:43.000000000 -0400
 @@ -141,7 +141,7 @@
  GMount *        g_volume_monitor_get_mount_for_uuid   (GVolumeMonitor 
*volume_monitor,
                                                         const char     *uuid);
@@ -174,9 +204,9 @@
  GVolume *       g_volume_monitor_adopt_orphan_mount   (GMount         *mount);
  #endif
  
-diff -Nurd -x'*~' glib-2.28.2.orig/gio/xdgmime/xdgmime.c 
glib-2.28.2/gio/xdgmime/xdgmime.c
---- glib-2.28.2.orig/gio/xdgmime/xdgmime.c     2010-09-27 14:48:33.000000000 
-0400
-+++ glib-2.28.2/gio/xdgmime/xdgmime.c  2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/gio/xdgmime/xdgmime.c 
glib-2.28.6/gio/xdgmime/xdgmime.c
+--- glib-2.28.6.orig/gio/xdgmime/xdgmime.c     2010-09-27 14:48:33.000000000 
-0400
++++ glib-2.28.6/gio/xdgmime/xdgmime.c  2011-05-20 01:43:43.000000000 -0400
 @@ -257,7 +257,7 @@
  
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
@@ -186,9 +216,9 @@
  
    ptr = xdg_data_dirs;
  
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/gmacros.h glib-2.28.2/glib/gmacros.h
---- glib-2.28.2.orig/glib/gmacros.h    2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/glib/gmacros.h 2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/gmacros.h glib-2.28.6/glib/gmacros.h
+--- glib-2.28.6.orig/glib/gmacros.h    2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/glib/gmacros.h 2011-05-20 01:43:43.000000000 -0400
 @@ -127,7 +127,8 @@
  #define G_GNUC_WARN_UNUSED_RESULT
  #endif /* __GNUC__ */
@@ -199,9 +229,9 @@
  /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
   * macros, so we can refer to them as strings unconditionally.
   * usage not-recommended since gcc-3.0
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/gmessages.h 
glib-2.28.2/glib/gmessages.h
---- glib-2.28.2.orig/glib/gmessages.h  2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/glib/gmessages.h       2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/gmessages.h 
glib-2.28.6/glib/gmessages.h
+--- glib-2.28.6.orig/glib/gmessages.h  2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/glib/gmessages.h       2011-05-20 01:43:43.000000000 -0400
 @@ -121,7 +121,8 @@
                                 int             line,
                                 const char     *func,
@@ -212,9 +242,9 @@
  void g_assert_warning         (const char *log_domain,
                               const char *file,
                               const int   line,
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/gslice.c glib-2.28.2/glib/gslice.c
---- glib-2.28.2.orig/glib/gslice.c     2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.2/glib/gslice.c  2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/gslice.c glib-2.28.6/glib/gslice.c
+--- glib-2.28.6.orig/glib/gslice.c     2010-09-27 14:48:33.000000000 -0400
++++ glib-2.28.6/glib/gslice.c  2011-05-20 01:43:43.000000000 -0400
 @@ -1153,19 +1153,18 @@
                      gsize memsize)
  {
@@ -250,9 +280,9 @@
    return aligned_memory;
  }
  
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/gutils.c glib-2.28.2/glib/gutils.c
---- glib-2.28.2.orig/glib/gutils.c     2011-03-04 20:20:22.000000000 -0500
-+++ glib-2.28.2/glib/gutils.c  2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/gutils.c glib-2.28.6/glib/gutils.c
+--- glib-2.28.6.orig/glib/gutils.c     2011-04-13 18:55:30.000000000 -0400
++++ glib-2.28.6/glib/gutils.c  2011-05-20 01:43:43.000000000 -0400
 @@ -2935,7 +2935,7 @@
        gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
  
@@ -271,9 +301,9 @@
  
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/gutils.h glib-2.28.2/glib/gutils.h
---- glib-2.28.2.orig/glib/gutils.h     2011-01-06 22:13:19.000000000 -0500
-+++ glib-2.28.2/glib/gutils.h  2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/gutils.h glib-2.28.6/glib/gutils.h
+--- glib-2.28.6.orig/glib/gutils.h     2011-01-06 22:13:19.000000000 -0500
++++ glib-2.28.6/glib/gutils.h  2011-05-20 01:43:43.000000000 -0400
 @@ -101,7 +101,11 @@
  #  define G_INLINE_FUNC
  #  undef  G_CAN_INLINE
@@ -286,9 +316,9 @@
  #elif defined (G_CAN_INLINE) 
  #  define G_INLINE_FUNC static inline
  #else /* can't inline */
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/libcharset/Makefile.in 
glib-2.28.2/glib/libcharset/Makefile.in
---- glib-2.28.2.orig/glib/libcharset/Makefile.in       2011-03-07 
12:06:42.000000000 -0500
-+++ glib-2.28.2/glib/libcharset/Makefile.in    2011-03-16 04:12:49.000000000 
-0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/libcharset/Makefile.in 
glib-2.28.6/glib/libcharset/Makefile.in
+--- glib-2.28.6.orig/glib/libcharset/Makefile.in       2011-04-13 
18:58:01.000000000 -0400
++++ glib-2.28.6/glib/libcharset/Makefile.in    2011-05-20 01:43:43.000000000 
-0400
 @@ -332,7 +332,7 @@
        codeset.m4 update.sh make-patch.sh libcharset-glib.patch
  TEST_PROGS = 
@@ -318,9 +348,9 @@
        if test -f $(charset_alias); then \
          sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
          $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-diff -Nurd -x'*~' glib-2.28.2.orig/glib/libcharset/charset.alias 
glib-2.28.2/glib/libcharset/charset.alias
---- glib-2.28.2.orig/glib/libcharset/charset.alias     1969-12-31 
19:00:00.000000000 -0500
-+++ glib-2.28.2/glib/libcharset/charset.alias  2011-03-16 04:12:49.000000000 
-0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib/libcharset/charset.alias 
glib-2.28.6/glib/libcharset/charset.alias
+--- glib-2.28.6.orig/glib/libcharset/charset.alias     1969-12-31 
19:00:00.000000000 -0500
++++ glib-2.28.6/glib/libcharset/charset.alias  2011-05-20 01:43:43.000000000 
-0400
 @@ -0,0 +1,111 @@
 +# This file contains a table of character encoding aliases,
 +# suitable for operating system 'darwin'.
@@ -433,9 +463,9 @@
 +zh_CN.EUC             GB2312
 +zh_TW                 UTF-8
 +zh_TW.Big5            BIG5
-diff -Nurd -x'*~' glib-2.28.2.orig/glib-gettextize.in 
glib-2.28.2/glib-gettextize.in
---- glib-2.28.2.orig/glib-gettextize.in        2010-09-27 14:48:33.000000000 
-0400
-+++ glib-2.28.2/glib-gettextize.in     2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/glib-gettextize.in 
glib-2.28.6/glib-gettextize.in
+--- glib-2.28.6.orig/glib-gettextize.in        2010-09-27 14:48:33.000000000 
-0400
++++ glib-2.28.6/glib-gettextize.in     2011-05-20 01:43:43.000000000 -0400
 @@ -49,8 +49,8 @@
      ;;
  esac
@@ -446,9 +476,9 @@
  
  gettext_dir=$prefix/share/glib-2.0/gettext
  
-diff -Nurd -x'*~' glib-2.28.2.orig/tests/child-test.c 
glib-2.28.2/tests/child-test.c
---- glib-2.28.2.orig/tests/child-test.c        2010-09-27 14:48:34.000000000 
-0400
-+++ glib-2.28.2/tests/child-test.c     2011-03-16 04:12:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.28.6.orig/tests/child-test.c 
glib-2.28.6/tests/child-test.c
+--- glib-2.28.6.orig/tests/child-test.c        2010-09-27 14:48:34.000000000 
-0400
++++ glib-2.28.6/tests/child-test.c     2011-05-20 01:43:43.000000000 -0400
 @@ -175,7 +175,7 @@
  #ifdef G_OS_WIN32
    system ("ipconfig /all");


------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to