Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13750
Modified Files:
glib2-10.5.info glib2-10.5.patch glib2.info glib2.patch
pango1-xft2-ft219.info pango1-xft2-ft219.patch
Log Message:
new glib2 version
Index: glib2-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- glib2-10.5.info 5 Oct 2008 17:26:14 -0000 1.22
+++ glib2-10.5.info 17 Oct 2008 00:31:45 -0000 1.23
@@ -1,6 +1,6 @@
Package: glib2
-Version: 2.18.1
-Revision: 103
+Version: 2.18.2
+Revision: 101
Distribution: 10.5
Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
BuildDepends: <<
@@ -14,9 +14,9 @@
Replaces: %N-common
Conflicts: %N-common
Source: mirror:gnome:sources/glib/2.18/glib-%v.tar.bz2
-Source-MD5: 51a9a33f49a4896d4d95d8e980666b9e
+Source-MD5: d11a5cc5e08cff53349a3481816fdaff
PatchFile: %n-10.5.patch
-PatchFile-MD5: 13ba186847cbaaac8431a09a7dea99e8
+PatchFile-MD5: 2e578a9a77472d4ad8080853675aac95
SetCFLAGS: -Os
ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
--disable-dependency-tracking --disable-fam
CompileScript: <<
@@ -24,7 +24,10 @@
perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
make
<<
-InfoTest: TestScript: LANG=C make check
+InfoTest: <<
+ TestDepends: desktop-file-utils
+ TestScript: LANG=C make check
+<<
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
@@ -33,11 +36,9 @@
SplitOff: <<
Package: %N-shlibs
Depends: libgettext3-shlibs, libiconv, xdg-base
+ Recommends: desktop-file-utils
Description: Handy library of utility functions
Files: lib/lib*-2.0.*.dylib share/locale etc
- InstallScript: <<
- mkdir -p %i/lib/gio/modules
- <<
Replaces: %N (<< 2.12.1-1)
Shlibs: <<
%p/lib/libgio-2.0.0.dylib 1801.0.0 %n (>= 2.18.0-1)
@@ -174,9 +175,6 @@
OS X >= 10.5 but need fink's on OS X <= 10.4. See:
http://bugzilla.gnome.org/show_bug.cgi?id=553716
- Fix gtester-report python interp path. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=553724
-
The following are newly deprecated in glib2 2.18.1 since 2.14.6:
g_assert_warning
G_GNUC_FUNCTION
@@ -192,8 +190,12 @@
fink, has a dependency on glib. Eventually package gio-fam
separately to avoid circular dependency.
- Create gio plugin dir even if it's empty. See part of:
- http://bugzilla.gnome.org/show_bug.cgi?id=555121
+ libgio sometimes runs %p/bin/update-desktop-database from the
+ desktop-file-utils package, but that program links against
+ libglib. Leave it as %N-shlibs:Recommends:d-f-u to break the
+ circular dependency. Ick. Required for self-test, so would
+ need to build (but not test) glib2, then build d-f-u against
+ it, then rebuild glib2 with testing enabled. Ick^2.
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: pango1-xft2-ft219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/pango1-xft2-ft219.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pango1-xft2-ft219.info 7 Oct 2008 14:22:13 -0000 1.14
+++ pango1-xft2-ft219.info 17 Oct 2008 00:31:45 -0000 1.15
@@ -42,7 +42,7 @@
Source: mirror:gnome:sources/pango/1.22/pango-%v.tar.bz2
Source-MD5: 37a185a3cb5c1a39ade7fdc3e6c75349
PatchFile: %n.patch
-PatchFile-MD5: bc3d8653b65c62ab6021e66b148b16df
+PatchFile-MD5: a58706ef1ed9f047d33fdcb99943fa1b
PatchScript: <<
#!/bin/bash -ev
perl -pi -e 's,(-dynamiclib)( +-single_module)*,$1 -single_module,g'
configure
@@ -81,7 +81,10 @@
LD_TWOLEVEL_NAMESPACE=1 ac_cv_header_Carbon_Carbon_h=no ./configure %c
make
<<
-InfoTest: TestScript: make check || exit 2
+InfoTest: <<
+ TestDepends: glib2-dev (>= 2.18.2-1), glib2-shlibs (>= 2.18.2-1)
+ TestScript: make check || exit 2
+<<
InstallScript: <<
#!/bin/bash -ev
@@ -210,8 +213,8 @@
build-dir one). Thanks pogma!
<<
DescPackaging: <<
- Scrap testboundaries_ucd since it fails due to a glib2 bug.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=554092
+ Need to use glib that has errno patches to avoid self-test
+ failure.
Minimize propagation of InheritedBuildDepends
Index: pango1-xft2-ft219.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/pango1-xft2-ft219.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pango1-xft2-ft219.patch 2 Oct 2008 06:34:51 -0000 1.4
+++ pango1-xft2-ft219.patch 17 Oct 2008 00:31:45 -0000 1.5
@@ -282,18 +282,6 @@
$(am__append_1) $(am__append_2) $(am__append_3)
TESTS_ENVIRONMENT = \
srcdir=$(srcdir) \
-diff -Nurd -x'*~' pango-1.22.0.orig/tests/runtests.sh.in
pango-1.22.0/tests/runtests.sh.in
---- pango-1.22.0.orig/tests/runtests.sh.in 2008-07-05 14:34:52.000000000
-0400
-+++ pango-1.22.0/tests/runtests.sh.in 2008-09-27 14:26:45.000000000 -0400
-@@ -1,7 +1,7 @@
- #! @SHELL@
-
- LOGFILE=runtests.log
--POTENTIAL_TESTS='testboundaries testcolor testboundaries_ucd'
-+POTENTIAL_TESTS='testboundaries testcolor'
-
- ECHO_C='@ECHO_C@'
- ECHO_N='@ECHO_N@'
diff -Nurd -x'*~' pango-1.22.0.orig/update-pango-modules
pango-1.22.0/update-pango-modules
--- pango-1.22.0.orig/update-pango-modules 1969-12-31 19:00:00.000000000
-0500
+++ pango-1.22.0/update-pango-modules 2008-09-27 02:16:57.000000000 -0400
Index: glib2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- glib2.patch 5 Oct 2008 17:26:14 -0000 1.9
+++ glib2.patch 17 Oct 2008 00:31:45 -0000 1.10
@@ -1,27 +1,3 @@
-diff -Nurd -x'*~' glib-2.18.1.orig/ChangeLog glib-2.18.1/ChangeLog
---- glib-2.18.1.orig/ChangeLog 2008-09-17 19:20:31.000000000 -0400
-+++ glib-2.18.1/ChangeLog 2008-10-05 10:33:20.000000000 -0400
-@@ -1,3 +1,20 @@
-+2008-09-30 Behdad Esfahbod <[EMAIL PROTECTED]>
-+
-+ Bug 554092 â glib doesn't return G_FILE_ERROR_NOENT et al on OS X
-+
-+ * glib/giounix.c (g_io_unix_read), (g_io_unix_write),
-+ (g_io_unix_seek), (g_io_unix_close), (g_io_unix_set_flags),
-+ (g_io_unix_get_flags), (g_io_channel_new_file):
-+ Like mclasen says: "well, thats the way errno works...,
-+ save it or loose it". Save errno.
-+
-+2008-09-30 Dan Winship <[EMAIL PROTECTED]>
-+
-+ Bug 554092 â glib doesn't return G_FILE_ERROR_NOENT et al on OS X
-+
-+ * glib/gslice.c (allocator_memalign): Don't clear errno on
-+ non-posix_memalign() platforms.
-+
- 2008-09-17 Matthias Clasen <[EMAIL PROTECTED]>
-
- * === Released 2.18.1 ===
diff -Nurd -x'*~' glib-2.18.1.orig/configure glib-2.18.1/configure
--- glib-2.18.1.orig/configure 2008-09-17 18:54:36.000000000 -0400
+++ glib-2.18.1/configure 2008-09-25 01:46:38.000000000 -0400
@@ -263,15 +239,6 @@
return aligned_memory;
}
-diff -Nurd -x'*~' glib-2.18.1.orig/glib/gtester-report
glib-2.18.1/glib/gtester-report
---- glib-2.18.1.orig/glib/gtester-report 2008-09-17 18:33:57.000000000
-0400
-+++ glib-2.18.1/glib/gtester-report 2008-09-25 03:23:51.000000000 -0400
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python
- # GLib Testing Framework Utility -*- Mode: python; -*-
- # Copyright (C) 2007 Imendio AB
- # Authors: Tim Janik
diff -Nurd -x'*~' glib-2.18.1.orig/glib/libcharset/Makefile.in
glib-2.18.1/glib/libcharset/Makefile.in
--- glib-2.18.1.orig/glib/libcharset/Makefile.in 2008-09-17
18:54:31.000000000 -0400
+++ glib-2.18.1/glib/libcharset/Makefile.in 2008-09-25 01:54:37.000000000
-0400
Index: glib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2.info,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- glib2.info 10 Oct 2008 12:42:00 -0000 1.36
+++ glib2.info 17 Oct 2008 00:31:45 -0000 1.37
@@ -1,6 +1,6 @@
Package: glib2
-Version: 2.18.1
-Revision: 3
+Version: 2.18.2
+Revision: 1
Distribution: 10.4
Depends: %N-shlibs (>= %v-%r), fink-obsolete-packages
BuildDepends: <<
@@ -14,9 +14,9 @@
Replaces: %N-common
Conflicts: %N-common
Source: mirror:gnome:sources/glib/2.18/glib-%v.tar.bz2
-Source-MD5: 51a9a33f49a4896d4d95d8e980666b9e
+Source-MD5: d11a5cc5e08cff53349a3481816fdaff
PatchFile: %n.patch
-PatchFile-MD5: d0e057a57149410dc5bee57265ddf6aa
+PatchFile-MD5: c8986338bc05ec808300ea834467abb7
SetCFLAGS: -Os
ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
--disable-dependency-tracking --disable-fam
CompileScript: <<
@@ -24,7 +24,10 @@
perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
make
<<
-InfoTest: TestScript: LANG=C make check
+InfoTest: <<
+ TestDepends: desktop-file-utils
+ TestScript: LANG=C make check
+<<
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
@@ -33,11 +36,9 @@
SplitOff: <<
Package: %N-shlibs
Depends: libgettext3-shlibs, libiconv, xdg-base
+ Recommends: desktop-file-utils
Description: Handy library of utility functions
Files: lib/lib*-2.0.*.dylib share/locale etc
- InstallScript: <<
- mkdir -p %i/lib/gio/modules
- <<
Replaces: %N (<< 2.12.1-1)
Shlibs: <<
%p/lib/libgio-2.0.0.dylib 1801.0.0 %n (>= 2.18.0-1)
@@ -64,8 +65,8 @@
Package: %N-dev
Depends: <<
%N-shlibs (= %v-%r),
- pkgconfig (>= 0.23),
- python25
+ python25,
+ pkgconfig (>= 0.23)
<<
Description: Handy library of utility functions
Replaces: %N (<< 2.4.0-1)
@@ -168,9 +169,6 @@
OS X >= 10.5 but need fink's on OS X <= 10.4. See:
http://bugzilla.gnome.org/show_bug.cgi?id=553716
- Fix gtester-report python interp path. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=553724
-
The following are newly deprecated in glib2 2.18.1 since 2.14.6:
g_assert_warning
G_GNUC_FUNCTION
@@ -186,8 +184,12 @@
fink, has a dependency on glib. Eventually package gio-fam
separately to avoid circular dependency.
- Create gio plugin dir even if it's empty. See part of:
- http://bugzilla.gnome.org/show_bug.cgi?id=555121
+ libgio sometimes runs %p/bin/update-desktop-database from the
+ desktop-file-utils package, but that program links against
+ libglib. Leave it as %N-shlibs:Recommends:d-f-u to break the
+ circular dependency. Ick. Required for self-test, so would
+ need to build (but not test) glib2, then build d-f-u against
+ it, then rebuild glib2 with testing enabled. Ick^2.
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: glib2-10.5.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/glib2-10.5.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- glib2-10.5.patch 5 Oct 2008 17:26:14 -0000 1.7
+++ glib2-10.5.patch 17 Oct 2008 00:31:45 -0000 1.8
@@ -1,27 +1,3 @@
-diff -Nurd -x'*~' glib-2.18.1.orig/ChangeLog glib-2.18.1/ChangeLog
---- glib-2.18.1.orig/ChangeLog 2008-09-17 19:20:31.000000000 -0400
-+++ glib-2.18.1/ChangeLog 2008-10-05 10:33:20.000000000 -0400
-@@ -1,3 +1,20 @@
-+2008-09-30 Behdad Esfahbod <[EMAIL PROTECTED]>
-+
-+ Bug 554092 â glib doesn't return G_FILE_ERROR_NOENT et al on OS X
-+
-+ * glib/giounix.c (g_io_unix_read), (g_io_unix_write),
-+ (g_io_unix_seek), (g_io_unix_close), (g_io_unix_set_flags),
-+ (g_io_unix_get_flags), (g_io_channel_new_file):
-+ Like mclasen says: "well, thats the way errno works...,
-+ save it or loose it". Save errno.
-+
-+2008-09-30 Dan Winship <[EMAIL PROTECTED]>
-+
-+ Bug 554092 â glib doesn't return G_FILE_ERROR_NOENT et al on OS X
-+
-+ * glib/gslice.c (allocator_memalign): Don't clear errno on
-+ non-posix_memalign() platforms.
-+
- 2008-09-17 Matthias Clasen <[EMAIL PROTECTED]>
-
- * === Released 2.18.1 ===
diff -Nurd -x'*~' glib-2.18.1.orig/configure glib-2.18.1/configure
--- glib-2.18.1.orig/configure 2008-09-17 18:54:36.000000000 -0400
+++ glib-2.18.1/configure 2008-09-25 01:46:38.000000000 -0400
@@ -263,15 +239,6 @@
return aligned_memory;
}
-diff -Nurd -x'*~' glib-2.18.1.orig/glib/gtester-report
glib-2.18.1/glib/gtester-report
---- glib-2.18.1.orig/glib/gtester-report 2008-09-17 18:33:57.000000000
-0400
-+++ glib-2.18.1/glib/gtester-report 2008-09-25 03:23:51.000000000 -0400
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/env python
- # GLib Testing Framework Utility -*- Mode: python; -*-
- # Copyright (C) 2007 Imendio AB
- # Authors: Tim Janik
diff -Nurd -x'*~' glib-2.18.1.orig/glib/gutils.h glib-2.18.1/glib/gutils.h
--- glib-2.18.1.orig/glib/gutils.h 2008-09-17 18:33:57.000000000 -0400
+++ glib-2.18.1/glib/gutils.h 2008-09-25 03:59:41.000000000 -0400
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
