Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15668/common/main/finkinfo/gnome
Added Files:
glib2.info glib2.patch
Log Message:
glib2 in my regular tree so I can generate different for 10.3
--- NEW FILE: glib2.info ---
Package: glib2
Version: 2.10.2
### This .info has OS-specific features...don't blindly copy 10.3<->10.4!
### drm says to eave space for an intermediate %r using gettext for stable
Revision: 0
Depends: %N-shlibs (>= %v-%r)
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.10/glib-%v.tar.bz2
Source-MD5: 718961161ee1692c216a2d542196a04a
Patch: %n.patch
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -no-cpp-precomp -isystem %p/include -D_POLL_EMUL_H_
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
SetLIBRARY_PATH: %p/lib
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
SplitOff: <<
Package: %N-shlibs
Depends: libgettext3-shlibs, libiconv, xdg-base
Files: lib/lib*-2.0.*.dylib
Shlibs: <<
%p/lib/libglib-2.0.0.dylib 801.0.0 %n (>= 2.8.0-1)
%p/lib/libgmodule-2.0.0.dylib 801.0.0 %n (>= 2.8.0-1)
%p/lib/libgobject-2.0.0.dylib 801.0.0 %n (>= 2.8.0-1)
%p/lib/libgthread-2.0.0.dylib 801.0.0 %n (>= 2.8.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
<<
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r), %N (= %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*
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
<<
<<
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
<<
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
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
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.
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).
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gtk.org
--- NEW FILE: glib2.patch ---
diff -uNr glib-2.10.2/configure glib-2.10.2-new/configure
--- glib-2.10.2/configure 2006-04-07 08:35:35.000000000 -0400
+++ glib-2.10.2-new/configure 2006-04-21 15:09:15.000000000 -0400
@@ -33060,10 +33060,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
-else if test "x$glib_cv___va_copy" = "xyes"; then
+# Prefer __va_copy, available on both gcc2 and gcc3.
+if test "x$glib_cv___va_copy" = "xyes"; then
g_va_copy_func=__va_copy
+else if test "x$glib_cv_va_copy" = "xyes"; then
+ g_va_copy_func=va_copy
fi
fi
@@ -34364,9 +34365,9 @@
# skip cygwin and darwin -pthread or -pthreads test
;;
*)
- for flag in pthread pthreads mt; do
+ for flag in '-pthread' '-pthreads' '-mt' ''; do
glib_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -$flag"
+ CFLAGS="$CFLAGS $flag"
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
@@ -34455,8 +34456,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
;;
@@ -34486,6 +34487,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
+ *-darwin*)
+ # Nothing needed.
+ ;;
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
@@ -40359,9 +40363,10 @@
#define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION
"
+# Prefer __va_copy, available on both gcc2 and gcc3.
case xyes in
-x$glib_cv_va_copy) glib_vacopy='#define G_VA_COPY va_copy' ;;
x$glib_cv___va_copy) glib_vacopy='#define G_VA_COPY __va_copy' ;;
+x$glib_cv_va_copy) glib_vacopy='#define G_VA_COPY va_copy' ;;
*) glib_vacopy=''
esac
@@ -41646,8 +41651,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.
+ *
+ * On darwin, use gcc macro to avoid incompatibility between gcc2
+ * and gcc3.
*/
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
+#if (__GNUC__ == 2 && __GNUC_MINOR__ == 95) || defined (__APPLE__)
# undef G_HAVE_ISO_VARARGS
#endif
diff -uNr glib-2.10.2/glib/gmem.h glib-2.10.2-new/glib/gmem.h
--- glib-2.10.2/glib/gmem.h 2006-01-25 10:51:43.000000000 -0500
+++ glib-2.10.2-new/glib/gmem.h 2006-04-21 15:12:58.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 -uNr glib-2.10.2/glib/gspawn.c glib-2.10.2-new/glib/gspawn.c
--- glib-2.10.2/glib/gspawn.c 2005-12-02 16:37:23.000000000 -0500
+++ glib-2.10.2-new/glib/gspawn.c 2006-04-21 15:09:16.000000000 -0400
@@ -132,6 +132,8 @@
return ret;
}
+#undef READ_OK
+
typedef enum
{
READ_FAILED = 0, /* FALSE */
diff -uNr glib-2.10.2/glib/libcharset/Makefile.in
glib-2.10.2-new/glib/libcharset/Makefile.in
--- glib-2.10.2/glib/libcharset/Makefile.in 2006-04-07 08:35:30.000000000
-0400
+++ glib-2.10.2-new/glib/libcharset/Makefile.in 2006-04-21 15:09:16.000000000
-0400
@@ -237,7 +237,7 @@
target_alias = @target_alias@
INCLUDES = \
- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
+ -DLIBDIR=\"$(sysconfdir)/glib-2.0\" -I$(top_srcdir)
noinst_LTLIBRARIES = libcharset.la
@@ -258,8 +258,8 @@
make-patch.sh
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+charset_alias = $(DESTDIR)$(sysconfdir)/glib-2.0/charset.alias
+charset_tmp = $(DESTDIR)$(sysconfdir)/glib-2.0/charset.tmp
SUFFIXES = .sed .sin
@@ -540,7 +540,7 @@
uninstall-am uninstall-info-am uninstall-local
install-exec-local: all-local
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/glib-2.0
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.10.2/glib/libcharset/charset.alias
glib-2.10.2-new/glib/libcharset/charset.alias
--- glib-2.10.2/glib/libcharset/charset.alias 1969-12-31 19:00:00.000000000
-0500
+++ glib-2.10.2-new/glib/libcharset/charset.alias 2006-04-21
15:09:16.000000000 -0400
@@ -0,0 +1,111 @@
+# This file contains a table of character encoding aliases,
+# suitable for operating system 'darwin'.
+C ASCII
+bg_BG UTF-8
+bg_BG.CP1251 CP1251
+cs_CZ UTF-8
+cs_CZ.ISO8859-2 ISO-8859-2
+da_DK UTF-8
+da_DK.ISO8859-1 ISO-8859-1
+da_DK.ISO8859-15 ISO-8859-15
+de_AT UTF-8
+de_AT.ISO8859-1 ISO-8859-1
+de_AT.ISO8859-15 ISO-8859-15
+de_CH UTF-8
+de_CH.ISO8859-1 ISO-8859-1
+de_CH.ISO8859-15 ISO-8859-15
+de_DE UTF-8
+de_DE.ISO8859-1 ISO-8859-1
+de_DE.ISO8859-15 ISO-8859-15
+en_AU UTF-8
+en_AU.ISO8859-1 ISO-8859-1
+en_AU.ISO8859-15 ISO-8859-15
+en_AU.US-ASCII ASCII
+en_CA UTF-8
+en_CA.ISO8859-1 ISO-8859-1
+en_CA.ISO8859-15 ISO-8859-15
+en_CA.US-ASCII ASCII
+en_GB UTF-8
+en_GB.ISO8859-1 ISO-8859-1
+en_GB.ISO8859-15 ISO-8859-15
+en_GB.US-ASCII ASCII
+en_US UTF-8
+en_US.ISO8859-1 ISO-8859-1
+en_US.ISO8859-15 ISO-8859-15
+en_US.US-ASCII ASCII
+es_ES UTF-8
+es_ES.ISO8859-1 ISO-8859-1
+es_ES.ISO8859-15 ISO-8859-15
+fi_FI UTF-8
+fi_FI.ISO8859-1 ISO-8859-1
+fi_FI.ISO8859-15 ISO-8859-15
+fr_BE UTF-8
+fr_BE.ISO8859-1 ISO-8859-1
+fr_BE.ISO8859-15 ISO-8859-15
+fr_CA UTF-8
+fr_CA.ISO8859-1 ISO-8859-1
+fr_CA.ISO8859-15 ISO-8859-15
+fr_CH UTF-8
+fr_CH.ISO8859-1 ISO-8859-1
+fr_CH.ISO8859-15 ISO-8859-15
+fr_FR UTF-8
+fr_FR.ISO8859-1 ISO-8859-1
+fr_FR.ISO8859-15 ISO-8859-15
+hr_HR UTF-8
+hr_HR.ISO8859-2 ISO-8859-2
+hu_HU UTF-8
+hu_HU.ISO8859-2 ISO-8859-2
+is_IS UTF-8
+is_IS.ISO8859-1 ISO-8859-1
+is_IS.ISO8859-15 ISO-8859-15
+it_CH UTF-8
+it_CH.ISO8859-1 ISO-8859-1
+it_CH.ISO8859-15 ISO-8859-15
+it_IT UTF-8
+it_IT.ISO8859-1 ISO-8859-1
+it_IT.ISO8859-15 ISO-8859-15
+ja_JP UTF-8
+ja_JP.EUC EUC-JP
+ja_JP.SJIS SHIFT_JIS
+ko_KR UTF-8
+ko_KR.EUC EUC-KR
+la_LN UTF-8
+la_LN.ISO8859-1 ISO-8859-1
+la_LN.ISO8859-2 ISO-8859-2
+la_LN.ISO8859-4 ISO-8859-4
+la_LN.ISO8859-15 ISO-8859-15
+la_LN.US-ASCII ASCII
+lt_LT UTF-8
+lt_LT.ISO8859-4 ISO-8859-4
+nl_BE UTF-8
+nl_BE.ISO8869-1 ISO-8859-1
+nl_BE.ISO8869-15 ISO-8859-15
+nl_NL UTF-8
+nl_NL.ISO8869-1 ISO-8859-1
+nl_NL.ISO8869-15 ISO-8859-15
+no_NO UTF-8
+no_NO.ISO8869-1 ISO-8859-1
+no_NO.ISO8869-15 ISO-8859-15
+pl_PL UTF-8
+pl_PL.ISO8859-2 ISO-8859-2
+pt_PT UTF-8
+pt_PT.ISO8859-1 ISO-8859-1
+pt_PT.ISO8859-15 ISO-8859-15
+ru_RU UTF-8
+ru_RU.CP866 CP866
+ru_RU.ISO8859-5 ISO-8859-5
+ru_RU.KOI8-R KOI8-R
+ru_RU.cp1251 CP1251
+ru_RU.koi8r KOI8-R
+sl_SI UTF-8
+sl_SI.ISO8859-2 ISO-8859-2
+sv_SE UTF-8
+sv_SE.ISO8859-1 ISO-8859-1
+sv_SE.ISO8859-15 ISO-8859-15
+uk_UA UTF-8
+uk_UA.KOI8-U KOI8-U
+uk_UA.cp1251 CP1251
+zh_CN UTF-8
+zh_CN.EUC GB2312
+zh_TW UTF-8
+zh_TW.Big5 BIG5
diff -uNr glib-2.10.2/ltmain.sh glib-2.10.2-new/ltmain.sh
--- glib-2.10.2/ltmain.sh 2006-03-13 08:01:36.000000000 -0500
+++ glib-2.10.2-new/ltmain.sh 2006-04-21 15:09:16.000000000 -0400
@@ -5341,10 +5341,6 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
- $echo >> $output "\
-relink_command=\"$relink_command\""
- fi
done
fi
diff -uNr glib-2.10.2/po/Makefile.in.in glib-2.10.2-new/po/Makefile.in.in
--- glib-2.10.2/po/Makefile.in.in 2005-09-06 12:33:28.000000000 -0400
+++ glib-2.10.2-new/po/Makefile.in.in 2006-04-21 15:09:16.000000000 -0400
@@ -27,7 +27,7 @@
exec_prefix = @exec_prefix@
datadir = @datadir@
libdir = @libdir@
-localedir = $(libdir)/locale
+localedir = $(datadir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
diff -uNr glib-2.10.2/tests/Makefile.in glib-2.10.2-new/tests/Makefile.in
--- glib-2.10.2/tests/Makefile.in 2006-04-07 08:35:32.000000000 -0400
+++ glib-2.10.2-new/tests/Makefile.in 2006-04-21 15:09:16.000000000 -0400
@@ -335,7 +335,7 @@
uri-test
-test_scripts = run-markup-tests.sh run-collate-tests.sh
+test_scripts = run-markup-tests.sh
test_script_support_programs = markup-test unicode-collate
diff -uNr glib-2.10.2/tests/array-test.c glib-2.10.2-new/tests/array-test.c
--- glib-2.10.2/tests/array-test.c 2005-03-14 01:01:51.000000000 -0500
+++ glib-2.10.2-new/tests/array-test.c 2006-04-21 15:09:16.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 -uNr glib-2.10.2/tests/child-test.c glib-2.10.2-new/tests/child-test.c
--- glib-2.10.2/tests/child-test.c 2005-07-14 01:20:14.000000000 -0400
+++ glib-2.10.2-new/tests/child-test.c 2006-04-21 15:09:16.000000000 -0400
@@ -174,7 +174,7 @@
#ifdef G_OS_WIN32
system ("ipconfig /all");
#else
- system ("/bin/true");
+ system ("/usr/bin/true");
#endif
alive = 2;
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
