Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv13826
Modified Files:
glib2-shlibs.info glib2-shlibs.patch
Log Message:
testing new glib2 (now fails fewer gdate tests, but still fails gdate tests and
gdbus is completely unimplemented)
Index: glib2-shlibs.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/glib2-shlibs.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- glib2-shlibs.info 22 Jun 2011 15:49:58 -0000 1.5
+++ glib2-shlibs.info 31 Mar 2012 20:04:17 -0000 1.6
@@ -1,17 +1,16 @@
Package: glib2-shlibs
-#cannot update to >= 2.26 because gdbus does not support launchd. See:
-#http://lists.macosforge.org/pipermail/macports-dev/2010-October/013047.html
-
-#2.28.6 fails self-test (collation on x86_64). See:
-#https://bugzilla.gnome.org/show_bug.cgi?id=644686
-#https://bugzilla.gnome.org/show_bug.cgi?id=612019
+#2.22.5 fails self-test; do not update. See:
+#https://bugzilla.gnome.org/show_bug.cgi?id=613060
+Version: 2.32.0
-Version: 2.28.7
+# some code requires python >= 2.5; 10.5 comes with 2.3 and not yet
+# ready to push a Depends:pythonXX into the glib dep tree
+Distribution: 10.6
Revision: 1
BuildDepends: <<
- fink (>= 0.24.12-1),
+ fink (>= 0.32),
gettext-bin,
gettext-tools,
gtk-doc (>= 1.13-5),
@@ -19,6 +18,8 @@
libiconv-dev,
pkgconfig (>= 0.25)
<<
+# this package is busted on many platforms
+BuildConflicts: libffi
Depends: <<
dbus (>= 1.2.1-1),
libgettext8-shlibs,
@@ -30,17 +31,18 @@
shared-mime-info (>= 0.51-1)
<<
Replaces: glib2 (<< 2.12.0-1)
-Source: mirror:gnome:sources/glib/2.28/glib-%v.tar.bz2
-Source-MD5: feda1650c8646ad39c7b01d95b03766b
+Source: mirror:gnome:sources/glib/2.32/glib-%v.tar.xz
+Source-MD5: c5fa76fbf9184d20dfb04af66b598190
PatchFile: %n.patch
-PatchFile-MD5: 96002ecbcd68aebf5c8b7405f0f8d325
+PatchFile-MD5: 8f094c69c6751dba889e115d7729c8a1
PatchScript: <<
sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
-# perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g'
docs/reference/*/html/*.html
+ perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g'
docs/reference/*/html/*.html
perl -pi -e 's/-version-info/-no-undefined -version-info/' */Makefile.in
+ perl -pi -e 's/elf_begin/elf_begin_is_not_a_sufficient_test_here/'
configure
<<
SetCFLAGS: -Os
-ConfigureParams: --mandir=%p/share/man --enable-gtk-doc
--disable-dependency-tracking --disable-fam
+ConfigureParams: --mandir=%p/share/man --disable-gtk-doc
--enable-dependency-tracking --disable-fam
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
LIBFFI_CFLAGS="-I/usr/include/ffi" LIBFFI_LIBS="-lffi"
CompileScript: <<
PERL_PATH=/usr/bin/perl PERL=/usr/bin/perl ./configure %c
PYTHON=/usr/bin/python
perl -pi -e '$_="#define BROKEN_POLL 1\n" if /BROKEN_POLL/' config.h
@@ -132,11 +134,6 @@
<<
<<
Description: Handy library of utility functions
-DescUsage: <<
-Note: timezone lookups by name ("EDT", "US/Eastern") does not work but
-explicit offsets ("-04:00") does work. This new gdate interface does
-not have good error-checking in any case.
-<<
DescPort: <<
glib2 provides etc/glib-2.0/charset.alias for darwin because there's
no system-wide charset.alias.
@@ -148,9 +145,6 @@
check uses some C++ but it doesn't leak out into the installed
package
- 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
@@ -181,18 +175,26 @@
http://bugzilla.gnome.org/show_bug.cgi?id=566994
Flag is not passed at all via .la now, but okay because we
don't have static libs and the shared libs get what they need
- via dyld.
+ via dyld. See:
+ https://bugzilla.gnome.org/show_bug.cgi?id=668152
Not fixing RTLD_GLOBAL configure test. See:
http://bugzilla.gnome.org/show_bug.cgi?id=583010
- libgio needs libresolv to get _res_9_* symbols. See:
- https://bugzilla.gnome.org/show_bug.cgi?id=606857
+ String sorting ("collation") is broken on x86_64. See:
+ https://bugzilla.gnome.org/show_bug.cgi?id=673047
+ for potential fix.
- Some timezone lookups fail (return "0"). Not fixing (new
- interface, so not a regression; upstream seems uninterested in
- getting it fixed), so disabling its test suite. See:
+ Fix timezone-file lookups, using patch from Comment #5 at
https://bugzilla.gnome.org/show_bug.cgi?id=644473
+ Doesn't fix all datetime self-tests yet
+
+ Detection of Carbon activates gio/gnextstepsettingsbackend.c,
+ which uses the Foundation framework. See:
+ https://bugzilla.gnome.org/show_bug.cgi?id=673250
+
+ Disable libelf support. See:
+ https://bugzilla.gnome.org/show_bug.cgi?id=673253
<<
DescPackaging: <<
Library contains some C symbols whose real name looks like C++
@@ -209,31 +211,32 @@
Builds with included pcre instead of external lib to avoid need to
cascade deps on pcre packages
- gtester-report claims to require python >= 2.4, but it appears
- to run with 2.3. Adjust to allow that version so can use
- Apple's on OS X < 10.5 also (py2.5 comes with OS X 10.5). See:
- http://bugzilla.gnome.org/show_bug.cgi?id=553716
-
- The following are newly deprecated in glib2 2.18.1 since 2.14.6:
- g_assert_warning
- G_GNUC_FUNCTION
- G_GNUC_PRETTY_FUNCTION
- And in 2.20:
- g_volume_monitor_adopt_orphan_mount
- And in 2.22:
- g_drive_eject
- g_drive_eject_finish
- g_file_unmount_mountable
- g_file_unmount_mountable_finish
- g_file_eject_mountable
- g_file_eject_mountable_finish
- g_mount_unmount
- g_mount_unmount_finish
- g_volume_eject
- g_volume_eject_finish
- External packages and out-of-sync gnome core might still be
- using them, so may as well leave them undeprecated until jump
- to glib3.
+# The following are newly deprecated in glib2 2.18.1 since 2.14.6:
+# g_assert_warning
+# G_GNUC_FUNCTION
+# G_GNUC_PRETTY_FUNCTION
+# And in 2.20:
+# g_volume_monitor_adopt_orphan_mount
+# And in 2.22:
+# g_drive_eject
+# g_drive_eject_finish
+# g_file_unmount_mountable
+# g_file_unmount_mountable_finish
+# g_file_eject_mountable
+# g_file_eject_mountable_finish
+# g_mount_unmount
+# g_mount_unmount_finish
+# g_volume_eject
+# g_volume_eject_finish
+# External packages and out-of-sync gnome core might still be
+# using them, so may as well leave them undeprecated until jump
+# to glib3.
+^-- glib3 isn't expected ever; it's documented that G_DISABLE_* are
+documented as useful and the deprecations are well-documented as well.
+Making stable releases of other packages that fail (!=warn) when doing
+something valid but deprecated is known to be a poor approach. Too
+crazy to keep trying to track all the deprecations over many years
+here.
Leaving G_DISABLE_SINGLE_INCLUDES undefined in most places,
though in the future it will become defined...
@@ -261,15 +264,13 @@
Make sure the update-*-database programs can be found even if
run from a non-fink'ed shell: explicit path and fink XDG vars.
+ See also: https://bugzilla.gnome.org/show_bug.cgi?id=673135
-# Regenerating gtk-doc files The Right Way (--enable-gtk-doc) is
-# very slow, so just patch the prefix in the bad URLs in the
-# existing generated files.
- 2.22.4 generated docs include leakage from overly-public
- entries in libcamel, so have to regenerate:/
-
- Improve cross-linking among gtk-doc for glib/gobject/gio. See:
- https://bugzilla.gnome.org/show_bug.cgi?id=644687
+ Regenerating gtk-doc files The Right Way (--enable-gtk-doc) is
+ very slow, so just patch the prefix in the bad URLs in the
+ existing generated files.
+# 2.22.4 generated docs include leakage from overly-public
+# entries in libcamel, so have to regenerate:/
Don't install gdb files. They aren't named correctly and it's
not clear they are usable on darwin. See:
@@ -282,11 +283,15 @@
Reduces BuildDepends inheritance of things that are not in
public interface.
+ Fink's libffi package is busted on many platforms and OS X has
+ a libffi, so use system's: BCon:libffi and hardcode compiler
+ flags (system's has no .pc)
+
Cannot run volume-monitor test as nobody because monitor
daemon is owned by logged in user, or at all because we don't
have a functional gvfs-hal-volume-monitor
- pollable/unix hangs...sometimes. Disabling.
+ pollable/unix hangs...sometimes? Should disable?
<<
License: LGPL
Maintainer: The Gnome Core Team <[email protected]>
Index: glib2-shlibs.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/glib2-shlibs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glib2-shlibs.patch 22 Jun 2011 15:49:58 -0000 1.4
+++ glib2-shlibs.patch 31 Mar 2012 20:04:17 -0000 1.5
@@ -1,33 +1,16 @@
-diff -Nurd -x'*~' glib-2.28.7.orig/configure glib-2.28.7/configure
---- glib-2.28.7.orig/configure 2011-05-21 00:15:25.000000000 -0400
-+++ glib-2.28.7/configure 2011-06-22 09:24:47.000000000 -0400
-@@ -5113,7 +5113,7 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/configure glib-2.32.0/configure
+--- glib-2.32.0.orig/configure 2012-03-23 23:02:40.000000000 -0400
++++ glib-2.32.0/configure 2012-03-31 14:02:26.000000000 -0400
+@@ -5245,7 +5245,7 @@
$as_echo "#define HAVE_CARBON 1" >>confdefs.h
- LDFLAGS="$LDFLAGS -framework Carbon"
-+ LDFLAGS="$LDFLAGS -Wl,-framework,Carbon"
++ LDFLAGS="$LDFLAGS -Wl,-framework,Carbon -Wl,-framework,Foundation"
fi
-
-@@ -7096,13 +7096,13 @@
-
- if test -n "$PYTHON"; then
- # If the user set $PYTHON, use it and don't search something else.
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON
version >= 2.4" >&5
--$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON
version >= 2.3" >&5
-+$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
- prog="import sys
- # split strings by '.' and convert to numeric. Append some zeros
- # because we need at least 4 digits for the hex conversion.
- # map returns an iterator in Python 3.0 and a list in 2.x
--minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
-+minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]
- minverhex = 0
- # xrange is not present in Python 3.0 and range returns an iterator
- for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-@@ -25692,6 +25692,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long
lines and -e" >&5
+@@ -26230,6 +26230,9 @@
G_THREAD_CFLAGS="-D_THREAD_SAFE"
fi
;;
@@ -37,46 +20,10 @@
*-dg-dgux*) # DG/UX
G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"
;;
-diff -Nurd -x'*~' glib-2.28.7.orig/docs/reference/gio/Makefile.in
glib-2.28.7/docs/reference/gio/Makefile.in
---- glib-2.28.7.orig/docs/reference/gio/Makefile.in 2011-05-21
00:15:21.000000000 -0400
-+++ glib-2.28.7/docs/reference/gio/Makefile.in 2011-06-22 09:24:47.000000000
-0400
-@@ -495,6 +495,9 @@
- version.xml.in \
- gvfs-overview.odg
-
-+# Extra options to supply to gtkdoc-fixref
-+FIXXREF_OPTIONS = --extra-dir=$(srcdir)/../glib/html
--extra-dir=$(srcdir)/../gobject/html
-+
- @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile
$(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS)
$(AM_LDFLAGS) $(LDFLAGS)
-diff -Nurd -x'*~' glib-2.28.7.orig/docs/reference/glib/Makefile.in
glib-2.28.7/docs/reference/glib/Makefile.in
---- glib-2.28.7.orig/docs/reference/glib/Makefile.in 2011-05-21
00:15:21.000000000 -0400
-+++ glib-2.28.7/docs/reference/glib/Makefile.in 2011-06-22
09:24:47.000000000 -0400
-@@ -409,7 +409,7 @@
-
-
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS =
-+FIXXREF_OPTIONS = --extra-dir=$(srcdir)/../gobject/html
--extra-dir=$(srcdir)/../gio/html
- @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile
$(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS)
$(AM_LDFLAGS) $(LDFLAGS)
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/Makefile.in glib-2.28.7/gio/Makefile.in
---- glib-2.28.7.orig/gio/Makefile.in 2011-05-21 00:15:22.000000000 -0400
-+++ glib-2.28.7/gio/Makefile.in 2011-06-22 09:24:47.000000000 -0400
-@@ -928,6 +928,7 @@
- $(SELINUX_LIBS) \
- $(GLIB_LIBS) \
- $(XATTR_LIBS) \
-+ -lresolv \
- $(NULL)
-
- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gdbusaddress.c
glib-2.28.7/gio/gdbusaddress.c
---- glib-2.28.7.orig/gio/gdbusaddress.c 2011-05-20 23:29:24.000000000
-0400
-+++ glib-2.28.7/gio/gdbusaddress.c 2011-06-22 09:24:47.000000000 -0400
-@@ -1208,7 +1208,7 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/gio/gdbusaddress.c
glib-2.32.0/gio/gdbusaddress.c
+--- glib-2.32.0.orig/gio/gdbusaddress.c 2012-03-17 22:35:25.000000000
-0400
++++ glib-2.32.0/gio/gdbusaddress.c 2012-03-31 15:38:04.000000000 -0400
+@@ -1221,7 +1221,7 @@
ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
if (ret == NULL)
{
@@ -85,28 +32,31 @@
}
break;
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gdbusprivate.c
glib-2.28.7/gio/gdbusprivate.c
---- glib-2.28.7.orig/gio/gdbusprivate.c 2011-05-20 23:29:24.000000000
-0400
-+++ glib-2.28.7/gio/gdbusprivate.c 2011-06-22 09:24:47.000000000 -0400
-@@ -1760,12 +1760,12 @@
- gchar *ret;
+diff -Nurd -x'*~' glib-2.32.0.orig/gio/gdbusprivate.c
glib-2.32.0/gio/gdbusprivate.c
+--- glib-2.32.0.orig/gio/gdbusprivate.c 2012-03-17 22:35:25.000000000
-0400
++++ glib-2.32.0/gio/gdbusprivate.c 2012-03-31 15:39:33.000000000 -0400
+@@ -2053,7 +2053,7 @@
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
+ first_error = NULL;
- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+ if (!g_file_get_contents ("@PREFIX@/var/lib/dbus/machine-id",
&ret,
NULL,
- error))
+ &first_error) &&
+@@ -2063,7 +2063,7 @@
+ NULL))
{
-- g_prefix_error (error, _("Unable to load /var/lib/dbus/machine-id: "));
-+ g_prefix_error (error, _("Unable to load
@PREFIX@/var/lib/dbus/machine-id: "));
+ g_propagate_prefixed_error (error, first_error,
+- _("Unable to load /var/lib/dbus/machine-id
or /etc/machine-id: "));
++ _("Unable to load
@PREFIX@/var/lib/dbus/machine-id or /etc/machine-id: "));
}
else
{
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gdesktopappinfo.c
glib-2.28.7/gio/gdesktopappinfo.c
---- glib-2.28.7.orig/gio/gdesktopappinfo.c 2011-05-20 23:30:15.000000000
-0400
-+++ glib-2.28.7/gio/gdesktopappinfo.c 2011-06-22 09:24:47.000000000 -0400
-@@ -1721,7 +1721,7 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/gio/gdesktopappinfo.c
glib-2.32.0/gio/gdesktopappinfo.c
+--- glib-2.32.0.orig/gio/gdesktopappinfo.c 2012-03-11 20:42:39.000000000
-0400
++++ glib-2.32.0/gio/gdesktopappinfo.c 2012-03-31 12:33:55.000000000 -0400
+@@ -1928,7 +1928,7 @@
g_file_set_contents (filename, contents, -1, NULL);
g_free (contents);
@@ -115,7 +65,7 @@
}
g_free (filename);
-@@ -1860,7 +1860,7 @@
+@@ -2074,7 +2074,7 @@
info->filename = filename;
info->desktop_id = desktop_id;
@@ -124,55 +74,10 @@
return TRUE;
}
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gdrive.h glib-2.28.7/gio/gdrive.h
---- glib-2.28.7.orig/gio/gdrive.h 2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.7/gio/gdrive.h 2011-06-22 09:24:47.000000000 -0400
-@@ -164,7 +164,7 @@
- gboolean g_drive_is_media_check_automatic (GDrive *drive);
- gboolean g_drive_can_poll_for_media (GDrive *drive);
- gboolean g_drive_can_eject (GDrive *drive);
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
- void g_drive_eject (GDrive *drive,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gfile.h glib-2.28.7/gio/gfile.h
---- glib-2.28.7.orig/gio/gfile.h 2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.7/gio/gfile.h 2011-06-22 09:24:47.000000000 -0400
-@@ -869,7 +869,7 @@
- GFile * g_file_mount_mountable_finish (GFile
*file,
- GAsyncResult
*result,
- GError
**error);
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
- void g_file_unmount_mountable (GFile
*file,
- GMountUnmountFlags
flags,
- GCancellable
*cancellable,
-@@ -888,7 +888,7 @@
- gboolean g_file_unmount_mountable_with_operation_finish (GFile
*file,
- GAsyncResult
*result,
- GError
**error);
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
- void g_file_eject_mountable (GFile
*file,
- GMountUnmountFlags
flags,
- GCancellable
*cancellable,
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gmount.h glib-2.28.7/gio/gmount.h
---- glib-2.28.7.orig/gio/gmount.h 2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.7/gio/gmount.h 2011-06-22 09:24:47.000000000 -0400
-@@ -170,7 +170,7 @@
- gboolean g_mount_can_unmount (GMount *mount);
- gboolean g_mount_can_eject (GMount *mount);
-
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
- void g_mount_unmount (GMount *mount,
- GMountUnmountFlags flags,
- GCancellable
*cancellable,
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gunixmounts.c
glib-2.28.7/gio/gunixmounts.c
---- glib-2.28.7.orig/gio/gunixmounts.c 2011-01-17 15:54:00.000000000 -0500
-+++ glib-2.28.7/gio/gunixmounts.c 2011-06-22 09:24:47.000000000 -0400
-@@ -243,6 +243,7 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/gio/gunixmounts.c
glib-2.32.0/gio/gunixmounts.c
+--- glib-2.32.0.orig/gio/gunixmounts.c 2012-03-17 22:35:25.000000000 -0400
++++ glib-2.32.0/gio/gunixmounts.c 2012-03-31 15:44:44.000000000 -0400
+@@ -271,6 +271,7 @@
"/sbin",
"/net",
"/sys",
@@ -180,45 +85,21 @@
NULL
};
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gvolume.h glib-2.28.7/gio/gvolume.h
---- glib-2.28.7.orig/gio/gvolume.h 2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.7/gio/gvolume.h 2011-06-22 09:24:47.000000000 -0400
-@@ -180,7 +180,7 @@
- gboolean g_volume_mount_finish (GVolume *volume,
- GAsyncResult *result,
- GError **error);
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
- void g_volume_eject (GVolume *volume,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/gvolumemonitor.h
glib-2.28.7/gio/gvolumemonitor.h
---- glib-2.28.7.orig/gio/gvolumemonitor.h 2010-09-27 14:48:33.000000000
-0400
-+++ glib-2.28.7/gio/gvolumemonitor.h 2011-06-22 09:24:47.000000000 -0400
-@@ -141,7 +141,7 @@
- GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor
*volume_monitor,
- const char *uuid);
-
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
- GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount);
- #endif
-
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/tests/Makefile.in
glib-2.28.7/gio/tests/Makefile.in
---- glib-2.28.7.orig/gio/tests/Makefile.in 2011-05-21 00:15:22.000000000
-0400
-+++ glib-2.28.7/gio/tests/Makefile.in 2011-06-22 10:41:25.000000000 -0400
-@@ -763,7 +763,7 @@
- memory-output-stream readwrite g-file g-file-info \
- converter-stream data-input-stream data-output-stream g-icon \
+diff -Nurd -x'*~' glib-2.32.0.orig/gio/tests/Makefile.in
glib-2.32.0/gio/tests/Makefile.in
+--- glib-2.32.0.orig/gio/tests/Makefile.in 2012-03-23 23:02:44.000000000
-0400
++++ glib-2.32.0/gio/tests/Makefile.in 2012-03-31 15:49:16.000000000 -0400
+@@ -958,7 +958,7 @@
+ readwrite g-file g-file-info converter-stream \
+ data-input-stream data-output-stream g-icon \
buffered-input-stream buffered-output-stream sleepy-stream \
- filter-streams volumemonitor simple-async-result srvtarget \
+ filter-streams simple-async-result srvtarget \
contexts gsettings gschema-compile async-close-output-stream \
gdbus-addresses network-address gdbus-message socket pollable \
- $(NULL) $(am__append_1) $(am__append_3) $(am__append_4)
-diff -Nurd -x'*~' glib-2.28.7.orig/gio/xdgmime/xdgmime.c
glib-2.28.7/gio/xdgmime/xdgmime.c
---- glib-2.28.7.orig/gio/xdgmime/xdgmime.c 2010-09-27 14:48:33.000000000
-0400
-+++ glib-2.28.7/gio/xdgmime/xdgmime.c 2011-06-22 09:24:47.000000000 -0400
+ tls-certificate tls-interaction cancellable vfs \
+diff -Nurd -x'*~' glib-2.32.0.orig/gio/xdgmime/xdgmime.c
glib-2.32.0/gio/xdgmime/xdgmime.c
+--- glib-2.32.0.orig/gio/xdgmime/xdgmime.c 2011-08-15 20:51:30.000000000
-0400
++++ glib-2.32.0/gio/xdgmime/xdgmime.c 2012-03-31 12:55:37.000000000 -0400
@@ -257,7 +257,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
@@ -228,36 +109,10 @@
ptr = xdg_data_dirs;
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/gmacros.h glib-2.28.7/glib/gmacros.h
---- glib-2.28.7.orig/glib/gmacros.h 2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.7/glib/gmacros.h 2011-06-22 09:24:47.000000000 -0400
-@@ -127,7 +127,8 @@
- #define G_GNUC_WARN_UNUSED_RESULT
- #endif /* __GNUC__ */
-
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
-+/* don't supress (if G_DISABLE_DEPRECATED) for fink yet */
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
- * usage not-recommended since gcc-3.0
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/gmessages.h
glib-2.28.7/glib/gmessages.h
---- glib-2.28.7.orig/glib/gmessages.h 2010-09-27 14:48:33.000000000 -0400
-+++ glib-2.28.7/glib/gmessages.h 2011-06-22 09:24:47.000000000 -0400
-@@ -121,7 +121,8 @@
- int line,
- const char *func,
- const char *warnexpr);
--#ifndef G_DISABLE_DEPRECATED
-+#if 1
-+/* don't supress (if G_DISABLE_DEPRECATED) for fink yet */
- void g_assert_warning (const char *log_domain,
- const char *file,
- const int line,
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/gslice.c glib-2.28.7/glib/gslice.c
---- glib-2.28.7.orig/glib/gslice.c 2011-05-20 23:29:24.000000000 -0400
-+++ glib-2.28.7/glib/gslice.c 2011-06-22 09:24:47.000000000 -0400
-@@ -1153,19 +1153,18 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/glib/gslice.c glib-2.32.0/glib/gslice.c
+--- glib-2.32.0.orig/glib/gslice.c 2012-03-11 20:42:42.000000000 -0400
++++ glib-2.32.0/glib/gslice.c 2012-03-31 12:47:04.000000000 -0400
+@@ -1376,19 +1376,18 @@
gsize memsize)
{
gpointer aligned_memory = NULL;
@@ -281,7 +136,7 @@
mem_assert (alignment == sys_page_size);
mem_assert (memsize <= sys_page_size);
if (!compat_valloc_trash)
-@@ -1184,9 +1183,9 @@
+@@ -1407,9 +1406,9 @@
}
}
aligned_memory = g_trash_stack_pop (&compat_valloc_trash);
@@ -292,10 +147,73 @@
return aligned_memory;
}
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/gutils.c glib-2.28.7/glib/gutils.c
---- glib-2.28.7.orig/glib/gutils.c 2011-05-20 23:29:24.000000000 -0400
-+++ glib-2.28.7/glib/gutils.c 2011-06-22 09:24:47.000000000 -0400
-@@ -2935,7 +2935,7 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/glib/gtimezone.c
glib-2.32.0/glib/gtimezone.c
+--- glib-2.32.0.orig/glib/gtimezone.c 2012-03-11 20:42:42.000000000 -0400
++++ glib-2.32.0/glib/gtimezone.c 2012-03-31 15:53:07.000000000 -0400
+@@ -168,8 +168,12 @@
+ G_UNLOCK(time_zones);
+ }
+
+- if (tz->zoneinfo)
++ if (tz->zoneinfo) {
++ if (tz->header && tz->header->tzh_version != '2')
++ g_free (tz->trans);
++
+ g_bytes_unref (tz->zoneinfo);
++ }
+
+ g_free (tz->name);
+
+@@ -408,13 +412,13 @@
+ gsize size;
+ const struct tzhead *header = g_bytes_get_data (tz->zoneinfo,
&size);
+
+- /* we only bother to support version 2 */
+- if (size < sizeof (struct tzhead) || memcmp (header, "TZif2", 5))
++ /* check that it is a TZif file */
++ if (size < sizeof (struct tzhead) || memcmp (header, "TZif", 4))
+ {
+ g_bytes_unref (tz->zoneinfo);
+ tz->zoneinfo = NULL;
+ }
+- else
++ else if (header->tzh_version == '2') /* version 2 */
+ {
+ gint typecnt;
+
+@@ -435,6 +439,28 @@
+ tz->infos = (gconstpointer) (tz->indices + tz->timecnt);
+ tz->abbrs = (gconstpointer) (tz->infos + typecnt);
+ }
++ else /* assume version 1 */
++ {
++ gint typecnt, i;
++
++ /* use first header */
++ tz->header = header;
++ typecnt = guint32_from_be (tz->header->tzh_typecnt);
++ tz->timecnt = guint32_from_be (tz->header->tzh_timecnt);
++
++ /* in version 1, transition times are 4 bytes long, so we need
to convert them */
++ const gint32_be *trans32 = (gconstpointer) (tz->header + 1);
++ gint64_be *trans64 = g_malloc (sizeof (*tz->trans) *
tz->timecnt);
++ for (i = 0; i < tz->timecnt; i++) {
++ gint64 tmp = GINT64_TO_BE (gint32_from_be (trans32[i]));
++ memcpy (&trans64[i], &tmp, sizeof tmp);
++ }
++ tz->trans = trans64;
++
++ tz->indices = (gconstpointer) (trans32 + tz->timecnt);
++ tz->infos = (gconstpointer) (tz->indices + tz->timecnt);
++ tz->abbrs = (gconstpointer) (tz->infos + typecnt);
++ }
+ }
+
+ if (identifier)
+diff -Nurd -x'*~' glib-2.32.0.orig/glib/gutils.c glib-2.32.0/glib/gutils.c
+--- glib-2.32.0.orig/glib/gutils.c 2012-03-11 20:42:42.000000000 -0400
++++ glib-2.32.0/glib/gutils.c 2012-03-31 12:56:52.000000000 -0400
+@@ -1991,7 +1991,7 @@
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])
@@ -304,7 +222,7 @@
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-@@ -2997,7 +2997,7 @@
+@@ -2053,7 +2053,7 @@
conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
if (!conf_dirs || !conf_dirs[0])
@@ -313,10 +231,10 @@
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/gutils.h glib-2.28.7/glib/gutils.h
---- glib-2.28.7.orig/glib/gutils.h 2011-01-06 22:13:19.000000000 -0500
-+++ glib-2.28.7/glib/gutils.h 2011-06-22 09:24:47.000000000 -0400
-@@ -101,7 +101,11 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/glib/gutils.h glib-2.32.0/glib/gutils.h
+--- glib-2.32.0.orig/glib/gutils.h 2012-03-11 20:42:42.000000000 -0400
++++ glib-2.32.0/glib/gutils.h 2012-03-31 12:57:13.000000000 -0400
+@@ -77,7 +77,11 @@
# define G_INLINE_FUNC
# undef G_CAN_INLINE
#elif defined (__GNUC__)
@@ -328,10 +246,10 @@
#elif defined (G_CAN_INLINE)
# define G_INLINE_FUNC static inline
#else /* can't inline */
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/libcharset/Makefile.in
glib-2.28.7/glib/libcharset/Makefile.in
---- glib-2.28.7.orig/glib/libcharset/Makefile.in 2011-05-21
00:15:23.000000000 -0400
-+++ glib-2.28.7/glib/libcharset/Makefile.in 2011-06-22 09:24:47.000000000
-0400
-@@ -332,7 +332,7 @@
+diff -Nurd -x'*~' glib-2.32.0.orig/glib/libcharset/Makefile.in
glib-2.32.0/glib/libcharset/Makefile.in
+--- glib-2.32.0.orig/glib/libcharset/Makefile.in 2012-03-23
23:02:45.000000000 -0400
++++ glib-2.32.0/glib/libcharset/Makefile.in 2012-03-31 12:48:19.000000000
-0400
+@@ -341,7 +341,7 @@
codeset.m4 update.sh make-patch.sh libcharset-glib.patch
TEST_PROGS =
INCLUDES = \
@@ -340,7 +258,7 @@
noinst_LTLIBRARIES = libcharset.la
libcharset_la_SOURCES = \
-@@ -340,8 +340,8 @@
+@@ -349,8 +349,8 @@
localcharset.h \
localcharset.c
@@ -351,7 +269,7 @@
SUFFIXES = .sed .sin
CLEANFILES = charset.alias ref-add.sed ref-del.sed
all: all-am
-@@ -713,7 +713,7 @@
+@@ -727,7 +727,7 @@
# run tests in cwd as part of make check
check-local: test-nonrecursive
install-exec-local: all-local
@@ -360,9 +278,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.28.7.orig/glib/libcharset/charset.alias
glib-2.28.7/glib/libcharset/charset.alias
---- glib-2.28.7.orig/glib/libcharset/charset.alias 1969-12-31
19:00:00.000000000 -0500
-+++ glib-2.28.7/glib/libcharset/charset.alias 2011-06-22 09:24:47.000000000
-0400
+diff -Nurd -x'*~' glib-2.32.0.orig/glib/libcharset/charset.alias
glib-2.32.0/glib/libcharset/charset.alias
+--- glib-2.32.0.orig/glib/libcharset/charset.alias 1969-12-31
19:00:00.000000000 -0500
++++ glib-2.32.0/glib/libcharset/charset.alias 2012-03-31 12:50:36.000000000
-0400
@@ -0,0 +1,111 @@
+# This file contains a table of character encoding aliases,
+# suitable for operating system 'darwin'.
@@ -475,21 +393,9 @@
+zh_CN.EUC GB2312
+zh_TW UTF-8
+zh_TW.Big5 BIG5
-diff -Nurd -x'*~' glib-2.28.7.orig/glib/tests/Makefile.in
glib-2.28.7/glib/tests/Makefile.in
---- glib-2.28.7.orig/glib/tests/Makefile.in 2011-05-21 00:15:23.000000000
-0400
-+++ glib-2.28.7/glib/tests/Makefile.in 2011-06-22 10:42:47.000000000 -0400
-@@ -506,7 +506,7 @@
- mem-overflow utils regex base64 sequence scannerapi shell \
- collate utf8-pointer utf8-validate utf8-misc checksum hash \
- date node convert list slist queue tree uri dir pattern \
-- logging error bookmarkfile gdatetime timeout environment
-+ logging error bookmarkfile timeout environment
- INCLUDES = \
- -g \
- $(glib_INCLUDES) \
-diff -Nurd -x'*~' glib-2.28.7.orig/glib-gettextize.in
glib-2.28.7/glib-gettextize.in
---- glib-2.28.7.orig/glib-gettextize.in 2010-09-27 14:48:33.000000000
-0400
-+++ glib-2.28.7/glib-gettextize.in 2011-06-22 09:24:47.000000000 -0400
+diff -Nurd -x'*~' glib-2.32.0.orig/glib-gettextize.in
glib-2.32.0/glib-gettextize.in
+--- glib-2.32.0.orig/glib-gettextize.in 2011-08-15 20:51:30.000000000
-0400
++++ glib-2.32.0/glib-gettextize.in 2012-03-31 12:50:36.000000000 -0400
@@ -49,8 +49,8 @@
;;
esac
@@ -500,15 +406,3 @@
gettext_dir=$prefix/share/glib-2.0/gettext
-diff -Nurd -x'*~' glib-2.28.7.orig/tests/child-test.c
glib-2.28.7/tests/child-test.c
---- glib-2.28.7.orig/tests/child-test.c 2010-09-27 14:48:34.000000000
-0400
-+++ glib-2.28.7/tests/child-test.c 2011-06-22 09:24:47.000000000 -0400
-@@ -175,7 +175,7 @@
- #ifdef G_OS_WIN32
- system ("ipconfig /all");
- #else
-- system ("/bin/true");
-+ system ("/usr/bin/true");
- #endif
-
- alive = 2;
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
