Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1822
Modified Files: Tag: pangocairo-branch glib2-10.5.info glib2-10.5.patch glib2.info glib2.patch Log Message: fix upstream bug http://permalink.gmane.org/gmane.os.apple.fink.gnome/1980 clean up the .patch Index: glib2-10.5.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.info,v retrieving revision 1.3.2.22 retrieving revision 1.3.2.23 diff -u -d -r1.3.2.22 -r1.3.2.23 --- glib2-10.5.info 15 Feb 2008 15:49:59 -0000 1.3.2.22 +++ glib2-10.5.info 24 Feb 2008 02:02:41 -0000 1.3.2.23 @@ -1,6 +1,6 @@ Package: glib2 Version: 2.14.6 -Revision: 101 +Revision: 102 Distribution: 10.5 Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages BuildDepends: << @@ -16,7 +16,7 @@ Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2 Source-MD5: 3b340946d6916ee9cbf2c348e7c099f1 PatchFile: %n-10.5.patch -PatchFile-MD5: fbcafcedeca81ff92131ea57ebff03da +PatchFile-MD5: a0774c8b8e14bb5e32edeea1686a5a84 NoSetCPPFLAGS: true NoSetLDFLAGS: true SetLIBS: -L%p/lib @@ -143,6 +143,9 @@ msachs says "static inline" is right for this case, so hardcode it. 2.14.5 does it "differently" but still looks like the same wrong patch, so leaving our existing "static inline" hard-coding patch. + + 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 Index: glib2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.info,v retrieving revision 1.16.2.29 retrieving revision 1.16.2.30 diff -u -d -r1.16.2.29 -r1.16.2.30 --- glib2.info 15 Feb 2008 15:49:59 -0000 1.16.2.29 +++ glib2.info 24 Feb 2008 02:02:41 -0000 1.16.2.30 @@ -1,6 +1,6 @@ Package: glib2 Version: 2.14.6 -Revision: 1 +Revision: 2 Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages BuildDepends: << fink (>= 0.24.12-1), @@ -15,7 +15,7 @@ Source: mirror:gnome:sources/glib/2.14/glib-%v.tar.bz2 Source-MD5: 3b340946d6916ee9cbf2c348e7c099f1 PatchFile: %n.patch -PatchFile-MD5: 521f6bdd8ba2e7e271bbd2b728a8a9a8 +PatchFile-MD5: 872a8c398765e2dd9570d8bb0ad011bf NoSetCPPFLAGS: true NoSetLDFLAGS: true SetLIBS: -L%p/lib @@ -135,6 +135,9 @@ 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 Index: glib2-10.5.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.patch,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -u -d -r1.2.2.5 -r1.2.2.6 --- glib2-10.5.patch 9 Jan 2008 01:47:37 -0000 1.2.2.5 +++ glib2-10.5.patch 24 Feb 2008 02:02:41 -0000 1.2.2.6 @@ -1,7 +1,7 @@ -diff -Nurd -x'*~' glib-2.14.5.orig/configure glib-2.14.5/configure ---- glib-2.14.5.orig/configure 2008-01-07 20:42:16.000000000 -0500 -+++ glib-2.14.5/configure 2008-01-08 20:34:37.000000000 -0500 -@@ -36601,10 +36601,11 @@ +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; } @@ -16,7 +16,7 @@ fi fi -@@ -38207,6 +38208,9 @@ +@@ -35219,6 +35220,9 @@ G_THREAD_CFLAGS="-D_THREAD_SAFE" fi ;; @@ -26,7 +26,7 @@ *-dg-dgux*) # DG/UX G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE" ;; -@@ -45840,9 +45844,10 @@ +@@ -41793,9 +41797,10 @@ #define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION " @@ -38,7 +38,7 @@ *) glib_vacopy='' esac -@@ -47118,8 +47123,11 @@ +@@ -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. @@ -51,9 +51,9 @@ # undef G_HAVE_ISO_VARARGS #endif -diff -Nurd -x'*~' glib-2.14.5.orig/glib/gutils.h glib-2.14.5/glib/gutils.h ---- glib-2.14.5.orig/glib/gutils.h 2008-01-07 20:39:49.000000000 -0500 -+++ glib-2.14.5/glib/gutils.h 2008-01-08 20:42:54.000000000 -0500 +diff -Nurd -x'*~' glib-2.14.6.orig/glib/gutils.h glib-2.14.6/glib/gutils.h +--- glib-2.14.6.orig/glib/gutils.h 2008-02-07 00:24:59.000000000 -0500 ++++ glib-2.14.6/glib/gutils.h 2008-02-23 20:56:44.000000000 -0500 @@ -109,12 +109,7 @@ # define G_INLINE_FUNC # undef G_CAN_INLINE @@ -68,10 +68,10 @@ #elif defined (G_CAN_INLINE) # define G_INLINE_FUNC static inline #else /* can't inline */ -diff -Nurd -x'*~' glib-2.14.5.orig/glib/libcharset/Makefile.in glib-2.14.5/glib/libcharset/Makefile.in ---- glib-2.14.5.orig/glib/libcharset/Makefile.in 2008-01-07 20:42:10.000000000 -0500 -+++ glib-2.14.5/glib/libcharset/Makefile.in 2008-01-08 20:34:37.000000000 -0500 -@@ -251,7 +251,7 @@ +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 = \ @@ -80,7 +80,7 @@ noinst_LTLIBRARIES = libcharset.la -@@ -273,8 +273,8 @@ +@@ -274,8 +274,8 @@ libcharset-glib.patch @@ -91,7 +91,7 @@ SUFFIXES = .sed .sin -@@ -555,7 +555,7 @@ +@@ -556,7 +556,7 @@ uninstall-am uninstall-info-am uninstall-local install-exec-local: all-local @@ -100,9 +100,9 @@ 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.5.orig/glib/libcharset/charset.alias glib-2.14.5/glib/libcharset/charset.alias ---- glib-2.14.5.orig/glib/libcharset/charset.alias 1969-12-31 19:00:00.000000000 -0500 -+++ glib-2.14.5/glib/libcharset/charset.alias 2008-01-08 20:34:37.000000000 -0500 +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'. @@ -215,10 +215,23 @@ +zh_CN.EUC GB2312 +zh_TW UTF-8 +zh_TW.Big5 BIG5 -diff -Nurd -x'*~' glib-2.14.5.orig/ltmain.sh glib-2.14.5/ltmain.sh ---- glib-2.14.5.orig/ltmain.sh 2007-01-13 23:15:09.000000000 -0500 -+++ glib-2.14.5/ltmain.sh 2008-01-08 20:34:37.000000000 -0500 -@@ -5696,10 +5696,6 @@ +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 + [EMAIL PROTECTED]@ + [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ + + 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'" @@ -229,22 +242,10 @@ done fi -diff -Nurd -x'*~' glib-2.14.5.orig/po/Makefile.in.in glib-2.14.5/po/Makefile.in.in ---- glib-2.14.5.orig/po/Makefile.in.in 2008-01-07 20:39:53.000000000 -0500 -+++ glib-2.14.5/po/Makefile.in.in 2008-01-08 20:34:37.000000000 -0500 -@@ -28,7 +28,7 @@ - datarootdir = @datarootdir@ - datadir = @datadir@ - libdir = @libdir@ --localedir = $(libdir)/locale -+localedir = $(datadir)/locale - gnulocaledir = $(datadir)/locale - gettextsrcdir = $(datadir)/glib-2.0/gettext/po - subdir = po -diff -Nurd -x'*~' glib-2.14.5.orig/tests/Makefile.in glib-2.14.5/tests/Makefile.in ---- glib-2.14.5.orig/tests/Makefile.in 2008-01-07 20:42:12.000000000 -0500 -+++ glib-2.14.5/tests/Makefile.in 2008-01-08 20:34:37.000000000 -0500 -@@ -329,7 +329,6 @@ +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 \ @@ -252,7 +253,7 @@ patterntest \ printf-test \ queue-test \ -@@ -362,7 +361,7 @@ +@@ -363,7 +362,7 @@ regex-test @@ -261,9 +262,9 @@ test_script_support_programs = markup-test unicode-collate bookmarkfile-test -diff -Nurd -x'*~' glib-2.14.5.orig/tests/array-test.c glib-2.14.5/tests/array-test.c ---- glib-2.14.5.orig/tests/array-test.c 2008-01-07 20:39:45.000000000 -0500 -+++ glib-2.14.5/tests/array-test.c 2008-01-08 20:34:37.000000000 -0500 +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++) @@ -283,9 +284,9 @@ } g_byte_array_free (gbarray, TRUE); -diff -Nurd -x'*~' glib-2.14.5.orig/tests/child-test.c glib-2.14.5/tests/child-test.c ---- glib-2.14.5.orig/tests/child-test.c 2008-01-07 20:39:45.000000000 -0500 -+++ glib-2.14.5/tests/child-test.c 2008-01-08 20:34:37.000000000 -0500 +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"); Index: glib2.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.patch,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -d -r1.4.2.5 -r1.4.2.6 --- glib2.patch 9 Jan 2008 01:47:37 -0000 1.4.2.5 +++ glib2.patch 24 Feb 2008 02:02:41 -0000 1.4.2.6 @@ -1,7 +1,7 @@ -diff -Nurd -x'*~' glib-2.14.5.orig/configure glib-2.14.5/configure ---- glib-2.14.5.orig/configure 2008-01-07 20:42:16.000000000 -0500 -+++ glib-2.14.5/configure 2008-01-08 20:34:37.000000000 -0500 -@@ -36601,10 +36601,11 @@ +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; } @@ -16,7 +16,7 @@ fi fi -@@ -38207,6 +38208,9 @@ +@@ -35219,6 +35220,9 @@ G_THREAD_CFLAGS="-D_THREAD_SAFE" fi ;; @@ -26,7 +26,7 @@ *-dg-dgux*) # DG/UX G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE" ;; -@@ -45840,9 +45844,10 @@ +@@ -41793,9 +41797,10 @@ #define GLIB_MICRO_VERSION $GLIB_MICRO_VERSION " @@ -38,7 +38,7 @@ *) glib_vacopy='' esac -@@ -47118,8 +47123,11 @@ +@@ -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. @@ -51,10 +51,10 @@ # undef G_HAVE_ISO_VARARGS #endif -diff -Nurd -x'*~' glib-2.14.5.orig/glib/libcharset/Makefile.in glib-2.14.5/glib/libcharset/Makefile.in ---- glib-2.14.5.orig/glib/libcharset/Makefile.in 2008-01-07 20:42:10.000000000 -0500 -+++ glib-2.14.5/glib/libcharset/Makefile.in 2008-01-08 20:34:37.000000000 -0500 -@@ -251,7 +251,7 @@ +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 = \ @@ -63,7 +63,7 @@ noinst_LTLIBRARIES = libcharset.la -@@ -273,8 +273,8 @@ +@@ -274,8 +274,8 @@ libcharset-glib.patch @@ -74,7 +74,7 @@ SUFFIXES = .sed .sin -@@ -555,7 +555,7 @@ +@@ -556,7 +556,7 @@ uninstall-am uninstall-info-am uninstall-local install-exec-local: all-local @@ -83,9 +83,9 @@ 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.5.orig/glib/libcharset/charset.alias glib-2.14.5/glib/libcharset/charset.alias ---- glib-2.14.5.orig/glib/libcharset/charset.alias 1969-12-31 19:00:00.000000000 -0500 -+++ glib-2.14.5/glib/libcharset/charset.alias 2008-01-08 20:34:37.000000000 -0500 +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'. @@ -198,10 +198,23 @@ +zh_CN.EUC GB2312 +zh_TW UTF-8 +zh_TW.Big5 BIG5 -diff -Nurd -x'*~' glib-2.14.5.orig/ltmain.sh glib-2.14.5/ltmain.sh ---- glib-2.14.5.orig/ltmain.sh 2007-01-13 23:15:09.000000000 -0500 -+++ glib-2.14.5/ltmain.sh 2008-01-08 20:34:37.000000000 -0500 -@@ -5696,10 +5696,6 @@ +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 + [EMAIL PROTECTED]@ + [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ + + 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'" @@ -212,22 +225,10 @@ done fi -diff -Nurd -x'*~' glib-2.14.5.orig/po/Makefile.in.in glib-2.14.5/po/Makefile.in.in ---- glib-2.14.5.orig/po/Makefile.in.in 2008-01-07 20:39:53.000000000 -0500 -+++ glib-2.14.5/po/Makefile.in.in 2008-01-08 20:34:37.000000000 -0500 -@@ -28,7 +28,7 @@ - datarootdir = @datarootdir@ - datadir = @datadir@ - libdir = @libdir@ --localedir = $(libdir)/locale -+localedir = $(datadir)/locale - gnulocaledir = $(datadir)/locale - gettextsrcdir = $(datadir)/glib-2.0/gettext/po - subdir = po -diff -Nurd -x'*~' glib-2.14.5.orig/tests/Makefile.in glib-2.14.5/tests/Makefile.in ---- glib-2.14.5.orig/tests/Makefile.in 2008-01-07 20:42:12.000000000 -0500 -+++ glib-2.14.5/tests/Makefile.in 2008-01-08 20:34:37.000000000 -0500 -@@ -329,7 +329,6 @@ +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 \ @@ -235,7 +236,7 @@ patterntest \ printf-test \ queue-test \ -@@ -362,7 +361,7 @@ +@@ -363,7 +362,7 @@ regex-test @@ -244,9 +245,9 @@ test_script_support_programs = markup-test unicode-collate bookmarkfile-test -diff -Nurd -x'*~' glib-2.14.5.orig/tests/array-test.c glib-2.14.5/tests/array-test.c ---- glib-2.14.5.orig/tests/array-test.c 2008-01-07 20:39:45.000000000 -0500 -+++ glib-2.14.5/tests/array-test.c 2008-01-08 20:34:37.000000000 -0500 +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++) @@ -266,9 +267,9 @@ } g_byte_array_free (gbarray, TRUE); -diff -Nurd -x'*~' glib-2.14.5.orig/tests/child-test.c glib-2.14.5/tests/child-test.c ---- glib-2.14.5.orig/tests/child-test.c 2008-01-07 20:39:45.000000000 -0500 -+++ glib-2.14.5/tests/child-test.c 2008-01-08 20:34:37.000000000 -0500 +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"); ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs