Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7293/10.3/unstable/main/finkinfo/gnome
Modified Files:
glib2.patch
Log Message:
Clean-ups for this version in preparation for 2.7/8
Index: glib2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- glib2.patch 19 Jun 2005 20:54:48 -0000 1.11
+++ glib2.patch 13 Jul 2005 02:12:40 -0000 1.12
@@ -1,7 +1,7 @@
-diff -uNr glib-2.6.4/configure glib-2.6.4-new/configure
---- glib-2.6.4/configure 2004-08-13 08:53:23.000000000 -0500
-+++ glib-2.6.4-new/configure 2004-11-03 08:47:15.000000000 -0600
-@@ -31133,10 +31133,11 @@
+diff -Nurd -x'*~' glib-2.6.5.orig/configure glib-2.6.5/configure
+--- glib-2.6.5.orig/configure 2005-06-10 12:18:48.000000000 -0400
++++ glib-2.6.5/configure 2005-07-12 22:00:59.000000000 -0400
+@@ -31639,10 +31639,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
-@@ -32504,9 +32505,9 @@
+@@ -33010,9 +33011,9 @@
# skip cygwin -pthread or -pthreads test
;;
*)
@@ -28,7 +28,7 @@
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -32595,8 +32596,8 @@
+@@ -33101,8 +33102,8 @@
fi
CFLAGS="$glib_save_CFLAGS"
if test $glib_flag_works = yes ; then
@@ -39,7 +39,7 @@
fi
done
;;
-@@ -32626,6 +32627,9 @@
+@@ -33132,6 +33133,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
@@ -49,7 +49,7 @@
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
-@@ -38859,9 +38863,10 @@
+@@ -39365,9 +39369,10 @@
#define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
"
@@ -61,7 +61,7 @@
*) glib_vacopy=''
esac
-@@ -40144,8 +40149,11 @@
+@@ -40651,8 +40656,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.
@@ -74,9 +74,9 @@
# undef G_HAVE_ISO_VARARGS
#endif
-diff -uNr glib-2.6.4/glib/gspawn.c glib-2.6.4-new/glib/gspawn.c
---- glib-2.6.4/glib/gspawn.c 2004-03-14 12:26:47.000000000 -0600
-+++ glib-2.6.4-new/glib/gspawn.c 2004-11-03 08:47:33.000000000 -0600
+diff -Nurd -x'*~' glib-2.6.5.orig/glib/gspawn.c glib-2.6.5/glib/gspawn.c
+--- glib-2.6.5.orig/glib/gspawn.c 2005-05-20 15:24:21.000000000 -0400
++++ glib-2.6.5/glib/gspawn.c 2005-07-12 22:00:59.000000000 -0400
@@ -143,6 +143,8 @@
return ret;
}
@@ -86,9 +86,9 @@
typedef enum
{
READ_FAILED = 0, /* FALSE */
-diff -uNr glib-2.6.4/glib/libcharset/Makefile.in
glib-2.6.4-new/glib/libcharset/Makefile.in
---- glib-2.6.4/glib/libcharset/Makefile.in 2004-08-13 08:53:15.000000000
-0500
-+++ glib-2.6.4-new/glib/libcharset/Makefile.in 2004-11-03 08:47:15.000000000
-0600
+diff -Nurd -x'*~' glib-2.6.5.orig/glib/libcharset/Makefile.in
glib-2.6.5/glib/libcharset/Makefile.in
+--- glib-2.6.5.orig/glib/libcharset/Makefile.in 2005-06-10
12:18:45.000000000 -0400
++++ glib-2.6.5/glib/libcharset/Makefile.in 2005-07-12 22:00:59.000000000
-0400
@@ -240,7 +240,7 @@
target_alias = @target_alias@
@@ -118,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.6.4/glib/libcharset/charset.alias
glib-2.6.4-new/glib/libcharset/charset.alias
---- glib-2.6.4/glib/libcharset/charset.alias 1969-12-31 18:00:00.000000000
-0600
-+++ glib-2.6.4-new/glib/libcharset/charset.alias 2004-11-03
08:47:15.000000000 -0600
+diff -Nurd -x'*~' glib-2.6.5.orig/glib/libcharset/charset.alias
glib-2.6.5/glib/libcharset/charset.alias
+--- glib-2.6.5.orig/glib/libcharset/charset.alias 1969-12-31
19:00:00.000000000 -0500
++++ glib-2.6.5/glib/libcharset/charset.alias 2005-07-12 22:00:59.000000000
-0400
@@ -0,0 +1,111 @@
+# This file contains a table of character encoding aliases,
+# suitable for operating system 'darwin'.
@@ -233,10 +233,10 @@
+zh_CN.EUC GB2312
+zh_TW UTF-8
+zh_TW.Big5 BIG5
-diff -uNr glib-2.6.4/ltmain.sh glib-2.6.4-new/ltmain.sh
---- glib-2.6.4/ltmain.sh 2004-04-08 08:34:47.000000000 -0500
-+++ glib-2.6.4-new/ltmain.sh 2004-11-03 08:47:15.000000000 -0600
-@@ -5266,10 +5266,10 @@
+diff -Nurd -x'*~' glib-2.6.5.orig/ltmain.sh glib-2.6.5/ltmain.sh
+--- glib-2.6.5.orig/ltmain.sh 2005-05-17 00:29:31.000000000 -0400
++++ glib-2.6.5/ltmain.sh 2005-07-12 22:00:59.000000000 -0400
+@@ -5341,10 +5341,10 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -251,9 +251,9 @@
done
fi
-diff -uNr glib-2.6.4/po/Makefile.in.in glib-2.6.4-new/po/Makefile.in.in
---- glib-2.6.4/po/Makefile.in.in 2003-03-04 04:10:46.000000000 -0600
-+++ glib-2.6.4-new/po/Makefile.in.in 2004-11-03 08:47:15.000000000 -0600
+diff -Nurd -x'*~' glib-2.6.5.orig/po/Makefile.in.in
glib-2.6.5/po/Makefile.in.in
+--- glib-2.6.5.orig/po/Makefile.in.in 2003-03-04 05:10:46.000000000 -0500
++++ glib-2.6.5/po/Makefile.in.in 2005-07-12 22:00:59.000000000 -0400
@@ -27,7 +27,7 @@
exec_prefix = @exec_prefix@
datadir = @datadir@
@@ -263,20 +263,9 @@
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
-diff -uNr glib-2.6.4/tests/child-test.c glib-2.6.4-new/tests/child-test.c
---- glib-2.6.4/tests/child-test.c 2004-10-25 18:08:37.000000000 -0400
-+++ glib-2.6.4-new/tests/child-test.c 2005-06-04 04:17:28.000000000 -0400
-@@ -160,7 +160,7 @@
- #ifdef G_OS_WIN32
- system ("ipconfig /all");
- #else
-- system ("/bin/true");
-+ system ("/usr/bin/true");
- #endif
-
- alive = 2;
---- glib-2.6.4/tests/array-test.c 2004-12-25 20:04:01.000000000 -0400
-+++ glib-2.6.4-new/tests/array-test.c 2005-06-06 14:55:18.000000000 -0400
+diff -Nurd -x'*~' glib-2.6.5.orig/tests/array-test.c
glib-2.6.5/tests/array-test.c
+--- glib-2.6.5.orig/tests/array-test.c 2003-12-25 20:04:01.000000000 -0500
++++ glib-2.6.5/tests/array-test.c 2005-07-12 22:00:59.000000000 -0400
@@ -116,10 +116,14 @@
for (i = 0; i < 10000; i++)
@@ -296,3 +285,15 @@
}
g_byte_array_free (gbarray, TRUE);
+diff -Nurd -x'*~' glib-2.6.5.orig/tests/child-test.c
glib-2.6.5/tests/child-test.c
+--- glib-2.6.5.orig/tests/child-test.c 2004-10-25 18:08:37.000000000 -0400
++++ glib-2.6.5/tests/child-test.c 2005-07-12 22:00:59.000000000 -0400
+@@ -160,7 +160,7 @@
+ #ifdef G_OS_WIN32
+ system ("ipconfig /all");
+ #else
+- system ("/bin/true");
++ system ("/usr/bin/true");
+ #endif
+
+ alive = 2;
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
