Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20602/10.3/stable/main/finkinfo/gnome
Modified Files:
glib2.info glib2.patch
Log Message:
to stable
Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- glib2.info 1 Feb 2006 17:48:31 -0000 1.8
+++ glib2.info 17 Aug 2006 15:37:38 -0000 1.9
@@ -1,13 +1,15 @@
Package: glib2
-Version: 2.4.6
-Revision: 7
+Version: 2.12.0
+
+### This .info has OS-specific features...don't blindly copy 10.3<->10.4!
+Revision: 2
+
Depends: %N-shlibs (>= %v-%r)
-BuildDepends: pkgconfig (>= 0.15.0-2), gettext-dev, gettext-bin,
gettext-tools, libiconv-dev
-DescPackaging: Uses pkgconfig, but there are no pkgconfig-related dependencies.
+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.4/glib-%v.tar.bz2
-Source-MD5: a45db7d82480da431f6cd00ea041a534
+Source: mirror:gnome:sources/glib/2.12/glib-%v.tar.bz2
+Source-MD5: ea8c7733ba443e3db04cf7a84060f408
Patch: %n.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -15,34 +17,137 @@
SetCPPFLAGS: -no-cpp-precomp -isystem %p/include
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBRARY_PATH: %p/lib
-ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
-CompileScript: PERL=/usr/bin/perl PERL_PATH=/usr/bin/perl ./configure %c; make
-j2
-InstallScript: make install DESTDIR=%d
+ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
--disable-dependency-tracking --enable-static
+CompileScript: <<
+ PERL_PATH=/usr/bin/perl PERL=/usr/bin/perl ./configure %c
+ make -j2
+# LANG=C make check
+<<
+InstallScript: <<
+ make install DESTDIR=%d
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+<<
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 232.0.0 %n (>= 2.4.0-1)
- %p/lib/libgmodule-2.0.0.dylib 232.0.0 %n (>= 2.4.0-1)
- %p/lib/libgobject-2.0.0.dylib 232.0.0 %n (>= 2.4.0-1)
- %p/lib/libgthread-2.0.0.dylib 232.0.0 %n (>= 2.4.0-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 (>= %v-%r)
+ Depends: %N-shlibs (= %v-%r)
+ DescPackaging: <<
+ Provides a .pc so other pkgs can use pkgconfig to compile against us
+ <<
Replaces: %N (<< 2.4.0-1)
BuildDependsOnly: True
- Files: bin include lib/glib-2.0 lib/lib*-2.0.* lib/pkgconfig share/aclocal
share/glib-2.0 share/gtk-doc share/man
- DocFiles: AUTHORS COPYING ChangeLog NEWS README
+ Files: <<
+ bin
+ include
+ lib/glib-2.0
+ 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
+ share/aclocal
+ share/glib-2.0
+ share/gtk-doc
+ share/man
+ <<
+ 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.
+ glib2 provides etc/glib-2.0/charset.alias for darwin because there's
+ no system-wide charset.alias.
+ 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.
+ (See #fink 2004-nov-03)
+
+ 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
+
+ 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
+
+ We need to set LANG=C when doing 'make check', else a previously
+ installed glib2 will trigger a crash caused by a bug in the old
+ de.po. See http://bugzilla.gnome.org/show_bug.cgi?id=310731
+ Need to figure out how to patch tests/Makefile to use the nascent
+ gettext dictionaries in preference to installed ones.
+<<
+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).
+
+ 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.3/stable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glib2.patch 24 Mar 2005 14:01:11 -0000 1.4
+++ glib2.patch 17 Aug 2006 15:37:38 -0000 1.5
@@ -1,19 +1,7 @@
-diff -uNr glib-2.4.6/Makefile.in glib-2.4.6-new/Makefile.in
---- glib-2.4.6/Makefile.in 2004-08-13 08:53:11.000000000 -0500
-+++ glib-2.4.6-new/Makefile.in 2004-11-03 08:47:15.000000000 -0600
-@@ -226,7 +226,7 @@
-
- AUTOMAKE_OPTIONS = 1.7
-
--SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
-
- bin_SCRIPTS = glib-gettextize
-
-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 -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
@@ -28,30 +16,7 @@
fi
fi
-@@ -31724,9 +31725,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
-
-@@ -31815,8 +31816,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
- ;;
-@@ -31846,6 +31847,9 @@
+@@ -33544,6 +33545,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
@@ -61,7 +26,7 @@
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
-@@ -38059,9 +38063,10 @@
+@@ -39417,9 +39421,10 @@
#define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
"
@@ -73,7 +38,7 @@
*) glib_vacopy=''
esac
-@@ -39311,8 +39316,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.
@@ -86,10 +51,29 @@
# 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 -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;
}
@@ -98,10 +82,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 -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 = \
@@ -110,7 +94,7 @@
noinst_LTLIBRARIES = libcharset.la
-@@ -246,8 +246,8 @@
+@@ -258,8 +258,8 @@
make-patch.sh
@@ -121,7 +105,7 @@
SUFFIXES = .sed .sin
-@@ -528,7 +528,7 @@
+@@ -540,7 +540,7 @@
uninstall-am uninstall-info-am uninstall-local
install-exec-local: all-local
@@ -130,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 -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 -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'.
@@ -245,10 +229,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 -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'"
@@ -256,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 -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 -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@
@@ -275,3 +255,57 @@
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 \
+ 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++)
+ {
+- g_assert (gbarray->data[4*i] == 'a');
+- g_assert (gbarray->data[4*i+1] == 'b');
+- g_assert (gbarray->data[4*i+2] == 'c');
+- g_assert (gbarray->data[4*i+3] == 'd');
++ int idx = 4*i;
++ g_assert (gbarray->data[idx] == 'a');
++ idx++;
++ g_assert (gbarray->data[idx] == 'b');
++ idx++;
++ g_assert (gbarray->data[idx] == 'c');
++ idx++;
++ g_assert (gbarray->data[idx] == 'd');
+ }
+
+ 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 @@
+ #ifdef G_OS_WIN32
+ system ("ipconfig /all");
+ #else
+- system ("/bin/true");
++ system ("/usr/bin/true");
+ #endif
+
+ alive = 2;
-------------------------------------------------------------------------
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
