Revision: 23552
http://sourceforge.net/p/gar/code/23552
Author: slowfranklin
Date: 2014-05-05 13:51:51 +0000 (Mon, 05 May 2014)
Log Message:
-----------
Begin working on update to version 2.40.0
Fix several patches for new version.
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
csw/mgar/pkg/glib2/trunk/checksums
csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch
csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch
csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch
csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch
csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch
csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 11:57:44 UTC (rev 23551)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2014-05-05 13:51:51 UTC (rev 23552)
@@ -8,7 +8,7 @@
# Set max open files to 1024
NAME = glib
-VERSION = 2.36.3
+VERSION = 2.40.0
GARTYPE = v2
# for memory synchronisation primitives like __sync_synchronize we need gcc
GARCOMPILER = GNU
@@ -28,9 +28,9 @@
BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev
BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin
-BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev CSWdskutl
+BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev
# To make the tests working
-BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo
+BUILD_DEP_PKGS += CSWpython CSWsharedmimeinfo
# This is used to adjust paths in documentation
BUILD_DEP_PKGS += CSWgsed
BUILD_DEP_PKGS += CSWlibz-dev
@@ -46,7 +46,6 @@
PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch
PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch
PATCHFILES += 0030-Move-around-statfs_result.patch
-PATCHFILES += 0034-Reorder-link-objects-glib2-must-come-first-otherwise.patch
#
# Test patches
Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums 2014-05-05 11:57:44 UTC (rev 23551)
+++ csw/mgar/pkg/glib2/trunk/checksums 2014-05-05 13:51:51 UTC (rev 23552)
@@ -1 +1 @@
-89180c7354b0acd3efb0a36ac05ca39c glib-2.36.3.tar.xz
+05fb7cb17eacbc718e90366a1eae60d9 glib-2.40.0.tar.xz
Modified: csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch
2014-05-05 11:57:44 UTC (rev 23551)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Fix-POSIX-and-XOPEN-defines.patch
2014-05-05 13:51:51 UTC (rev 23552)
@@ -1,17 +1,17 @@
-From 5732b4f00b153318dd9d7e10979c81f64da1a534 Mon Sep 17 00:00:00 2001
+From 14de0bf2c22ad53e3e57776e71e696f8f6068b2c Mon Sep 17 00:00:00 2001
From: Ralph Boehme <sloowfrank...@gmail.com>
-Date: Mon, 1 Jul 2013 16:42:06 +0200
+Date: Mon, 5 May 2014 15:05:03 +0200
Subject: [PATCH] Fix POSIX and XOPEN defines
---
- configure | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
-index 0537a4c..3e88334 100755
+index 17b0a17..00bda6a 100755
--- a/configure
+++ b/configure
-@@ -23808,10 +23808,10 @@ fi
+@@ -23796,10 +23796,10 @@ fi
case $host in
*-*-solaris* )
@@ -24,15 +24,6 @@
$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-@@ -26092,7 +26092,7 @@ if test "x$with_threads" = xyes || test
"x$with_threads" = xposix; then :
- # -U_OSF_SOURCE is for Digital UNIX 4.0d
- GTHREAD_COMPILE_IMPL_DEFINES="-D_POSIX4_DRAFT_SOURCE
-D_POSIX4A_DRAFT10_SOURCE -U_OSF_SOURCE"
- glib_save_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
-+# CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES"
- if test "x$have_threads" = xno; then :
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--
-1.8.3.1
+1.8.4.1
Modified:
csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch
===================================================================
---
csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch
2014-05-05 11:57:44 UTC (rev 23551)
+++
csw/mgar/pkg/glib2/trunk/files/0005-Disable-test-gobject-param-implement.patch
2014-05-05 13:51:51 UTC (rev 23552)
@@ -1,25 +1,27 @@
-From b936bfdf3c84464552981b535ae41185027588ad Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <rafi...@opencsw.org>
-Date: Thu, 23 Aug 2012 18:09:26 +0200
+From 4cda841e37fc05440d2be3cfe89493384e06fda0 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfrank...@gmail.com>
+Date: Mon, 5 May 2014 15:22:38 +0200
Subject: [PATCH] Disable test gobject/param/implement
---
- gobject/tests/param.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ gobject/tests/param.c | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/gobject/tests/param.c b/gobject/tests/param.c
-index 671642e..80871d9 100644
+index 40f453e..e865f01 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);
+@@ -840,8 +840,10 @@ main (int argc, char *argv[])
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 ();
++#if 0
+ if (g_test_slow ())
+ g_test_add_func ("/param/implement", test_param_implement);
++#endif
+
+ for (data.change_this_flag = 0; data.change_this_flag < 16;
data.change_this_flag++)
+ for (data.change_this_type = 0; data.change_this_type < 3;
data.change_this_type++)
--
-1.7.11.3
+1.8.4.1
Modified:
csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch
===================================================================
---
csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch
2014-05-05 11:57:44 UTC (rev 23551)
+++
csw/mgar/pkg/glib2/trunk/files/0009-Disable-file-async-create-delete-checks.patch
2014-05-05 13:51:51 UTC (rev 23552)
@@ -1,6 +1,6 @@
-From 534ad61163d5e0a59fbfe1f27a969e676d2ff4b0 Mon Sep 17 00:00:00 2001
+From 35536dce4c0a69ced128d9bb10ce19bf50bfd0d4 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <sloowfrank...@gmail.com>
-Date: Fri, 28 Jun 2013 17:59:39 +0200
+Date: Mon, 5 May 2014 15:29:49 +0200
Subject: [PATCH] Disable /file/async-create-delete/* checks.
---
@@ -8,23 +8,23 @@
1 file changed, 2 insertions(+)
diff --git a/gio/tests/file.c b/gio/tests/file.c
-index bca461a..e590af1 100644
+index cab1835..57d4f10 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
-@@ -794,11 +794,13 @@ main (int argc, char *argv[])
- g_test_add_func ("/file/parent", test_parent);
+@@ -1009,11 +1009,13 @@ main (int argc, char *argv[])
g_test_add_func ("/file/child", test_child);
g_test_add_func ("/file/type", test_type);
-+/*
+ g_test_add_func ("/file/parse-name", test_parse_name);
++#if 0
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);
-+*/
++#endif
g_test_add_func ("/file/replace-load", test_replace_load);
g_test_add_func ("/file/replace-cancel", test_replace_cancel);
g_test_add_func ("/file/async-delete", test_async_delete);
--
-1.8.3.1
+1.8.4.1
Modified: csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch
2014-05-05 11:57:44 UTC (rev 23551)
+++ csw/mgar/pkg/glib2/trunk/files/0017-Fix-disable-testglib-tests.patch
2014-05-05 13:51:51 UTC (rev 23552)
@@ -1,77 +1,33 @@
-From 32edd15a61dee58fe9dc3547147d99a7a9d923fe Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <r...@opencsw.org>
-Date: Thu, 29 Sep 2011 14:08:06 +0200
+From 1a355874686c4a221edf429270e8e8c1c0956c3b Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfrank...@gmail.com>
+Date: Mon, 5 May 2014 15:36:31 +0200
Subject: [PATCH] Fix/disable testglib tests
---
- tests/testglib.c | 55 +++++++++++++++++++++++++++--------------------------
- 1 files changed, 28 insertions(+), 27 deletions(-)
+ tests/testglib.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/testglib.c b/tests/testglib.c
-index 158808a..c012d04 100644
+index 7ccdc05..da2e7e1 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
-@@ -533,32 +533,33 @@ test_g_parse_debug_string (void)
+@@ -548,6 +548,7 @@ 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*"); */
++#if 0
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
+ "*is a g_message test*");
+ g_message ("this is a g_message test.");
+@@ -572,6 +573,7 @@ log_warning_error_tests (void)
+ "*g_print*assertion*failed*");
+ g_print (NULL);
+ g_test_assert_expected_messages ();
++#endif
}
static void
-@@ -1130,7 +1131,7 @@ gstring_tests (void)
+@@ -1168,7 +1170,7 @@ gstring_tests (void)
for (i = 0; i < 10000; i++)
g_string_append_c (string1, 'a'+(i%26));
@@ -81,5 +37,5 @@
the %10000.10000f format... */
g_string_printf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f",
--
-1.7.6.1
+1.8.4.1
Modified: csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch
2014-05-05 11:57:44 UTC (rev 23551)
+++ csw/mgar/pkg/glib2/trunk/files/0019-Disable-some-gdbus-tests.patch
2014-05-05 13:51:51 UTC (rev 23552)
@@ -1,17 +1,17 @@
-From ca7fea45d4b7d3afbd413cc4a9a2792892efbb91 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <r...@opencsw.org>
-Date: Sun, 26 Aug 2012 16:31:53 +0200
+From a34a857955c3fd58a2da9c35568bbd800762745c Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfrank...@gmail.com>
+Date: Mon, 5 May 2014 15:26:54 +0200
Subject: [PATCH] Disable some gdbus/* tests
---
- gio/tests/gdbus-peer.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
+ gio/tests/gdbus-peer.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
-index 926010a..b502b28 100644
+index 6c6f3b0..c583e60 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
-@@ -1828,12 +1828,18 @@ main (int argc,
+@@ -1731,12 +1731,16 @@ main (int argc,
/* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE);
@@ -19,20 +19,17 @@
+ /* 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
+1.8.4.1
Modified:
csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch
===================================================================
---
csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch
2014-05-05 11:57:44 UTC (rev 23551)
+++
csw/mgar/pkg/glib2/trunk/files/0022-Change-shell-to-bash-in-test-shell-scripts.patch
2014-05-05 13:51:51 UTC (rev 23552)
@@ -1,6 +1,6 @@
-From ebf6b06ed4aabe24425b09bd145c0191c431aa7d Mon Sep 17 00:00:00 2001
+From 6c908148118b5197ae44dd54209d9bf84faf7cc5 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <sloowfrank...@gmail.com>
-Date: Sat, 29 Jun 2013 08:28:38 +0200
+Date: Mon, 5 May 2014 15:10:53 +0200
Subject: [PATCH] Change shell to bash in test shell scripts
---
@@ -9,7 +9,7 @@
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh
-index 58305b0..2c162bc 100755
+index d4a5111..fe0d6ec 100755
--- a/tests/run-assert-msg-test.sh
+++ b/tests/run-assert-msg-test.sh
@@ -1,4 +1,10 @@
@@ -28,8 +28,8 @@
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)' || \
+-echo "$OUT" | grep -q '^GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion
failed: (42 < 0)' || \
++echo "$OUT" | ggrep -q '^GLib:ERROR:.*assert-msg-test.c:.*:.*main.*:
assertion failed: (42 < 0)' || \
fail "does not print assertion message"
if ! type gdb >/dev/null 2>&1; then
@@ -37,8 +37,8 @@
OUT=$($LIBTOOL --mode=execute gdb --batch -x ${srcdir:-.}/assert-msg-test.gdb
./assert-msg-test 2> $error_out) || 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
+-if ! echo "$OUT" | grep -q '^$1.*"GLib:ERROR:.*assert-msg-test.c:.*:.*main.*:
assertion failed: (42 < 0)"'; then
++if ! echo "$OUT" | ggrep -q
'^$1.*"GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 <
0)"'; then
fail "__glib_assert_msg does not have assertion message"
fi
@@ -53,5 +53,5 @@
fail ()
{
--
-1.8.3.1
+1.8.4.1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
