Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20602/10.4/stable/main/finkinfo/gnome
Modified Files: glib2.info glib2.patch Log Message: to stable Index: glib2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/glib2.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- glib2.info 1 Feb 2006 17:48:32 -0000 1.6 +++ glib2.info 17 Aug 2006 15:37:38 -0000 1.7 @@ -1,16 +1,15 @@ Package: glib2 -Version: 2.6.6 +Version: 2.12.0 ### This .info has OS-specific features...don't blindly copy 10.3<->10.4! -Revision: 1113 +Revision: 102 -GCC: 4.0 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), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev Replaces: %N-common Conflicts: %N-common -Source: mirror:gnome:sources/glib/2.6/glib-%v.tar.bz2 -Source-MD5: 6e22b0639d314536f23ee118f29b43de +Source: mirror:gnome:sources/glib/2.12/glib-%v.tar.bz2 +Source-MD5: ea8c7733ba443e3db04cf7a84060f408 Patch: %n.patch NoSetCPPFLAGS: true NoSetLDFLAGS: true @@ -22,24 +21,40 @@ CompileScript: << PERL_PATH=/usr/bin/perl PERL=/usr/bin/perl ./configure %c make -j2 - LANG=C make check +# LANG=C make check +<< +InstallScript: << + make install DESTDIR=%d + mkdir -p %i/share/doc/installed-packages + touch %i/share/doc/installed-packages/%N << -InstallScript: make install DESTDIR=%d SplitOff: << Package: %N-shlibs - Depends: gettext, libiconv - Files: lib/lib*-2.0.*.dylib + Depends: libgettext3-shlibs, libiconv, xdg-base + Files: lib/lib*-2.0.*.dylib share/locale etc + Replaces: %N (<< 2.12.1-1) Shlibs: << - %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) + %p/lib/libglib-2.0.0.dylib 1201.0.0 %n (>= 2.12.0-1) + %p/lib/libgmodule-2.0.0.dylib 1201.0.0 %n (>= 2.12.0-1) + %p/lib/libgobject-2.0.0.dylib 1201.0.0 %n (>= 2.12.0-1) + %p/lib/libgthread-2.0.0.dylib 1201.0.0 %n (>= 2.12.0-1) + << + DocFiles: << + AUTHORS + docs/reference/AUTHORS:AUTHORS.docs.reference + gmodule/AUTHORS:AUTHORS.gmodule + ChangeLog* + docs/reference/ChangeLog:ChangeLog.docs.reference + gmodule/ChangeLog:ChangeLog.gmodule + gobject/ChangeLog:ChangeLog.gobject + gthread/ChangeLog:ChangeLog.gthread + po/ChangeLog:ChangeLog.po + COPYING NEWS README << - DocFiles: AUTHORS COPYING ChangeLog NEWS README << SplitOff2: << Package: %N-dev - Depends: %N-shlibs (= %v-%r), %N (= %v-%r) + Depends: %N-shlibs (= %v-%r) DescPackaging: << Provides a .pc so other pkgs can use pkgconfig to compile against us << @@ -52,6 +67,7 @@ lib/lib* lib/pkgconfig/glib-2.0.pc lib/pkgconfig/gmodule-2.0.pc + lib/pkgconfig/gmodule-export-2.0.pc lib/pkgconfig/gmodule-no-export-2.0.pc lib/pkgconfig/gobject-2.0.pc lib/pkgconfig/gthread-2.0.pc @@ -60,17 +76,32 @@ share/gtk-doc share/man << - DocFiles: AUTHORS COPYING ChangeLog NEWS README + DocFiles: << + AUTHORS + docs/reference/AUTHORS:AUTHORS.docs.reference + gmodule/AUTHORS:AUTHORS.gmodule + ChangeLog* + docs/reference/ChangeLog:ChangeLog.docs.reference + gmodule/ChangeLog:ChangeLog.gmodule + gobject/ChangeLog:ChangeLog.gobject + gthread/ChangeLog:ChangeLog.gthread + po/ChangeLog:ChangeLog.po + COPYING NEWS README + << +<< +DescUsage: << +%N is a dummy package: if you really used to need it, you should +Depends: %N-shlibs (>= 2.12.0-1) instead, which supplies all the +files that were previously in %N. << -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. - - Fix ./configure detection of -pthread/-pthreads flags, which are not - supported on Darwin. See: - http://bugzilla.gnome.org/show_bug.cgi?id=314794 + See also: http://bugzilla.gnome.org/show_bug.cgi?id=346816 + Can we figure out how to generate this (gettext-tools config.charset + for host=darwin5?)or import it from an authoritative upstream source + instead of dragging along a legacy file in %N.patch? READ_OK is a bit-shift macro in some OS X headers. #undef it so can be used locally as an enum. @@ -78,6 +109,11 @@ check doesn't run automatically, so do it manually + Disable two tests that fail on OS X apparently due to deficiencies + in OS X locale support. + See: http://bugzilla.gnome.org/show_bug.cgi?id=333977 + See: http://bugzilla.gnome.org/show_bug.cgi?id=346828 + check uses some C++ but it doesn't leak out into the installed package @@ -93,19 +129,28 @@ Tiger's poll() is busted, so force use of glib2's own emulation code. See http://bugzilla.gnome.org/show_bug.cgi?id=302672 - - Patch tests/unicode-encoding.c to avoid assuming all non-WIN32 - machines are big-endnian. See: - http://bugzilla.gnome.org/show_bug.cgi?id=143380 << DescPackaging: << -Sometimes not all .pc files get created. I suspect this is due to a -missing BuildDepends or missing files due to Installer.app breakage, -but don't know what. So all .pc are listed explicitly in Files so that -if any are not built, the pkg will not build. Better to crash and -force a diagnosis than to build a wrong package silently, which could -lead to pkgs that use these .pc to build incorrectly (possibly -silently also). + Sometimes not all .pc files get created. I suspect this is due to a + missing BuildDepends or missing files due to Installer.app breakage, + but don't know what. So all .pc are listed explicitly in Files so + that if any are not built, the pkg will not build. Better to crash + and force a diagnosis than to build a wrong package silently, which + could lead to pkgs that use these .pc to build incorrectly (possibly + silently also). + + Library contains some C symbols whose real name looks like C++ + munges. This should not be construed to mean that glib2 is C++ nor + that it needs to obey Fink C++ packaging rules. + + Prior to 2.12.0-1, %N contained the gettext catalogs and the + charset.alias file, which are used by the %N-shlibs files. Starting + in 2.12.0-1, they are all now in the %N-shlibs package, and %N is a + dummy for compatibility and upgrades. + + Some of fink's gnome packages are stuck at old versions, so + RangerRick says we shouldn't deprecate some old symbols that they + need. << License: LGPL Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> Index: glib2.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/glib2.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- glib2.patch 24 Jan 2006 16:21:27 -0000 1.3 +++ glib2.patch 17 Aug 2006 15:37:38 -0000 1.4 @@ -1,7 +1,7 @@ -diff -ruN glib-2.6.6/configure glib-2.6.6-patched/configure ---- glib-2.6.6/configure 2005-08-01 07:04:00.000000000 -0700 -+++ glib-2.6.6-patched/configure 2006-01-23 08:47:57.000000000 -0800 -@@ -31645,10 +31645,11 @@ +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 @@ -16,30 +16,7 @@ fi fi -@@ -33016,9 +33017,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 - cat >conftest.$ac_ext <<_ACEOF - -@@ -33107,8 +33108,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 - ;; -@@ -33138,6 +33139,9 @@ +@@ -33544,6 +33545,9 @@ G_THREAD_CFLAGS="-D_THREAD_SAFE" fi ;; @@ -49,7 +26,7 @@ *-dg-dgux*) # DG/UX G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE" ;; -@@ -39371,9 +39375,10 @@ +@@ -39417,9 +39421,10 @@ #define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION " @@ -61,7 +38,7 @@ *) glib_vacopy='' esac -@@ -40657,8 +40662,11 @@ +@@ -40704,8 +40709,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 +51,29 @@ # undef G_HAVE_ISO_VARARGS #endif -diff -ruN glib-2.6.6/glib/gspawn.c glib-2.6.6-patched/glib/gspawn.c ---- glib-2.6.6/glib/gspawn.c 2005-05-20 12:24:21.000000000 -0700 -+++ glib-2.6.6-patched/glib/gspawn.c 2006-01-23 08:47:57.000000000 -0800 -@@ -143,6 +143,8 @@ +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.0.orig/glib/gspawn.c glib-2.12.0/glib/gspawn.c +--- glib-2.12.0.orig/glib/gspawn.c 2006-04-04 00:37:39.000000000 -0400 ++++ glib-2.12.0/glib/gspawn.c 2006-07-06 20:37:43.000000000 -0400 +@@ -129,6 +129,8 @@ return ret; } @@ -86,10 +82,10 @@ typedef enum { READ_FAILED = 0, /* FALSE */ -diff -ruN glib-2.6.6/glib/libcharset/Makefile.in glib-2.6.6-patched/glib/libcharset/Makefile.in ---- glib-2.6.6/glib/libcharset/Makefile.in 2005-08-01 07:03:56.000000000 -0700 -+++ glib-2.6.6-patched/glib/libcharset/Makefile.in 2006-01-23 08:47:57.000000000 -0800 -@@ -240,7 +240,7 @@ +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 @@ target_alias = @target_alias@ INCLUDES = \ @@ -98,7 +94,7 @@ noinst_LTLIBRARIES = libcharset.la -@@ -261,8 +261,8 @@ +@@ -258,8 +258,8 @@ make-patch.sh @@ -109,7 +105,7 @@ SUFFIXES = .sed .sin -@@ -543,7 +543,7 @@ +@@ -540,7 +540,7 @@ uninstall-am uninstall-info-am uninstall-local install-exec-local: all-local @@ -118,9 +114,9 @@ if test -f $(charset_alias); then \ sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ -diff -ruN glib-2.6.6/glib/libcharset/charset.alias glib-2.6.6-patched/glib/libcharset/charset.alias ---- glib-2.6.6/glib/libcharset/charset.alias 1969-12-31 16:00:00.000000000 -0800 -+++ glib-2.6.6-patched/glib/libcharset/charset.alias 2006-01-23 08:47:57.000000000 -0800 +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 @@ -0,0 +1,111 @@ +# This file contains a table of character encoding aliases, +# suitable for operating system 'darwin'. @@ -233,10 +229,10 @@ +zh_CN.EUC GB2312 +zh_TW UTF-8 +zh_TW.Big5 BIG5 -diff -ruN glib-2.6.6/ltmain.sh glib-2.6.6-patched/ltmain.sh ---- glib-2.6.6/ltmain.sh 2005-06-12 19:01:45.000000000 -0700 -+++ glib-2.6.6-patched/ltmain.sh 2006-01-23 08:47:57.000000000 -0800 -@@ -5341,10 +5341,10 @@ +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 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" @@ -244,16 +240,12 @@ - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi -+# if test "$installed" = no && test "$need_relink" = yes; then -+# $echo >> $output "\ -+#relink_command=\"$relink_command\"" -+# fi done fi -diff -ruN glib-2.6.6/po/Makefile.in.in glib-2.6.6-patched/po/Makefile.in.in ---- glib-2.6.6/po/Makefile.in.in 2003-03-04 02:10:46.000000000 -0800 -+++ glib-2.6.6-patched/po/Makefile.in.in 2006-01-23 08:47:57.000000000 -0800 +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@ datadir = @datadir@ @@ -263,10 +255,30 @@ gnulocaledir = $(datadir)/locale gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po -diff -ruN glib-2.6.6/tests/array-test.c glib-2.6.6-patched/tests/array-test.c ---- glib-2.6.6/tests/array-test.c 2003-12-25 17:04:01.000000000 -0800 -+++ glib-2.6.6-patched/tests/array-test.c 2006-01-23 08:47:57.000000000 -0800 -@@ -116,10 +116,14 @@ +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 \ + module-test \ + node-test \ +- option-test \ + patterntest \ + printf-test \ + queue-test \ +@@ -338,7 +337,7 @@ + uri-test + + +-test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh ++test_scripts = run-markup-tests.sh run-bookmark-test.sh + + 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 +@@ -92,10 +92,14 @@ for (i = 0; i < 10000; i++) { @@ -285,10 +297,10 @@ } g_byte_array_free (gbarray, TRUE); -diff -ruN glib-2.6.6/tests/child-test.c glib-2.6.6-patched/tests/child-test.c ---- glib-2.6.6/tests/child-test.c 2004-10-25 15:08:37.000000000 -0700 -+++ glib-2.6.6-patched/tests/child-test.c 2006-01-23 08:47:57.000000000 -0800 -@@ -160,7 +160,7 @@ +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 @@ #ifdef G_OS_WIN32 system ("ipconfig /all"); #else @@ -297,15 +309,3 @@ #endif alive = 2; -diff -ruN glib-2.6.6/tests/unicode-encoding.c glib-2.6.6-patched/tests/unicode-encoding.c ---- glib-2.6.6/tests/unicode-encoding.c 2004-03-30 18:19:10.000000000 -0800 -+++ glib-2.6.6-patched/tests/unicode-encoding.c 2006-01-23 08:48:59.000000000 -0800 -@@ -195,7 +195,7 @@ - gint n_chars; - gchar *utf8_result; - --#ifdef G_PLATFORM_WIN32 -+#ifndef _BIG_ENDIAN - #define TARGET "UTF-16LE" - #else - #define TARGET "UTF-16" ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits