glib 2.32.4 with OpenCSW patches; now buildable only for 32

25 files changed, 863 insertions, 0 deletions

diff --git a/glib/Makefile b/glib/Makefile
new file mode 100644
index 0000000..8c32332
--- /dev/null
+++ b/glib/Makefile
@@ -0,0 +1,48 @@
+include /usr/share/cibs/rules/32.mk
+include /usr/share/cibs/rules/archive.mk
+include /usr/share/cibs/rules/autoreconf.mk
+include /usr/share/cibs/rules/autotools.mk
+include /usr/share/cibs/rules/copy.mk
+include /usr/share/cibs/rules/ips.mk
+include /usr/share/cibs/rules/patch.mk
+
+summary := library of containing many useful C routines for things such as trees, hashes, lists, and strings.
+license := LGPL
+license-file := COPYING.LIB
+
+build-depends += \
+	compress/xz \
+	library/pcre \
+	library/libffi \
+	runtime/python
+
+configure-env.32 = DTRACE="dtrace -32"
+configure-env.64 = DTRACE="dtrace -64"
+
+# glib requires >= i486
+CFLAGS.32 += -march=i686
+
+# Funny, dtrace is not supported on illumos/solaris.
+configure-options += \
+	 --with-pcre=system \
+	 --disable-systemtap \
+	 --disable-dtrace
+
+# See https://www.illumos.org/issues/3263,
+# https://www.illumos.org/issues/1587.
+# Solved: https://github.com/illumos/illumos-gate/commit/4d1bea1
+configure-options.32 = \
+	--disable-largefile
+
+name     := glib
+home     := http://www.gnu.org/software/$(name)/
+release  := 2.32
+version  := $(release).4
+archive  := $(name)-$(version).tar.xz
+download := http://ftp.gnome.org/pub/gnome/sources/$(name)/$(release)/$(archive)
+checksum := \
+     md5:bf84fefd9c1a5b5a7a38736f4ddd674a \
+    sha1:5b6481cbb34f560e8ea78887200b6b7f5448dcb4 \
+  sha256:a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 \
+    size:6178556
+
diff --git a/glib/glib.p5m b/glib/glib.p5m
new file mode 100644
index 0000000..7192a5a
--- /dev/null
+++ b/glib/glib.p5m
@@ -0,0 +1,7 @@
+set name=pkg.fmri value=pkg:/library/$(name)@$(ips-version)
+set name=pkg.summary value="$(summary)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license=$(license)
+
diff --git a/glib/patches/0001-Remove-pthread-from-LDFLAGS.patch b/glib/patches/0001-Remove-pthread-from-LDFLAGS.patch
new file mode 100644
index 0000000..c0e55fe
--- /dev/null
+++ b/glib/patches/0001-Remove-pthread-from-LDFLAGS.patch
@@ -0,0 +1,25 @@
+From 8190e5963ceee1e8e85f5ed76fe34a1d5dca7491 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Thu, 23 Aug 2012 14:06:14 +0200
+Subject: [PATCH] Remove -pthread from LDFLAGS.
+
+---
+ glib/tests/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/tests/Makefile.in b/glib/tests/Makefile.in
+index 87ed831..9da054b 100644
+--- a/glib/tests/Makefile.in
++++ b/glib/tests/Makefile.in
+@@ -818,7 +818,7 @@ gwakeup_LDADD = $(progs_ldadd)
+ @HAVE_EVENTFD_TRUE@gwakeup_fallback_SOURCES = gwakeuptest.c ../../glib/gwakeup.c
+ @HAVE_EVENTFD_TRUE@gwakeup_fallback_CFLAGS = $(AM_CFLAGS) -DTEST_EVENTFD_FALLBACK
+ @HAVE_EVENTFD_TRUE@gwakeup_fallback_LDADD = $(progs_ldadd)
+-@OS_UNIX_TRUE@private_LDFLAGS = -pthread
++@OS_UNIX_TRUE@private_LDFLAGS = 
+ @OS_UNIX_TRUE@unix_multithreaded_SOURCES = $(top_srcdir)/glib/tests/unix.c
+ @OS_UNIX_TRUE@unix_multithreaded_CFLAGS = -DTEST_THREADED
+ @OS_UNIX_TRUE@unix_multithreaded_LDADD = $(progs_ldadd)
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0002-gio-gsocket.c-FIONREAD-undefined.patch b/glib/patches/0002-gio-gsocket.c-FIONREAD-undefined.patch
new file mode 100644
index 0000000..8aecb41
--- /dev/null
+++ b/glib/patches/0002-gio-gsocket.c-FIONREAD-undefined.patch
@@ -0,0 +1,27 @@
+Index: glib/configure.ac
+===================================================================
+--- glib.orig/configure.ac
++++ glib/configure.ac
+@@ -887,6 +887,7 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h
+ AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h])
+ AC_CHECK_HEADERS([linux/magic.h])
+ AC_CHECK_HEADERS([sys/prctl.h])
++AC_CHECK_HEADERS([sys/filio.h])
+ 
+ AC_CHECK_HEADERS([sys/mount.h sys/sysctl.h], [], [],
+ [#if HAVE_SYS_PARAM_H
+Index: glib/gio/gsocket.c
+===================================================================
+--- glib.orig/gio/gsocket.c
++++ glib/gio/gsocket.c
+@@ -48,6 +48,10 @@
+ #include <sys/uio.h>
+ #endif
+ 
++#ifdef HAVE_SYS_FILIO_H
++#include <sys/filio.h>
++#endif
++
+ #include "gcancellable.h"
+ #include "gioenumtypes.h"
+ #include "ginetaddress.h"
diff --git a/glib/patches/0003-Ad-hoc-macro-for-comparing-double.patch b/glib/patches/0003-Ad-hoc-macro-for-comparing-double.patch
new file mode 100644
index 0000000..514fe59
--- /dev/null
+++ b/glib/patches/0003-Ad-hoc-macro-for-comparing-double.patch
@@ -0,0 +1,59 @@
+From 245185574891f902a86c086bc20d8a327d43b455 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Tue, 6 Sep 2011 22:21:20 +0200
+Subject: [PATCH] Ad hoc macro for comparing double
+
+g_assert_cmpfloat uses long double, but values checked are double.
+---
+ gobject/tests/binding.c |   17 +++++++++++++----
+ 1 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/gobject/tests/binding.c b/gobject/tests/binding.c
+index 31993f3..0dff9e5 100644
+--- a/gobject/tests/binding.c
++++ b/gobject/tests/binding.c
+@@ -2,6 +2,15 @@
+ #include <gstdio.h>
+ #include <glib-object.h>
+ 
++#ifdef __sun
++#define g_assert_cmpdouble(n1,cmp,n2) \
++  do { double __n1 = (n1), __n2 = (n2);					\
++    if (__n1 cmp __n2) ; else						\
++      g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
++				  #n1 " " #cmp " " #n2, __n1, #cmp, __n2, 'f'); } while (0)
++#endif
++
++
+ typedef struct _BindingSource
+ {
+   GObject parent_instance;
+@@ -344,10 +353,10 @@ binding_transform (void)
+                                          &unused_data, data_free);
+ 
+   g_object_set (source, "value", 24.0, NULL);
+-  g_assert_cmpfloat (target->value, ==, ((9 * 24.0 / 5) + 32.0));
++  g_assert_cmpdouble (target->value, ==, ((9 * 24.0 / 5) + 32.0));
+ 
+   g_object_set (target, "value", 69.0, NULL);
+-  g_assert_cmpfloat (source->value, ==, (5 * (69.0 - 32.0) / 9));
++  g_assert_cmpdouble (source->value, ==, (5 * (69.0 - 32.0) / 9));
+ 
+   g_object_unref (source);
+   g_object_unref (target);
+@@ -375,10 +384,10 @@ binding_transform_closure (void)
+                                                   f2c_clos);
+ 
+   g_object_set (source, "value", 24.0, NULL);
+-  g_assert_cmpfloat (target->value, ==, ((9 * 24.0 / 5) + 32.0));
++  g_assert_cmpdouble (target->value, ==, ((9 * 24.0 / 5) + 32.0));
+ 
+   g_object_set (target, "value", 69.0, NULL);
+-  g_assert_cmpfloat (source->value, ==, (5 * (69.0 - 32.0) / 9));
++  g_assert_cmpdouble (source->value, ==, (5 * (69.0 - 32.0) / 9));
+ 
+   g_object_unref (source);
+   g_object_unref (target);
+-- 
+1.7.6
+
diff --git a/glib/patches/0003-Make-glib-work-with-zoneinfo-version-1.patch b/glib/patches/0003-Make-glib-work-with-zoneinfo-version-1.patch
new file mode 100644
index 0000000..dfd8180
--- /dev/null
+++ b/glib/patches/0003-Make-glib-work-with-zoneinfo-version-1.patch
@@ -0,0 +1,124 @@
+From 03edd1915e60aac86a75d4db05acf554087d17e3 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Thu, 23 Aug 2012 15:33:09 +0200
+Subject: [PATCH] Make glib work with zoneinfo version 1
+
+Glib expect zoneinfo version 2, Solaris uses zoneinfo version 1.
+
+See also
+
+ * http://cs.ucla.edu/~eggert/tz/tz-link.htm
+ * tzfile.h in ftp://elsie.nci.nih.gov/pub/tzcode2011i.tar.gz
+ * /usr/include/tzfile.h
+---
+ glib/gtimezone.c | 35 ++++++++++++++++++++++++++++++++---
+ 1 file changed, 32 insertions(+), 3 deletions(-)
+
+diff --git a/glib/gtimezone.c b/glib/gtimezone.c
+index e513f3b..d960959 100644
+--- a/glib/gtimezone.c
++++ b/glib/gtimezone.c
+@@ -122,7 +122,11 @@ struct _GTimeZone
+ 
+   const struct tzhead *header;
+   const struct ttinfo *infos;
++#ifndef __sun
+   const gint64_be     *trans;
++#else
++  const gint32_be     *trans;
++#endif
+   const guint8        *indices;
+   const gchar         *abbrs;
+   gint                 timecnt;
+@@ -272,13 +276,23 @@ parse_constant_offset (const gchar *name,
+ static GBytes *
+ zone_for_constant_offset (const gchar *name)
+ {
++#ifndef __sun
+   const gchar fake_zoneinfo_headers[] =
+     "TZif" "2..." "...." "...." "...."
+     "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0"
+     "TZif" "2..." "...." "...." "...."
+     "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\1" "\0\0\0\7";
++#else
++  const gchar fake_zoneinfo_headers[] =
++    "TZif" "\0..." "...." "...." "...."
++    "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\1" "\0\0\0\7";
++#endif
+   struct {
++#ifndef __sun
+     struct tzhead headers[2];
++#else
++    struct tzhead headers[1];
++#endif
+     struct ttinfo info;
+     gchar abbr[8];
+   } *fake;
+@@ -378,7 +392,11 @@ g_time_zone_new (const gchar *identifier)
+ 
+               tzdir = getenv ("TZDIR");
+               if (tzdir == NULL)
++#ifndef __sun
+                 tzdir = "/usr/share/zoneinfo";
++#else
++		tzdir = "/usr/share/lib/zoneinfo";
++#endif
+ 
+ 	      if (*identifier == ':')
+ 		identifier ++;
+@@ -408,8 +426,15 @@ g_time_zone_new (const gchar *identifier)
+           gsize size;
+           const struct tzhead *header = g_bytes_get_data (tz->zoneinfo, &size);
+ 
+-          /* we only bother to support version 2 */
++          /* we only bother to support version 2
++	   *
++	   * Well, I don't --raos
++	   */
++#ifndef __sun
+           if (size < sizeof (struct tzhead) || memcmp (header, "TZif2", 5))
++#else
++	  if (size < sizeof (struct tzhead) || memcmp (header, "TZif\0", 5))
++#endif
+             {
+               g_bytes_unref (tz->zoneinfo);
+               tz->zoneinfo = NULL;
+@@ -418,6 +443,7 @@ g_time_zone_new (const gchar *identifier)
+             {
+               gint typecnt;
+ 
++#ifndef __sun
+               /* we trust the file completely. */
+               tz->header = (const struct tzhead *)
+                 (((const gchar *) (header + 1)) +
+@@ -427,6 +453,9 @@ g_time_zone_new (const gchar *identifier)
+                   5 * guint32_from_be(header->tzh_timecnt) +
+                   6 * guint32_from_be(header->tzh_typecnt) +
+                   guint32_from_be(header->tzh_charcnt));
++#else
++	      tz->header = header;
++#endif
+ 
+               typecnt     = guint32_from_be (tz->header->tzh_typecnt);
+               tz->timecnt = guint32_from_be (tz->header->tzh_timecnt);
+@@ -507,7 +536,7 @@ interval_start (GTimeZone *tz,
+                 gint       interval)
+ {
+   if (interval)
+-    return gint64_from_be (tz->trans[interval - 1]);
++    return (gint64)gint32_from_be (tz->trans[interval - 1]);
+ 
+   return G_MININT64;
+ }
+@@ -517,7 +546,7 @@ interval_end (GTimeZone *tz,
+               gint       interval)
+ {
+   if (interval < tz->timecnt)
+-    return gint64_from_be (tz->trans[interval]) - 1;
++    return (gint64)gint32_from_be (tz->trans[interval]) - 1;
+ 
+   return G_MAXINT64;
+ }
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0005-Disable-test-gobject-param-implement.patch b/glib/patches/0005-Disable-test-gobject-param-implement.patch
new file mode 100644
index 0000000..2ac78dd
--- /dev/null
+++ b/glib/patches/0005-Disable-test-gobject-param-implement.patch
@@ -0,0 +1,25 @@
+From b936bfdf3c84464552981b535ae41185027588ad Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Thu, 23 Aug 2012 18:09:26 +0200
+Subject: [PATCH] Disable test gobject/param/implement
+
+---
+ gobject/tests/param.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gobject/tests/param.c b/gobject/tests/param.c
+index 671642e..80871d9 100644
+--- a/gobject/tests/param.c
++++ b/gobject/tests/param.c
+@@ -797,7 +797,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/param/qdata", test_param_qdata);
+   g_test_add_func ("/param/validate", test_param_validate);
+   g_test_add_func ("/param/convert", test_param_convert);
+-  g_test_add_func ("/param/implement", test_param_implement);
++  /* g_test_add_func ("/param/implement", test_param_implement); */
+   g_test_add_func ("/value/transform", test_value_transform);
+ 
+   return g_test_run ();
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0006-solaris-mounts.patch b/glib/patches/0006-solaris-mounts.patch
new file mode 100644
index 0000000..d3fa526
--- /dev/null
+++ b/glib/patches/0006-solaris-mounts.patch
@@ -0,0 +1,19 @@
+diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
+index e288e06..4edcbe4 100644
+--- a/gio/gunixmounts.c
++++ b/gio/gunixmounts.c
+@@ -271,6 +271,14 @@ g_unix_is_mount_path_system_internal (const char *mount_path)
+     "/sbin",
+     "/net",
+     "/sys",
++    "/devices",
++    "/system/contract",
++    "/etc/mnttab",
++    "/etc/svc/volatile",
++    "/system/object",
++    "/etc/dfs/sharetab",
++    "/dev/fd",
++    "/lib/libc.so.1",
+     NULL
+   };
+ 
diff --git a/glib/patches/0009-Disable-file-async-create-delete-checks.patch b/glib/patches/0009-Disable-file-async-create-delete-checks.patch
new file mode 100644
index 0000000..0a523ed
--- /dev/null
+++ b/glib/patches/0009-Disable-file-async-create-delete-checks.patch
@@ -0,0 +1,30 @@
+From e44f674fab8cca219bc4c4a64f720c55ab9ca9dd Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Fri, 24 Aug 2012 19:53:13 +0200
+Subject: [PATCH] Disable /file/async-create-delete/* checks.
+
+---
+ gio/tests/file.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gio/tests/file.c b/gio/tests/file.c
+index c7f840b..57042a8 100644
+--- a/gio/tests/file.c
++++ b/gio/tests/file.c
+@@ -603,11 +603,13 @@ main (int argc, char *argv[])
+   g_test_add_func ("/file/parent", test_parent);
+   g_test_add_func ("/file/child", test_child);
+   g_test_add_func ("/file/type", test_type);
++/*
+   g_test_add_data_func ("/file/async-create-delete/0", GINT_TO_POINTER (0), test_create_delete);
+   g_test_add_data_func ("/file/async-create-delete/1", GINT_TO_POINTER (1), test_create_delete);
+   g_test_add_data_func ("/file/async-create-delete/10", GINT_TO_POINTER (10), test_create_delete);
+   g_test_add_data_func ("/file/async-create-delete/25", GINT_TO_POINTER (25), test_create_delete);
+   g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINTER (4096), test_create_delete);
++*/
+   g_test_add_func ("/file/replace-load", test_replace_load);
+ 
+   return g_test_run ();
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0010-Fix-locale-for-unicode-collate-test.patch b/glib/patches/0010-Fix-locale-for-unicode-collate-test.patch
new file mode 100644
index 0000000..cda7805
--- /dev/null
+++ b/glib/patches/0010-Fix-locale-for-unicode-collate-test.patch
@@ -0,0 +1,28 @@
+From c7461138f1e8eb227ede2ab5ed605576e7cc7f81 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Fri, 24 Aug 2012 21:25:31 +0200
+Subject: [PATCH] Fix locale for unicode-collate test
+
+---
+ tests/unicode-collate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unicode-collate.c b/tests/unicode-collate.c
+index 785f169..9897564 100644
+--- a/tests/unicode-collate.c
++++ b/tests/unicode-collate.c
+@@ -44,9 +44,9 @@ int main (int argc, char **argv)
+   /* FIXME: need to modify environment here,
+    * since g_utf8_collate_key calls setlocal (LC_COLLATE, "")
+    */
+-  g_setenv ("LC_ALL", "en_US", TRUE);
++  g_setenv ("LC_ALL", "en_US.UTF-8", TRUE);
+   locale = setlocale (LC_ALL, "");
+-  if (locale == NULL || strcmp (locale, "en_US") != 0)
++  if (locale == NULL || strcmp (locale, "en_US.UTF-8") != 0)
+     {
+       fprintf (stderr, "No suitable locale, skipping test\n"); 
+       return 2;
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0012-_XOPEN_SOURCE.patch b/glib/patches/0012-_XOPEN_SOURCE.patch
new file mode 100644
index 0000000..79707f9
--- /dev/null
+++ b/glib/patches/0012-_XOPEN_SOURCE.patch
@@ -0,0 +1,11 @@
+--- source/configure.ac.orig	2012-11-22 14:58:23.206245278 +0400
++++ source/configure.ac	2012-11-22 14:59:51.779714337 +0400
+@@ -1105,7 +1105,7 @@
+ case $host in
+   *-*-solaris* )
+      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
++     AC_DEFINE(_XOPEN_SOURCE,        500, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      ;;
+ esac
diff --git a/glib/patches/0012-test-strfuncs.c-xpg.patch b/glib/patches/0012-test-strfuncs.c-xpg.patch
new file mode 100644
index 0000000..7ab2b23
--- /dev/null
+++ b/glib/patches/0012-test-strfuncs.c-xpg.patch
@@ -0,0 +1,12 @@
+Index: glib/glib/tests/strfuncs.c
+===================================================================
+--- glib.orig/glib/tests/strfuncs.c
++++ glib/glib/tests/strfuncs.c
+@@ -21,7 +21,6 @@
+ 
+ #define GLIB_DISABLE_DEPRECATION_WARNINGS
+ 
+-#define _XOPEN_SOURCE 600
+ #include <ctype.h>
+ #include <errno.h>
+ #include <locale.h>
diff --git a/glib/patches/0013-Disable-IPv6-tests.patch b/glib/patches/0013-Disable-IPv6-tests.patch
new file mode 100644
index 0000000..941cc09
--- /dev/null
+++ b/glib/patches/0013-Disable-IPv6-tests.patch
@@ -0,0 +1,32 @@
+From 309d26547ab3edf0e101aafefc102c30ff534eb1 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Sat, 25 Aug 2012 12:05:42 +0200
+Subject: [PATCH] Disable IPv6 tests.
+
+They are failling if no IPv6 interfaces are up.
+---
+ gio/tests/socket.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gio/tests/socket.c b/gio/tests/socket.c
+index 0a61c9f..61112a1 100644
+--- a/gio/tests/socket.c
++++ b/gio/tests/socket.c
+@@ -822,10 +822,14 @@ main (int   argc,
+ 
+   g_test_add_func ("/socket/ipv4_sync", test_ipv4_sync);
+   g_test_add_func ("/socket/ipv4_async", test_ipv4_async);
++  /* Those tests fail if no IPv6 interfaces are up
+   g_test_add_func ("/socket/ipv6_sync", test_ipv6_sync);
+   g_test_add_func ("/socket/ipv6_async", test_ipv6_async);
++  */
+ #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
++  /* This tests fails if no IPv6 interfaces are up
+   g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
++  */
+ #endif
+   g_test_add_func ("/socket/close_graceful", test_close_graceful);
+   g_test_add_func ("/socket/timed_wait", test_timed_wait);
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0013-Disable-mainloop-child_sources-test.patch b/glib/patches/0013-Disable-mainloop-child_sources-test.patch
new file mode 100644
index 0000000..24ecc98
--- /dev/null
+++ b/glib/patches/0013-Disable-mainloop-child_sources-test.patch
@@ -0,0 +1,25 @@
+From bcbe1d0233d7ee88f9b4b079ebd714a124002f0b Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi@opencsw.org>
+Date: Sat, 25 Aug 2012 11:01:59 +0200
+Subject: [PATCH] Disable mainloop/child_sources test
+
+---
+ glib/tests/mainloop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
+index 98dfb40..d5c1051 100644
+--- a/glib/tests/mainloop.c
++++ b/glib/tests/mainloop.c
+@@ -478,7 +478,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/mainloop/timeouts", test_timeouts);
+   g_test_add_func ("/mainloop/priorities", test_priorities);
+   g_test_add_func ("/mainloop/invoke", test_invoke);
+-  g_test_add_func ("/mainloop/child_sources", test_child_sources);
++/*  g_test_add_func ("/mainloop/child_sources", test_child_sources); */
+   g_test_add_func ("/mainloop/recursive_child_sources", test_recursive_child_sources);
+ 
+   return g_test_run ();
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0014-Disable-gvariant-varargs.patch b/glib/patches/0014-Disable-gvariant-varargs.patch
new file mode 100644
index 0000000..1e4e6b1
--- /dev/null
+++ b/glib/patches/0014-Disable-gvariant-varargs.patch
@@ -0,0 +1,26 @@
+From 5d220fcda35d51b9fae86612b44ad62214e2ddc5 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol@opencsw.org>
+Date: Sat, 25 Aug 2012 18:21:12 +0200
+Subject: [PATCH] Disable /gvariant/varargs
+
+---
+ glib/tests/gvariant.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
+index a6bef23..e8f5795 100644
+--- a/glib/tests/gvariant.c
++++ b/glib/tests/gvariant.c
+@@ -4147,7 +4147,9 @@ main (int argc, char **argv)
+   g_test_add_func ("/gvariant/containers", test_containers);
+   g_test_add_func ("/gvariant/format-strings", test_format_strings);
+   g_test_add_func ("/gvariant/invalid-varargs", test_invalid_varargs);
++/*
+   g_test_add_func ("/gvariant/varargs", test_varargs);
++*/
+   g_test_add_func ("/gvariant/valist", test_valist);
+   g_test_add_func ("/gvariant/builder-memory", test_builder_memory);
+   g_test_add_func ("/gvariant/hashing", test_hashing);
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0015-Fix-locale-for-collate-test.patch b/glib/patches/0015-Fix-locale-for-collate-test.patch
new file mode 100644
index 0000000..c6c96cf
--- /dev/null
+++ b/glib/patches/0015-Fix-locale-for-collate-test.patch
@@ -0,0 +1,28 @@
+From 53f22e4878dab62282978d1cf631a8f74a22f73b Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sat, 25 Aug 2012 19:00:54 +0200
+Subject: [PATCH] Fix locale for collate test
+
+---
+ glib/tests/collate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/tests/collate.c b/glib/tests/collate.c
+index 29a62ea..737bfe8 100644
+--- a/glib/tests/collate.c
++++ b/glib/tests/collate.c
+@@ -187,9 +187,9 @@ main (int argc, char *argv[])
+ 
+   g_test_init (&argc, &argv, NULL);
+ 
+-  g_setenv ("LC_ALL", "en_US", TRUE);
++  g_setenv ("LC_ALL", "en_US.UTF-8", TRUE);
+   locale = setlocale (LC_ALL, "");
+-  if (locale == NULL || strcmp (locale, "en_US") != 0)
++  if (locale == NULL || strcmp (locale, "en_US.UTF-8") != 0)
+     {
+       g_test_message ("No suitable locale, skipping test");
+       return 0;
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0017-Disable-gdbus-connection-loss-test.patch b/glib/patches/0017-Disable-gdbus-connection-loss-test.patch
new file mode 100644
index 0000000..094c4fb
--- /dev/null
+++ b/glib/patches/0017-Disable-gdbus-connection-loss-test.patch
@@ -0,0 +1,26 @@
+From f1d40547b48ed5b8ce84b2271b05c6a261284c4d Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sat, 25 Aug 2012 20:35:12 +0200
+Subject: [PATCH] Disable gdbus/connection-loss test
+
+---
+ gio/tests/gdbus-connection-loss.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c
+index 3fdd367..23d12c1 100644
+--- a/gio/tests/gdbus-connection-loss.c
++++ b/gio/tests/gdbus-connection-loss.c
+@@ -144,7 +144,9 @@ main (int   argc,
+   g_assert_no_error (error);
+   g_assert (c != NULL);
+ 
++  /*
+   g_test_add_func ("/gdbus/connection-loss", test_connection_loss);
++  */
+ 
+   ret = g_test_run();
+ 
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0017-Fix-disable-testglib-tests.patch b/glib/patches/0017-Fix-disable-testglib-tests.patch
new file mode 100644
index 0000000..38e4dd2
--- /dev/null
+++ b/glib/patches/0017-Fix-disable-testglib-tests.patch
@@ -0,0 +1,85 @@
+From 32edd15a61dee58fe9dc3547147d99a7a9d923fe Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Thu, 29 Sep 2011 14:08:06 +0200
+Subject: [PATCH] Fix/disable testglib tests
+
+---
+ tests/testglib.c |   55 +++++++++++++++++++++++++++--------------------------
+ 1 files changed, 28 insertions(+), 27 deletions(-)
+
+diff --git a/tests/testglib.c b/tests/testglib.c
+index 158808a..c012d04 100644
+--- a/tests/testglib.c
++++ b/tests/testglib.c
+@@ -533,32 +533,33 @@ test_g_parse_debug_string (void)
+ static void
+ log_warning_error_tests (void)
+ {
+-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
+-    {
+-      g_message ("this is a g_message test.");
+-      g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\"");
+-      g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\"");
+-      exit (0);
+-    }
+-  g_test_trap_assert_passed();
+-  g_test_trap_assert_stderr ("*is a g_message test*");
+-  g_test_trap_assert_stderr ("*non-printable UTF-8*");
+-  g_test_trap_assert_stderr ("*unsafe chars*");
+-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
+-    {
+-      g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345);
+-      exit (0);
+-    }
+-  g_test_trap_assert_failed(); /* we have fatal-warnings enabled */
+-  g_test_trap_assert_stderr ("*harmless warning*");
+-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
+-    {
+-      g_print (NULL);
+-      exit (0);
+-    }
+-  g_test_trap_assert_failed(); /* we have fatal-warnings enabled */
+-  g_test_trap_assert_stderr ("*g_print*assertion*failed*");
+-  g_test_trap_assert_stderr ("*NULL*");
++  /* Disabled: Won't work */
++  /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */
++  /*   { */
++  /*     g_message ("this is a g_message test."); */
++  /*     g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\""); */
++  /*     g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\""); */
++  /*     exit (0); */
++  /*   } */
++  /* g_test_trap_assert_passed(); */
++  /* g_test_trap_assert_stderr ("*is a g_message test*"); */
++  /* g_test_trap_assert_stderr ("*non-printable UTF-8*"); */
++  /* g_test_trap_assert_stderr ("*unsafe chars*"); */
++  /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */
++  /*   { */
++  /*     g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345); */
++  /*     exit (0); */
++  /*   } */
++  /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */
++  /* g_test_trap_assert_stderr ("*harmless warning*"); */
++  /* if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) */
++  /*   { */
++  /*     g_print (NULL); */
++  /*     exit (0); */
++  /*   } */
++  /* g_test_trap_assert_failed(); /\* we have fatal-warnings enabled *\/ */
++  /* g_test_trap_assert_stderr ("*g_print*assertion*failed*"); */
++  /* g_test_trap_assert_stderr ("*NULL*"); */
+ }
+ 
+ static void
+@@ -1130,7 +1131,7 @@ gstring_tests (void)
+   for (i = 0; i < 10000; i++)
+     g_string_append_c (string1, 'a'+(i%26));
+ 
+-#ifndef G_OS_WIN32
++#if !(defined(G_OS_WIN32) || defined(__sun))
+   /* MSVC, mingw32 and LCC use the same run-time C library, which doesn't like
+      the %10000.10000f format... */
+   g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f",
+-- 
+1.7.6.1
+
diff --git a/glib/patches/0018-Disable-all-gdbus-thread-tests.patch b/glib/patches/0018-Disable-all-gdbus-thread-tests.patch
new file mode 100644
index 0000000..70db1bc
--- /dev/null
+++ b/glib/patches/0018-Disable-all-gdbus-thread-tests.patch
@@ -0,0 +1,28 @@
+From c1a1c2956d4981f5ae56ba4e4d3198a18d4cb7a5 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sun, 26 Aug 2012 14:21:04 +0200
+Subject: [PATCH] Disable all gdbus/*thread* tests
+
+---
+ gio/tests/gdbus-threading.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
+index b46af0b..b0f7813 100644
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
+@@ -610,9 +610,11 @@ main (int   argc,
+   g_assert_no_error (error);
+   g_assert (c != NULL);
+ 
++/*
+   g_test_add_func ("/gdbus/delivery-in-thread", test_delivery_in_thread);
+   g_test_add_func ("/gdbus/method-calls-in-thread", test_method_calls_in_thread);
+   g_test_add_func ("/gdbus/threaded-singleton", test_threaded_singleton);
++*/
+ 
+   ret = g_test_run();
+ 
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0019-Disable-some-gdbus-tests.patch b/glib/patches/0019-Disable-some-gdbus-tests.patch
new file mode 100644
index 0000000..7e9ae11
--- /dev/null
+++ b/glib/patches/0019-Disable-some-gdbus-tests.patch
@@ -0,0 +1,38 @@
+From ca7fea45d4b7d3afbd413cc4a9a2792892efbb91 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sun, 26 Aug 2012 16:31:53 +0200
+Subject: [PATCH] Disable some gdbus/* tests
+
+---
+ gio/tests/gdbus-peer.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
+index 926010a..b502b28 100644
+--- a/gio/tests/gdbus-peer.c
++++ b/gio/tests/gdbus-peer.c
+@@ -1828,12 +1828,18 @@ main (int   argc,
+   /* all the tests rely on a shared main loop */
+   loop = g_main_loop_new (NULL, FALSE);
+ 
+-  g_test_add_func ("/gdbus/peer-to-peer", test_peer);
++  /* g_test_add_func ("/gdbus/peer-to-peer", test_peer); */
+   g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
+   g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
+   g_test_add_func ("/gdbus/tcp-anonymous", test_tcp_anonymous);
+-  g_test_add_func ("/gdbus/credentials", test_credentials);
+-  g_test_add_func ("/gdbus/overflow", test_overflow);
++  /*
++   * According gcredentials.c, this is not implemented on Solaris, i.e. everything no
++   * FreeBSD, OpenBSD, or Linux.
++   *
++   */
++  /* g_test_add_func ("/gdbus/credentials", test_credentials); */
++
++  /*g_test_add_func ("/gdbus/overflow", test_overflow);*/
+   g_test_add_func ("/gdbus/codegen-peer-to-peer", codegen_test_peer);
+ 
+   ret = g_test_run();
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0020-Disable-desktop-app-info-tests.patch b/glib/patches/0020-Disable-desktop-app-info-tests.patch
new file mode 100644
index 0000000..3c7efae
--- /dev/null
+++ b/glib/patches/0020-Disable-desktop-app-info-tests.patch
@@ -0,0 +1,25 @@
+From 3b6e499cbcdae1c7dea4655dcfa6d80e97f3118b Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Tue, 28 Aug 2012 10:03:39 +0200
+Subject: [PATCH] Disable desktop-app-info tests
+
+---
+ gio/tests/desktop-app-info.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
+index 787d217..9262231 100644
+--- a/gio/tests/desktop-app-info.c
++++ b/gio/tests/desktop-app-info.c
+@@ -354,6 +354,8 @@ int
+ main (int   argc,
+       char *argv[])
+ {
++  /* This tests fails sporadically, so I disable it */
++  exit(0);
+   gint result;
+ 
+   g_type_init ();
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0020-Disable-gsettings-strinfo-test.patch b/glib/patches/0020-Disable-gsettings-strinfo-test.patch
new file mode 100644
index 0000000..23e4906
--- /dev/null
+++ b/glib/patches/0020-Disable-gsettings-strinfo-test.patch
@@ -0,0 +1,25 @@
+From 066f4c9c55c7c238228138425705f4c47470753d Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sun, 26 Aug 2012 20:33:23 +0200
+Subject: [PATCH] Disable gsettings/strinfo test
+
+---
+ gio/tests/gsettings.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
+index c7fe376..1ae5869 100644
+--- a/gio/tests/gsettings.c
++++ b/gio/tests/gsettings.c
+@@ -2133,7 +2133,7 @@ main (int argc, char *argv[])
+ 
+   g_test_add_func ("/gsettings/keyfile", test_keyfile);
+   g_test_add_func ("/gsettings/child-schema", test_child_schema);
+-  g_test_add_func ("/gsettings/strinfo", test_strinfo);
++/*  g_test_add_func ("/gsettings/strinfo", test_strinfo);*/
+   g_test_add_func ("/gsettings/enums", test_enums);
+   g_test_add_func ("/gsettings/flags", test_flags);
+   g_test_add_func ("/gsettings/range", test_range);
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0021-Disable-buffered-input-stream-set-buffer-size-test.patch b/glib/patches/0021-Disable-buffered-input-stream-set-buffer-size-test.patch
new file mode 100644
index 0000000..9273199
--- /dev/null
+++ b/glib/patches/0021-Disable-buffered-input-stream-set-buffer-size-test.patch
@@ -0,0 +1,25 @@
+From a161b66db29770aec53ab43c0fa3e5c270f2d083 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sun, 26 Aug 2012 19:21:25 +0200
+Subject: [PATCH] Disable buffered-input-stream/set-buffer-size test
+
+---
+ gio/tests/buffered-input-stream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c
+index 8515351..3357fc8 100644
+--- a/gio/tests/buffered-input-stream.c
++++ b/gio/tests/buffered-input-stream.c
+@@ -293,7 +293,7 @@ main (int   argc,
+ 
+   g_test_add_func ("/buffered-input-stream/peek", test_peek);
+   g_test_add_func ("/buffered-input-stream/peek-buffer", test_peek_buffer);
+-  g_test_add_func ("/buffered-input-stream/set-buffer-size", test_set_buffer_size);
++/*  g_test_add_func ("/buffered-input-stream/set-buffer-size", test_set_buffer_size);*/
+   g_test_add_func ("/buffered-input-stream/read-byte", test_read_byte);
+   g_test_add_func ("/buffered-input-stream/read", test_read);
+   g_test_add_func ("/buffered-input-stream/skip", test_skip);
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0021-Disable-some-gapplication-tests.patch b/glib/patches/0021-Disable-some-gapplication-tests.patch
new file mode 100644
index 0000000..de9cfba
--- /dev/null
+++ b/glib/patches/0021-Disable-some-gapplication-tests.patch
@@ -0,0 +1,28 @@
+From 2b24dcc16f1ba9d422cc285c7439ee9b240de924 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Sun, 26 Aug 2012 20:45:23 +0200
+Subject: [PATCH] Disable some gapplication/* tests
+
+---
+ gio/tests/gapplication.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
+index a83411c..4192a59 100644
+--- a/gio/tests/gapplication.c
++++ b/gio/tests/gapplication.c
+@@ -435,9 +435,9 @@ main (int argc, char **argv)
+   g_test_add_func ("/gapplication/no-dbus", test_nodbus);
+   g_test_add_func ("/gapplication/basic", basic);
+ /*  g_test_add_func ("/gapplication/non-unique", test_nonunique); */
+-  g_test_add_func ("/gapplication/properties", properties);
++/*  g_test_add_func ("/gapplication/properties", properties);*/
+   g_test_add_func ("/gapplication/app-id", appid);
+-  g_test_add_func ("/gapplication/quit", test_quit);
++/*  g_test_add_func ("/gapplication/quit", test_quit);*/
+   g_test_add_func ("/gapplication/actions", test_actions);
+ 
+   return g_test_run ();
+-- 
+1.7.11.3
+
diff --git a/glib/patches/0022-Change-shell-to-bash-in-test-shell-scripts.patch b/glib/patches/0022-Change-shell-to-bash-in-test-shell-scripts.patch
new file mode 100644
index 0000000..abccfa2
--- /dev/null
+++ b/glib/patches/0022-Change-shell-to-bash-in-test-shell-scripts.patch
@@ -0,0 +1,57 @@
+From f7e0a1ff2fba2b57c61d24a41ff6a18cf63eeda0 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Mon, 27 Aug 2012 00:47:58 +0200
+Subject: [PATCH] Change shell to bash in test shell scripts
+
+---
+ tests/run-assert-msg-test.sh | 12 +++++++++---
+ tests/run-collate-tests.sh   |  2 +-
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh
+index b6045d6..c50cc09 100755
+--- a/tests/run-assert-msg-test.sh
++++ b/tests/run-assert-msg-test.sh
+@@ -1,4 +1,10 @@
+-#! /bin/sh
++#! /usr/bin/bash
++
++if [ "`isainfo -k`" = "sparcv9" ]
++then
++	echo "Test disabled on sparcv9"
++	exit 0
++fi
+ 
+ fail ()
+ {
+@@ -21,7 +27,7 @@ fi
+ 
+ echo_v "Running assert-msg-test"
+ OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort"
+-echo "$OUT" | grep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \
++echo "$OUT" | ggrep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \
+   fail "does not print assertion message"
+ 
+ if ! type gdb >/dev/null 2>&1; then
+@@ -38,7 +44,7 @@ OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --
+   fail "failed to run gdb"
+ 
+ echo_v "Checking if assert message is in __glib_assert_msg"
+-if ! echo "$OUT" | grep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then
++if ! echo "$OUT" | ggrep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then
+   fail "__glib_assert_msg does not have assertion message"
+ fi
+ 
+diff --git a/tests/run-collate-tests.sh b/tests/run-collate-tests.sh
+index 24f3d69..9fd1038 100755
+--- a/tests/run-collate-tests.sh
++++ b/tests/run-collate-tests.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /usr/bin/bash
+ 
+ fail ()
+ {
+-- 
+1.7.11.3
+