Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1243

Modified Files:
      Tag: pangocairo-branch
        glib2-10.5.info glib2-10.5.patch glib2.info glib2.patch 
Log Message:
new version; upstream bugfix allows optimization on 10.5 (still inline patch 
needed)


Index: glib2-10.5.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.info,v
retrieving revision 1.3.2.19
retrieving revision 1.3.2.20
diff -u -d -r1.3.2.19 -r1.3.2.20
--- glib2-10.5.info     24 Nov 2007 23:27:47 -0000      1.3.2.19
+++ glib2-10.5.info     24 Nov 2007 23:38:59 -0000      1.3.2.20
@@ -1,5 +1,5 @@
 Package: glib2
-Version: 2.14.1
+Version: 2.14.4
 Revision: 101
 Distribution: 10.5
 Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
@@ -14,14 +14,14 @@
 Replaces: %N-common
 Conflicts: %N-common
 Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2
-Source-MD5: 196d7944a8ddc1f7c3d1e9c7146dd560
-PatchFile: %n.patch
-PatchFile-MD5: 71c02c56bda536d751ea83f538524ea1
+Source-MD5: 7ee7874108cbe9ea7fff1f4ab3389ce8
+PatchFile: %n-10.5.patch
+PatchFile-MD5: 9c2c83c2f369b427986e9203607d9ba1
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 SetLIBS: -L%p/lib
 SetCPPFLAGS: -isystem %p/include
-SetCFLAGS: -O0
+SetCFLAGS: -Os
 SetLIBRARY_PATH: %p/lib
 ConfigureParams: --mandir=%p/share/man --disable-gtk-doc 
--disable-dependency-tracking --enable-static
 CompileScript: <<
@@ -137,11 +137,7 @@
        to regardless of config result so that lib builds the same everywhere
        and is portable.
 
-       Would prefer -Os, but anything above -O0 gives bad code generation
-       on some compilers (see radar #4874204) or cannot be compiled at all
-       (see: radar #5429727, #4909973; gnome bugzilla #445362, #316434)
-
-       Will need to patch gutils.h for inline semantics of newer-gcc. See:
+       Need to patch gutils.h for inline semantics of newer-gcc. See:
        http://bugzilla.gnome.org/show_bug.cgi?id=315437 (patch #96366 does
        not work...not __GNUC_PREREQ). No idea a portable solution, but
        msachs says "static inline" is right for this case, so hardcode it.

Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.16.2.26
retrieving revision 1.16.2.27
diff -u -d -r1.16.2.26 -r1.16.2.27
--- glib2.info  15 Nov 2007 15:09:39 -0000      1.16.2.26
+++ glib2.info  24 Nov 2007 23:38:59 -0000      1.16.2.27
@@ -1,5 +1,5 @@
 Package: glib2
-Version: 2.14.1
+Version: 2.14.4
 Revision: 1
 Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
 BuildDepends: <<
@@ -13,9 +13,9 @@
 Replaces: %N-common
 Conflicts: %N-common
 Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2
-Source-MD5: 196d7944a8ddc1f7c3d1e9c7146dd560
+Source-MD5: 7ee7874108cbe9ea7fff1f4ab3389ce8
 PatchFile: %n.patch
-PatchFile-MD5: 54ae642747974ba7a73bf67c2c49e70f
+PatchFile-MD5: d6f3d72b5e6e8077072bc5c9f9a6171e
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 SetLIBS: -L%p/lib

Index: glib2-10.5.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.patch,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- glib2-10.5.patch    15 Nov 2007 15:09:39 -0000      1.2.2.3
+++ glib2-10.5.patch    24 Nov 2007 23:38:59 -0000      1.2.2.4
@@ -1,9 +1,9 @@
-diff -Nurd -x'*~' glib-2.12.0.orig/configure glib-2.12.0/configure
---- glib-2.12.0.orig/configure 2006-07-02 14:48:07.000000000 -0400
-+++ glib-2.12.0/configure      2006-07-06 21:09:23.000000000 -0400
-@@ -32118,10 +32118,11 @@
- echo "$as_me:$LINENO: result: $glib_cv___va_copy" >&5
- echo "${ECHO_T}$glib_cv___va_copy" >&6
+diff -Nurd -x'*~' glib-2.14.4.orig/configure glib-2.14.4/configure
+--- glib-2.14.4.orig/configure 2007-11-24 01:41:59.000000000 -0500
++++ glib-2.14.4/configure      2007-11-24 18:33:59.000000000 -0500
+@@ -33808,10 +33808,11 @@
+ { echo "$as_me:$LINENO: result: $glib_cv___va_copy" >&5
+ echo "${ECHO_T}$glib_cv___va_copy" >&6; }
  
 -if test "x$glib_cv_va_copy" = "xyes"; then
 -  g_va_copy_func=va_copy
@@ -16,7 +16,7 @@
  fi
  fi
  
-@@ -33544,6 +33545,9 @@
+@@ -35219,6 +35220,9 @@
                        G_THREAD_CFLAGS="-D_THREAD_SAFE"
                fi
                ;;
@@ -26,7 +26,7 @@
        *-dg-dgux*)  # DG/UX
                G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
                ;;
-@@ -39417,9 +39421,10 @@
+@@ -41797,9 +41801,10 @@
  #define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
  "
  
@@ -38,7 +38,7 @@
  *)                    glib_vacopy=''
  esac
  
-@@ -40704,8 +40709,11 @@
+@@ -43076,8 +43081,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.
@@ -51,28 +51,9 @@
  #  undef G_HAVE_ISO_VARARGS
  #endif
  
-diff -Nurd -x'*~' glib-2.12.0.orig/glib/gmem.h glib-2.12.0/glib/gmem.h
---- glib-2.12.0.orig/glib/gmem.h       2006-01-25 10:51:43.000000000 -0500
-+++ glib-2.12.0/glib/gmem.h    2006-07-06 22:49:30.000000000 -0400
-@@ -101,7 +101,6 @@
- 
- 
- /* deprecated memchunks and allocators */
--#if !defined (G_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) || defined 
(GDK_COMPILATION)
- typedef struct _GAllocator GAllocator;
- typedef struct _GMemChunk  GMemChunk;
- #define g_mem_chunk_create(type, pre_alloc, alloc_type)       ( \
-@@ -141,7 +140,6 @@
- #define       G_ALLOCATOR_LIST       (1)
- #define       G_ALLOCATOR_SLIST      (2)
- #define       G_ALLOCATOR_NODE       (3)
--#endif /* G_DISABLE_DEPRECATED */
- 
- G_END_DECLS
- 
-diff -Nurd -x'*~' glib-2.12.12.orig/glib/gutils.h glib-2.12.12/glib/gutils.h
---- glib-2.12.12.orig/glib/gutils.h    2007-05-01 19:12:44.000000000 -0400
-+++ glib-2.12.12/glib/gutils.h 2007-11-04 14:12:33.000000000 -0500
+diff -Nurd -x'*~' glib-2.14.4.orig/glib/gutils.h glib-2.14.4/glib/gutils.h
+--- glib-2.14.4.orig/glib/gutils.h     2007-11-24 01:40:59.000000000 -0500
++++ glib-2.14.4/glib/gutils.h  2007-11-24 18:36:38.000000000 -0500
 @@ -97,7 +97,7 @@
  #  define G_INLINE_FUNC
  #  undef  G_CAN_INLINE
@@ -82,10 +63,10 @@
  #elif defined (G_CAN_INLINE) 
  #  define G_INLINE_FUNC static inline
  #else /* can't inline */
-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
-@@ -237,7 +237,7 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/glib/libcharset/Makefile.in 
glib-2.14.4/glib/libcharset/Makefile.in
+--- glib-2.14.4.orig/glib/libcharset/Makefile.in       2007-11-24 
01:41:56.000000000 -0500
++++ glib-2.14.4/glib/libcharset/Makefile.in    2007-11-24 18:33:59.000000000 
-0500
+@@ -252,7 +252,7 @@
  target_alias = @target_alias@
  
  INCLUDES = \
@@ -94,8 +75,8 @@
  
  
  noinst_LTLIBRARIES = libcharset.la
-@@ -258,8 +258,8 @@
-       make-patch.sh
+@@ -274,8 +274,8 @@
+       libcharset-glib.patch
  
  
 -charset_alias = $(DESTDIR)$(libdir)/charset.alias
@@ -105,7 +86,7 @@
  
  SUFFIXES = .sed .sin
  
-@@ -540,7 +540,7 @@
+@@ -556,7 +556,7 @@
        uninstall-am uninstall-info-am uninstall-local
  
  install-exec-local: all-local
@@ -114,9 +95,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.12.0.orig/glib/libcharset/charset.alias 
glib-2.12.0/glib/libcharset/charset.alias
---- glib-2.12.0.orig/glib/libcharset/charset.alias     1969-12-31 
19:00:00.000000000 -0500
-+++ glib-2.12.0/glib/libcharset/charset.alias  2006-07-06 20:20:37.000000000 
-0400
+diff -Nurd -x'*~' glib-2.14.4.orig/glib/libcharset/charset.alias 
glib-2.14.4/glib/libcharset/charset.alias
+--- glib-2.14.4.orig/glib/libcharset/charset.alias     1969-12-31 
19:00:00.000000000 -0500
++++ glib-2.14.4/glib/libcharset/charset.alias  2007-11-24 18:33:59.000000000 
-0500
 @@ -0,0 +1,111 @@
 +# This file contains a table of character encoding aliases,
 +# suitable for operating system 'darwin'.
@@ -229,10 +210,10 @@
 +zh_CN.EUC             GB2312
 +zh_TW                 UTF-8
 +zh_TW.Big5            BIG5
-diff -Nurd -x'*~' glib-2.12.0.orig/ltmain.sh glib-2.12.0/ltmain.sh
---- glib-2.12.0.orig/ltmain.sh 2006-04-29 17:56:32.000000000 -0400
-+++ glib-2.12.0/ltmain.sh      2006-07-06 20:19:57.000000000 -0400
-@@ -5696,10 +5696,6 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/ltmain.sh glib-2.14.4/ltmain.sh
+--- glib-2.14.4.orig/ltmain.sh 2007-08-29 07:52:51.000000000 -0400
++++ glib-2.14.4/ltmain.sh      2007-11-24 18:33:59.000000000 -0500
+@@ -5759,10 +5759,6 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -243,11 +224,11 @@
        done
        fi
  
-diff -Nurd -x'*~' glib-2.12.0.orig/po/Makefile.in.in 
glib-2.12.0/po/Makefile.in.in
---- glib-2.12.0.orig/po/Makefile.in.in 2005-09-06 12:33:28.000000000 -0400
-+++ glib-2.12.0/po/Makefile.in.in      2006-07-06 20:17:53.000000000 -0400
-@@ -27,7 +27,7 @@
- exec_prefix = @exec_prefix@
+diff -Nurd -x'*~' glib-2.14.4.orig/po/Makefile.in.in 
glib-2.14.4/po/Makefile.in.in
+--- glib-2.14.4.orig/po/Makefile.in.in 2007-11-24 01:41:02.000000000 -0500
++++ glib-2.14.4/po/Makefile.in.in      2007-11-24 18:33:59.000000000 -0500
+@@ -28,7 +28,7 @@
+ datarootdir = @datarootdir@
  datadir = @datadir@
  libdir = @libdir@
 -localedir = $(libdir)/locale
@@ -255,19 +236,19 @@
  gnulocaledir = $(datadir)/locale
  gettextsrcdir = $(datadir)/glib-2.0/gettext/po
  subdir = po
-diff -Nurd -x'*~' glib-2.12.0.orig/tests/Makefile.in 
glib-2.12.0/tests/Makefile.in
---- glib-2.12.0.orig/tests/Makefile.in 2006-07-02 14:48:04.000000000 -0400
-+++ glib-2.12.0/tests/Makefile.in      2006-07-07 13:46:42.000000000 -0400
-@@ -309,7 +309,6 @@
-       markup-escape-test                      \
+diff -Nurd -x'*~' glib-2.14.4.orig/tests/Makefile.in 
glib-2.14.4/tests/Makefile.in
+--- glib-2.14.4.orig/tests/Makefile.in 2007-11-24 01:41:57.000000000 -0500
++++ glib-2.14.4/tests/Makefile.in      2007-11-24 18:33:59.000000000 -0500
+@@ -330,7 +330,6 @@
        module-test                             \
        node-test                               \
+       onceinit                                \
 -      option-test                             \
        patterntest                             \
        printf-test                             \
        queue-test                              \
-@@ -338,7 +337,7 @@
-       uri-test
+@@ -363,7 +362,7 @@
+       regex-test
  
  
 -test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
@@ -275,9 +256,9 @@
  
  test_script_support_programs = markup-test unicode-collate bookmarkfile-test
  
-diff -Nurd -x'*~' glib-2.12.0.orig/tests/array-test.c 
glib-2.12.0/tests/array-test.c
---- glib-2.12.0.orig/tests/array-test.c        2005-03-14 01:01:51.000000000 
-0500
-+++ glib-2.12.0/tests/array-test.c     2006-07-06 20:15:49.000000000 -0400
+diff -Nurd -x'*~' glib-2.14.4.orig/tests/array-test.c 
glib-2.14.4/tests/array-test.c
+--- glib-2.14.4.orig/tests/array-test.c        2007-11-24 01:40:54.000000000 
-0500
++++ glib-2.14.4/tests/array-test.c     2007-11-24 18:33:59.000000000 -0500
 @@ -92,10 +92,14 @@
  
    for (i = 0; i < 10000; i++)
@@ -297,10 +278,10 @@
      }
  
    g_byte_array_free (gbarray, TRUE);
-diff -Nurd -x'*~' glib-2.12.0.orig/tests/child-test.c 
glib-2.12.0/tests/child-test.c
---- glib-2.12.0.orig/tests/child-test.c        2005-07-14 01:20:14.000000000 
-0400
-+++ glib-2.12.0/tests/child-test.c     2006-07-06 20:14:20.000000000 -0400
-@@ -174,7 +174,7 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/tests/child-test.c 
glib-2.14.4/tests/child-test.c
+--- glib-2.14.4.orig/tests/child-test.c        2007-11-24 01:40:54.000000000 
-0500
++++ glib-2.14.4/tests/child-test.c     2007-11-24 18:33:59.000000000 -0500
+@@ -175,7 +175,7 @@
  #ifdef G_OS_WIN32
    system ("ipconfig /all");
  #else

Index: glib2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- glib2.patch 18 Sep 2007 02:59:07 -0000      1.4.2.3
+++ glib2.patch 24 Nov 2007 23:38:59 -0000      1.4.2.4
@@ -1,7 +1,7 @@
-diff -uNr glib-2.14.1/configure glib-2.14.1-new/configure
---- glib-2.14.1/configure      2007-09-16 12:29:44.000000000 -0400
-+++ glib-2.14.1-new/configure  2007-09-17 21:37:52.000000000 -0400
-@@ -36600,10 +36600,11 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/configure glib-2.14.4/configure
+--- glib-2.14.4.orig/configure 2007-11-24 01:41:59.000000000 -0500
++++ glib-2.14.4/configure      2007-11-24 18:33:59.000000000 -0500
+@@ -33808,10 +33808,11 @@
  { echo "$as_me:$LINENO: result: $glib_cv___va_copy" >&5
  echo "${ECHO_T}$glib_cv___va_copy" >&6; }
  
@@ -16,7 +16,7 @@
  fi
  fi
  
-@@ -38206,6 +38207,9 @@
+@@ -35219,6 +35220,9 @@
                        G_THREAD_CFLAGS="-D_THREAD_SAFE"
                fi
                ;;
@@ -26,7 +26,7 @@
        *-dg-dgux*)  # DG/UX
                G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
                ;;
-@@ -45765,9 +45769,10 @@
+@@ -41797,9 +41801,10 @@
  #define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
  "
  
@@ -38,7 +38,7 @@
  *)                    glib_vacopy=''
  esac
  
-@@ -47043,8 +47048,11 @@
+@@ -43076,8 +43081,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.
@@ -51,10 +51,10 @@
  #  undef G_HAVE_ISO_VARARGS
  #endif
  
-diff -uNr glib-2.14.1/glib/libcharset/Makefile.in 
glib-2.14.1-new/glib/libcharset/Makefile.in
---- glib-2.14.1/glib/libcharset/Makefile.in    2007-09-16 12:29:41.000000000 
-0400
-+++ glib-2.14.1-new/glib/libcharset/Makefile.in        2007-09-17 
21:37:52.000000000 -0400
-@@ -251,7 +251,7 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/glib/libcharset/Makefile.in 
glib-2.14.4/glib/libcharset/Makefile.in
+--- glib-2.14.4.orig/glib/libcharset/Makefile.in       2007-11-24 
01:41:56.000000000 -0500
++++ glib-2.14.4/glib/libcharset/Makefile.in    2007-11-24 18:33:59.000000000 
-0500
+@@ -252,7 +252,7 @@
  target_alias = @target_alias@
  
  INCLUDES = \
@@ -63,7 +63,7 @@
  
  
  noinst_LTLIBRARIES = libcharset.la
-@@ -273,8 +273,8 @@
+@@ -274,8 +274,8 @@
        libcharset-glib.patch
  
  
@@ -74,7 +74,7 @@
  
  SUFFIXES = .sed .sin
  
-@@ -555,7 +555,7 @@
+@@ -556,7 +556,7 @@
        uninstall-am uninstall-info-am uninstall-local
  
  install-exec-local: all-local
@@ -83,9 +83,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.14.1/glib/libcharset/charset.alias 
glib-2.14.1-new/glib/libcharset/charset.alias
---- glib-2.14.1/glib/libcharset/charset.alias  1969-12-31 19:00:00.000000000 
-0500
-+++ glib-2.14.1-new/glib/libcharset/charset.alias      2007-09-17 
21:37:52.000000000 -0400
+diff -Nurd -x'*~' glib-2.14.4.orig/glib/libcharset/charset.alias 
glib-2.14.4/glib/libcharset/charset.alias
+--- glib-2.14.4.orig/glib/libcharset/charset.alias     1969-12-31 
19:00:00.000000000 -0500
++++ glib-2.14.4/glib/libcharset/charset.alias  2007-11-24 18:33:59.000000000 
-0500
 @@ -0,0 +1,111 @@
 +# This file contains a table of character encoding aliases,
 +# suitable for operating system 'darwin'.
@@ -198,10 +198,10 @@
 +zh_CN.EUC             GB2312
 +zh_TW                 UTF-8
 +zh_TW.Big5            BIG5
-diff -uNr glib-2.14.1/ltmain.sh glib-2.14.1-new/ltmain.sh
---- glib-2.14.1/ltmain.sh      2007-01-13 23:15:09.000000000 -0500
-+++ glib-2.14.1-new/ltmain.sh  2007-09-17 21:37:52.000000000 -0400
-@@ -5696,10 +5696,6 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/ltmain.sh glib-2.14.4/ltmain.sh
+--- glib-2.14.4.orig/ltmain.sh 2007-08-29 07:52:51.000000000 -0400
++++ glib-2.14.4/ltmain.sh      2007-11-24 18:33:59.000000000 -0500
+@@ -5759,10 +5759,6 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -212,9 +212,9 @@
        done
        fi
  
-diff -uNr glib-2.14.1/po/Makefile.in.in glib-2.14.1-new/po/Makefile.in.in
---- glib-2.14.1/po/Makefile.in.in      2007-09-16 12:28:34.000000000 -0400
-+++ glib-2.14.1-new/po/Makefile.in.in  2007-09-17 21:37:52.000000000 -0400
+diff -Nurd -x'*~' glib-2.14.4.orig/po/Makefile.in.in 
glib-2.14.4/po/Makefile.in.in
+--- glib-2.14.4.orig/po/Makefile.in.in 2007-11-24 01:41:02.000000000 -0500
++++ glib-2.14.4/po/Makefile.in.in      2007-11-24 18:33:59.000000000 -0500
 @@ -28,7 +28,7 @@
  datarootdir = @datarootdir@
  datadir = @datadir@
@@ -224,10 +224,10 @@
  gnulocaledir = $(datadir)/locale
  gettextsrcdir = $(datadir)/glib-2.0/gettext/po
  subdir = po
-diff -uNr glib-2.14.1/tests/Makefile.in glib-2.14.1-new/tests/Makefile.in
---- glib-2.14.1/tests/Makefile.in      2007-09-16 12:29:42.000000000 -0400
-+++ glib-2.14.1-new/tests/Makefile.in  2007-09-17 21:37:52.000000000 -0400
-@@ -329,7 +329,6 @@
+diff -Nurd -x'*~' glib-2.14.4.orig/tests/Makefile.in 
glib-2.14.4/tests/Makefile.in
+--- glib-2.14.4.orig/tests/Makefile.in 2007-11-24 01:41:57.000000000 -0500
++++ glib-2.14.4/tests/Makefile.in      2007-11-24 18:33:59.000000000 -0500
+@@ -330,7 +330,6 @@
        module-test                             \
        node-test                               \
        onceinit                                \
@@ -235,7 +235,7 @@
        patterntest                             \
        printf-test                             \
        queue-test                              \
-@@ -362,7 +361,7 @@
+@@ -363,7 +362,7 @@
        regex-test
  
  
@@ -244,9 +244,9 @@
  
  test_script_support_programs = markup-test unicode-collate bookmarkfile-test
  
-diff -uNr glib-2.14.1/tests/array-test.c glib-2.14.1-new/tests/array-test.c
---- glib-2.14.1/tests/array-test.c     2007-09-16 12:28:30.000000000 -0400
-+++ glib-2.14.1-new/tests/array-test.c 2007-09-17 21:37:52.000000000 -0400
+diff -Nurd -x'*~' glib-2.14.4.orig/tests/array-test.c 
glib-2.14.4/tests/array-test.c
+--- glib-2.14.4.orig/tests/array-test.c        2007-11-24 01:40:54.000000000 
-0500
++++ glib-2.14.4/tests/array-test.c     2007-11-24 18:33:59.000000000 -0500
 @@ -92,10 +92,14 @@
  
    for (i = 0; i < 10000; i++)
@@ -266,9 +266,9 @@
      }
  
    g_byte_array_free (gbarray, TRUE);
-diff -uNr glib-2.14.1/tests/child-test.c glib-2.14.1-new/tests/child-test.c
---- glib-2.14.1/tests/child-test.c     2007-09-16 12:28:30.000000000 -0400
-+++ glib-2.14.1-new/tests/child-test.c 2007-09-17 21:37:52.000000000 -0400
+diff -Nurd -x'*~' glib-2.14.4.orig/tests/child-test.c 
glib-2.14.4/tests/child-test.c
+--- glib-2.14.4.orig/tests/child-test.c        2007-11-24 01:40:54.000000000 
-0500
++++ glib-2.14.4/tests/child-test.c     2007-11-24 18:33:59.000000000 -0500
 @@ -175,7 +175,7 @@
  #ifdef G_OS_WIN32
    system ("ipconfig /all");


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to