Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12506
Modified Files:
glib2.info glib2.patch
Log Message:
New version.
Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- glib2.info 4 Jun 2005 08:55:37 -0000 1.10
+++ glib2.info 5 Jun 2005 23:29:58 -0000 1.11
@@ -1,6 +1,6 @@
Package: glib2
-Version: 2.4.6
-Revision: 7
+Version: 2.6.4
+Revision: 1
Depends: %N-shlibs (>= %v-%r)
BuildDepends: pkgconfig (>= 0.15.0-2), gettext-dev, gettext-bin,
gettext-tools, libiconv-dev
DescPackaging: <<
@@ -8,8 +8,8 @@
<<
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.6/glib-%v.tar.bz2
+Source-MD5: af7eeb8aae764ff763418471ed6eb93d
Patch: %n.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -18,17 +18,21 @@
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBRARY_PATH: %p/lib
ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
--disable-dependency-tracking
-CompileScript: ./configure %c; make -j2; make check
+CompileScript: <<
+ ./configure %c
+ make -j2
+ make check
+<<
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
Depends: gettext, libiconv
Files: lib/lib*-2.0.*.dylib
Shlibs: <<
- %p/lib/libglib-2.0.0.dylib 401.0.0 %n (>= 2.4.6-7)
- %p/lib/libgmodule-2.0.0.dylib 401.0.0 %n (>= 2.4.6-7)
- %p/lib/libgobject-2.0.0.dylib 401.0.0 %n (>= 2.4.6-7)
- %p/lib/libgthread-2.0.0.dylib 401.0.0 %n (>= 2.4.6-7)
+ %p/lib/libglib-2.0.0.dylib 601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgmodule-2.0.0.dylib 601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgobject-2.0.0.dylib 601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgthread-2.0.0.dylib 601.0.0 %n (>= 2.6.4-1)
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
<<
@@ -50,6 +54,10 @@
check uses some C++ but it doesn't leak out into the installed
package
+
+ Patch array-test.c to avoid triggering bug in Apple's gcc3.3
+ (claimed to be fixed in gcc4.0 and wontfix in gcc3.3). See
+ http://bugzilla.gnome.org/show_bug.cgi?id=173127
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: glib2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- glib2.patch 4 Jun 2005 23:31:52 -0000 1.7
+++ glib2.patch 5 Jun 2005 23:29:59 -0000 1.8
@@ -1,7 +1,7 @@
-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 -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 @@
echo "$as_me:$LINENO: result: $glib_cv___va_copy" >&5
echo "${ECHO_T}$glib_cv___va_copy" >&6
@@ -16,7 +16,7 @@
fi
fi
-@@ -31724,9 +31725,9 @@
+@@ -32504,9 +32505,9 @@
# skip cygwin -pthread or -pthreads test
;;
*)
@@ -28,7 +28,7 @@
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -31815,8 +31816,8 @@
+@@ -32595,8 +32596,8 @@
fi
CFLAGS="$glib_save_CFLAGS"
if test $glib_flag_works = yes ; then
@@ -39,7 +39,7 @@
fi
done
;;
-@@ -31846,6 +31847,9 @@
+@@ -32626,6 +32627,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"
;;
-@@ -38059,9 +38063,10 @@
+@@ -38859,9 +38863,10 @@
#define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
"
@@ -61,7 +61,7 @@
*) glib_vacopy=''
esac
-@@ -39311,8 +39316,11 @@
+@@ -40144,8 +40149,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,10 +74,10 @@
# 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 @@
+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
+@@ -143,6 +143,8 @@
return ret;
}
@@ -86,10 +86,10 @@
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 @@
+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
+@@ -240,7 +240,7 @@
target_alias = @target_alias@
INCLUDES = \
@@ -98,7 +98,7 @@
noinst_LTLIBRARIES = libcharset.la
-@@ -246,8 +246,8 @@
+@@ -261,8 +261,8 @@
make-patch.sh
@@ -109,7 +109,7 @@
SUFFIXES = .sed .sin
-@@ -528,7 +528,7 @@
+@@ -543,7 +543,7 @@
uninstall-am uninstall-info-am uninstall-local
install-exec-local: all-local
@@ -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.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 -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
@@ -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.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 -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 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -251,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 -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
@@ -27,7 +27,7 @@
exec_prefix = @exec_prefix@
datadir = @datadir@
@@ -263,9 +263,9 @@
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
-diff -uNr glib-2.4.67/tests/child-test.c glib-2.4.6-new/tests/child-test.c
---- glib-2.4.6/tests/child-test.c 2004-03-08 19:12:36.000000000 -0400
-+++ glib-2.4.6-new/tests/child-test.c 2005-06-04 04:17:28.000000000 -0400
+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");
@@ -275,3 +275,13 @@
#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-05 16:27:23.000000000 -0400
+@@ -116,6 +116,7 @@
+
+ for (i = 0; i < 10000; i++)
+ {
++ printf("");
+ g_assert (gbarray->data[4*i] == 'a');
+ g_assert (gbarray->data[4*i+1] == 'b');
+ g_assert (gbarray->data[4*i+2] == 'c');
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
