[csw-devel] SF.net SVN: gar:[16933] csw/mgar/pkg/glib2/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Sun Jan 29 22:14:02 CET 2012
Revision: 16933
http://gar.svn.sourceforge.net/gar/?rev=16933&view=rev
Author: guengel
Date: 2012-01-29 21:14:02 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
glib2/trunk: Commenced working on glib 2.30.2
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
csw/mgar/pkg/glib2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2012-01-29 10:49:31 UTC (rev 16932)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2012-01-29 21:14:02 UTC (rev 16933)
@@ -6,10 +6,11 @@
# should make it pass, though. --raos
NAME = glib
-VERSION = 2.28.8
+VERSION = 2.30.2
CATEGORIES = lib
GARTYPE = v2
GARCOMPILER = SOS12U1
+GARFLAVOR=DBG
DESCRIPTION = The GLib library of C routines.
define BLURB
@@ -22,40 +23,43 @@
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch
-PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
-PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch
-PATCHFILES += 0004-Use-smtp-instead-of-http-in-network-address-test.patch
-PATCHFILES += 0005-Fix-hard-coded-paths.patch
-PATCHFILES += 0006-Fix-path-to-dbus-machine-id.patch
-PATCHFILES += 0007-Fix-configure-_XOPEN_SOURCE.patch
-PATCHFILES += 0009-make-gsocket.c-word-with-solaris.patch
-# Disabled until fixed:
-# https://bugzilla.gnome.org/show_bug.cgi?id=659306
-PATCHFILES += 0010-Disable-GFileMonitor-tests-in-gio-tests-file.patch
-PATCHFILES += 0011-Remove-support-for-abstract-sockets-from-g_socket_ad.patch
-PATCHFILES += 0012-Use-proper-locale-for-collate-tests-2.patch
-PATCHFILES += 0013-Fix-test-shell-script.patch
-PATCHFILES += 0019-Fix-gdbus-peer-tests.patch
-# Disable test on sparc v9
-# https://bugzilla.gnome.org/show_bug.cgi?id=660638
-PATCHFILES += 0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch
+# Reported: https://bugzilla.gnome.org/show_bug.cgi?id=668973
+PATCHFILES += 0001-Disable-inf-nan-mini-test.patch
-# Those patches are for tests that fail on the build farm
-# but not on other build hosts.
-PATCHFILES += 0015-Do-not-ellipses-in-switch-cases.patch
-PATCHFILES += 0016-Format-string-for-Solaris-lt.-10u9.patch
-PATCHFILES += 0017-Disable-gapplication-gapplication-basic-test.patch
-PATCHFILES += 0017-Fix-disable-testglib-tests.patch
-PATCHFILES += 0018-Disable-gdbus-connection-large_message-on-sparc.patch
-PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch
-PATCHFILES += 0019-Disable-volumemonitor-tests.patch
-PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch
-PATCHFILES += 0023-Disable-failing-gsettings-tests.patch
+# PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch
+# PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
+# PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch
+# PATCHFILES += 0004-Use-smtp-instead-of-http-in-network-address-test.patch
+# PATCHFILES += 0005-Fix-hard-coded-paths.patch
+# PATCHFILES += 0006-Fix-path-to-dbus-machine-id.patch
+# PATCHFILES += 0007-Fix-configure-_XOPEN_SOURCE.patch
+# PATCHFILES += 0009-make-gsocket.c-word-with-solaris.patch
+# # Disabled until fixed:
+# # https://bugzilla.gnome.org/show_bug.cgi?id=659306
+# PATCHFILES += 0010-Disable-GFileMonitor-tests-in-gio-tests-file.patch
+# PATCHFILES += 0011-Remove-support-for-abstract-sockets-from-g_socket_ad.patch
+# PATCHFILES += 0012-Use-proper-locale-for-collate-tests-2.patch
+# PATCHFILES += 0013-Fix-test-shell-script.patch
+# PATCHFILES += 0019-Fix-gdbus-peer-tests.patch
+# # Disable test on sparc v9
+# # https://bugzilla.gnome.org/show_bug.cgi?id=660638
+# PATCHFILES += 0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch
-# SPARCv9 Specific Patches
-PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch
+# # Those patches are for tests that fail on the build farm
+# # but not on other build hosts.
+# PATCHFILES += 0015-Do-not-ellipses-in-switch-cases.patch
+# PATCHFILES += 0016-Format-string-for-Solaris-lt.-10u9.patch
+# PATCHFILES += 0017-Disable-gapplication-gapplication-basic-test.patch
+# PATCHFILES += 0017-Fix-disable-testglib-tests.patch
+# PATCHFILES += 0018-Disable-gdbus-connection-large_message-on-sparc.patch
+# PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch
+# PATCHFILES += 0019-Disable-volumemonitor-tests.patch
+# PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch
+# PATCHFILES += 0023-Disable-failing-gsettings-tests.patch
+# # SPARCv9 Specific Patches
+# PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch
+
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -154,14 +158,14 @@
LD_OPTIONS =
EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-EXTRA_CFLAGS = -features=extensions
+EXTRA_CFLAGS = -features=extensions -xc99 -D_XPG6
-EXTRA_CFLAGS-5.10 += -xc99 -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -D_XPG6
-EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GAROSREL))
+#EXTRA_CFLAGS-5.10 += -xc99 -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -D_XPG6
+#EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GAROSREL))
EXTRA_LDFLAGS = -lsocket
-BUILD64_LIBS_ONLY = 1
+BUILD64 = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-libiconv=gnu
Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums 2012-01-29 10:49:31 UTC (rev 16932)
+++ csw/mgar/pkg/glib2/trunk/checksums 2012-01-29 21:14:02 UTC (rev 16933)
@@ -1 +1 @@
-789e7520f71c6a4bf08bc683ec764d24 glib-2.28.8.tar.bz2
+b40f3889e8d24e1b367763673ca6deb5 glib-2.30.2.tar.bz2
Added: csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch 2012-01-29 21:14:02 UTC (rev 16933)
@@ -0,0 +1,32 @@
+From 66516bc1f5e1794fed30b9638060469f7c05d2b8 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 29 Jan 2012 21:50:28 +0100
+Subject: [PATCH] Disable inf/nan mini test
+
+---
+ glib/tests/gvariant.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
+index e943bb2..69eccd6 100644
+--- a/glib/tests/gvariant.c
++++ b/glib/tests/gvariant.c
+@@ -3716,6 +3716,7 @@ test_parses (void)
+ }
+
+ /* inf/nan mini test */
++ /* Doesn't work. Bug reported
+ {
+ const gchar *tests[] = { "inf", "-inf", "nan" };
+ GVariant *value;
+@@ -3731,6 +3732,7 @@ test_parses (void)
+ g_free (printed);
+ }
+ }
++ */
+
+ g_variant_type_info_assert_no_infos ();
+ }
+--
+1.7.8.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list