the Fink project is an effort to port
popular Unix programs to Mac OS X
Package: glib2
Version: 2.14.6
Revision: 3
Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
BuildDepends: <<
fink (>= 0.24.12-1),
gettext-bin,
gettext-tools,
libgettext3-dev,
libiconv-dev,
pkgconfig (>= 0.16-1)
<<
Replaces: %N-common
Conflicts: %N-common
Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2
Source-MD5: 3b340946d6916ee9cbf2c348e7c099f1
PatchFile: %n.patch
PatchFile-MD5: 872a8c398765e2dd9570d8bb0ad011bf
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -isystem %p/include
SetCFLAGS: -Os
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
perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
make
<<
InfoTest: TestScript: 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: libgettext3-shlibs, libiconv, xdg-base
Description: Handy library of utility functions
Files: lib/lib*-2.0.*.dylib share/locale etc
Replaces: %N (<< 2.12.1-1)
Shlibs: <<
%p/lib/libglib-2.0.0.dylib 1401.0.0 %n (>= 2.14.0-1)
%p/lib/libgmodule-2.0.0.dylib 1401.0.0 %n (>= 2.14.0-1)
%p/lib/libgobject-2.0.0.dylib 1401.0.0 %n (>= 2.14.0-1)
%p/lib/libgthread-2.0.0.dylib 1401.0.0 %n (>= 2.14.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), pkgconfig (>= 0.22-6)
Description: Handy library of utility functions
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
<<
<<
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.
<<
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.
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?
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
Patch child-test.c for our location of `true`. See:
http://bugzilla.gnome.org/show_bug.cgi?id=495690
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.
poll() is broken on 10.4 but not 10.3; force internal emulation
to regardless of config result so that lib builds the same everywhere
and is portable.
Fix paths in glib-gettextize. See:
http://bugzilla.gnome.org/show_bug.cgi?id=518309
<<
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.
%N-dev installs glib-2.0.m4, which uses PKG_PROG_PKG_CONFIG, which
doesn't exist in pkg.m4 until pkg-config 0.16. See:
http://bugzilla.gnome.org/show_bug.cgi?id=418778
Builds with included pcre instead of external lib to avoid need to
cascade deps on pcre packages
<<
License: LGPL
Maintainer: The Gnome Core Team
Homepage: http://www.gtk.org
diff -Nurd -x'*~' glib-2.14.6.orig/configure glib-2.14.6/configure
--- glib-2.14.6.orig/configure 2008-02-07 00:41:30.000000000 -0500
+++ glib-2.14.6/configure 2008-02-23 16:34:41.000000000 -0500
@@ -33808,10 +33808,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
@@ -35219,6 +35220,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
+ *-darwin*)
+ # Nothing needed.
+ ;;
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
@@ -41793,9 +41797,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
@@ -43072,8 +43077,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 -Nurd -x'*~' glib-2.14.6.orig/glib/libcharset/Makefile.in glib-2.14.6/glib/libcharset/Makefile.in
--- glib-2.14.6.orig/glib/libcharset/Makefile.in 2008-02-07 00:41:28.000000000 -0500
+++ glib-2.14.6/glib/libcharset/Makefile.in 2008-02-23 16:34:41.000000000 -0500
@@ -252,7 +252,7 @@
target_alias = @target_alias@
INCLUDES = \
- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
+ -DLIBDIR=\"$(sysconfdir)/glib-2.0\" -I$(top_srcdir)
noinst_LTLIBRARIES = libcharset.la
@@ -274,8 +274,8 @@
libcharset-glib.patch
-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
@@ -556,7 +556,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 -Nurd -x'*~' glib-2.14.6.orig/glib/libcharset/charset.alias glib-2.14.6/glib/libcharset/charset.alias
--- glib-2.14.6.orig/glib/libcharset/charset.alias 1969-12-31 19:00:00.000000000 -0500
+++ glib-2.14.6/glib/libcharset/charset.alias 2008-02-23 16:34:41.000000000 -0500
@@ -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 -Nurd -x'*~' glib-2.14.6.orig/glib-gettextize.in glib-2.14.6/glib-gettextize.in
--- glib-2.14.6.orig/glib-gettextize.in 2008-02-07 00:25:02.000000000 -0500
+++ glib-2.14.6/glib-gettextize.in 2008-02-23 16:40:48.000000000 -0500
@@ -49,8 +49,8 @@
;;
esac
-datadir=@datadir@
datarootdir=@datarootdir@
+datadir=@datadir@
gettext_dir=$prefix/share/glib-2.0/gettext
diff -Nurd -x'*~' glib-2.14.6.orig/ltmain.sh glib-2.14.6/ltmain.sh
--- glib-2.14.6.orig/ltmain.sh 2008-01-30 15:26:55.000000000 -0500
+++ glib-2.14.6/ltmain.sh 2008-02-23 16:34:41.000000000 -0500
@@ -5759,10 +5759,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 -Nurd -x'*~' glib-2.14.6.orig/tests/Makefile.in glib-2.14.6/tests/Makefile.in
--- glib-2.14.6.orig/tests/Makefile.in 2008-02-07 00:41:29.000000000 -0500
+++ glib-2.14.6/tests/Makefile.in 2008-02-23 16:34:41.000000000 -0500
@@ -330,7 +330,6 @@
module-test \
node-test \
onceinit \
- option-test \
patterntest \
printf-test \
queue-test \
@@ -363,7 +362,7 @@
regex-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.14.6.orig/tests/array-test.c glib-2.14.6/tests/array-test.c
--- glib-2.14.6.orig/tests/array-test.c 2008-02-07 00:24:55.000000000 -0500
+++ glib-2.14.6/tests/array-test.c 2008-02-23 16:34:41.000000000 -0500
@@ -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.14.6.orig/tests/child-test.c glib-2.14.6/tests/child-test.c
--- glib-2.14.6.orig/tests/child-test.c 2008-02-07 00:24:55.000000000 -0500
+++ glib-2.14.6/tests/child-test.c 2008-02-23 16:34:41.000000000 -0500
@@ -175,7 +175,7 @@
#ifdef G_OS_WIN32
system ("ipconfig /all");
#else
- system ("/bin/true");
+ system ("/usr/bin/true");
#endif
alive = 2;
Package: glib2
Version: 2.14.6
Revision: 3
Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
BuildDepends: <<
fink (>= 0.24.12-1),
gettext-bin,
gettext-tools,
libgettext3-dev,
libiconv-dev,
pkgconfig (>= 0.16-1)
<<
Replaces: %N-common
Conflicts: %N-common
Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2
Source-MD5: 3b340946d6916ee9cbf2c348e7c099f1
PatchFile: %n.patch
PatchFile-MD5: 872a8c398765e2dd9570d8bb0ad011bf
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -isystem %p/include
SetCFLAGS: -Os
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
perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
make
<<
InfoTest: TestScript: 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: libgettext3-shlibs, libiconv, xdg-base
Description: Handy library of utility functions
Files: lib/lib*-2.0.*.dylib share/locale etc
Replaces: %N (<< 2.12.1-1)
Shlibs: <<
%p/lib/libglib-2.0.0.dylib 1401.0.0 %n (>= 2.14.0-1)
%p/lib/libgmodule-2.0.0.dylib 1401.0.0 %n (>= 2.14.0-1)
%p/lib/libgobject-2.0.0.dylib 1401.0.0 %n (>= 2.14.0-1)
%p/lib/libgthread-2.0.0.dylib 1401.0.0 %n (>= 2.14.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), pkgconfig (>= 0.22-6)
Description: Handy library of utility functions
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
<<
<<
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.
<<
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.
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?
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
Patch child-test.c for our location of `true`. See:
http://bugzilla.gnome.org/show_bug.cgi?id=495690
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.
poll() is broken on 10.4 but not 10.3; force internal emulation
to regardless of config result so that lib builds the same everywhere
and is portable.
Fix paths in glib-gettextize. See:
http://bugzilla.gnome.org/show_bug.cgi?id=518309
<<
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.
%N-dev installs glib-2.0.m4, which uses PKG_PROG_PKG_CONFIG, which
doesn't exist in pkg.m4 until pkg-config 0.16. See:
http://bugzilla.gnome.org/show_bug.cgi?id=418778
Builds with included pcre instead of external lib to avoid need to
cascade deps on pcre packages
<<
License: LGPL
Maintainer: The Gnome Core Team
Homepage: http://www.gtk.org
diff -Nurd -x'*~' glib-2.14.6.orig/configure glib-2.14.6/configure
--- glib-2.14.6.orig/configure 2008-02-07 00:41:30.000000000 -0500
+++ glib-2.14.6/configure 2008-02-23 16:34:41.000000000 -0500
@@ -33808,10 +33808,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
@@ -35219,6 +35220,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
+ *-darwin*)
+ # Nothing needed.
+ ;;
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
@@ -41793,9 +41797,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
@@ -43072,8 +43077,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 -Nurd -x'*~' glib-2.14.6.orig/glib/libcharset/Makefile.in glib-2.14.6/glib/libcharset/Makefile.in
--- glib-2.14.6.orig/glib/libcharset/Makefile.in 2008-02-07 00:41:28.000000000 -0500
+++ glib-2.14.6/glib/libcharset/Makefile.in 2008-02-23 16:34:41.000000000 -0500
@@ -252,7 +252,7 @@
target_alias = @target_alias@
INCLUDES = \
- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
+ -DLIBDIR=\"$(sysconfdir)/glib-2.0\" -I$(top_srcdir)
noinst_LTLIBRARIES = libcharset.la
@@ -274,8 +274,8 @@
libcharset-glib.patch
-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
@@ -556,7 +556,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 -Nurd -x'*~' glib-2.14.6.orig/glib/libcharset/charset.alias glib-2.14.6/glib/libcharset/charset.alias
--- glib-2.14.6.orig/glib/libcharset/charset.alias 1969-12-31 19:00:00.000000000 -0500
+++ glib-2.14.6/glib/libcharset/charset.alias 2008-02-23 16:34:41.000000000 -0500
@@ -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 -Nurd -x'*~' glib-2.14.6.orig/glib-gettextize.in glib-2.14.6/glib-gettextize.in
--- glib-2.14.6.orig/glib-gettextize.in 2008-02-07 00:25:02.000000000 -0500
+++ glib-2.14.6/glib-gettextize.in 2008-02-23 16:40:48.000000000 -0500
@@ -49,8 +49,8 @@
;;
esac
-datadir=@datadir@
datarootdir=@datarootdir@
+datadir=@datadir@
gettext_dir=$prefix/share/glib-2.0/gettext
diff -Nurd -x'*~' glib-2.14.6.orig/ltmain.sh glib-2.14.6/ltmain.sh
--- glib-2.14.6.orig/ltmain.sh 2008-01-30 15:26:55.000000000 -0500
+++ glib-2.14.6/ltmain.sh 2008-02-23 16:34:41.000000000 -0500
@@ -5759,10 +5759,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 -Nurd -x'*~' glib-2.14.6.orig/tests/Makefile.in glib-2.14.6/tests/Makefile.in
--- glib-2.14.6.orig/tests/Makefile.in 2008-02-07 00:41:29.000000000 -0500
+++ glib-2.14.6/tests/Makefile.in 2008-02-23 16:34:41.000000000 -0500
@@ -330,7 +330,6 @@
module-test \
node-test \
onceinit \
- option-test \
patterntest \
printf-test \
queue-test \
@@ -363,7 +362,7 @@
regex-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.14.6.orig/tests/array-test.c glib-2.14.6/tests/array-test.c
--- glib-2.14.6.orig/tests/array-test.c 2008-02-07 00:24:55.000000000 -0500
+++ glib-2.14.6/tests/array-test.c 2008-02-23 16:34:41.000000000 -0500
@@ -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.14.6.orig/tests/child-test.c glib-2.14.6/tests/child-test.c
--- glib-2.14.6.orig/tests/child-test.c 2008-02-07 00:24:55.000000000 -0500
+++ glib-2.14.6/tests/child-test.c 2008-02-23 16:34:41.000000000 -0500
@@ -175,7 +175,7 @@
#ifdef G_OS_WIN32
system ("ipconfig /all");
#else
- system ("/bin/true");
+ system ("/usr/bin/true");
#endif
alive = 2;