Add upstream patch to fix tests, bug #276671

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 44 insertions, 5 deletions

diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 65bd86ea37bd..489477c9aa82 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/json-glib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.1 2009/06/13 08:09:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.2 2009/07/06 12:11:11 voyageur Exp $
+
+  06 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  json-glib-0.6.2.ebuild, +files/json-glib-0.6.2-fixtests.patch:
+  Add upstream patch to fix tests, bug #276671
 
 *json-glib-0.6.2 (13 Jun 2009)
 
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 061eb9dc06a9..cd61cf14c6c4 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,4 +1,5 @@
+AUX json-glib-0.6.2-fixtests.patch 976 RMD160 a6f763e10cb64eae5b300ce6805773c448a49f79 SHA1 df1221faf075ee355d9535e3850d4fe83f1efe89 SHA256 73b4ebda3f006aba1ca9a77b19ec7b14edc00321b284dfe39b0fb93a624e0817
 DIST json-glib-0.6.2.tar.gz 453865 RMD160 3e0f9748d64e6372609fdf106f49cf6c25133507 SHA1 de4d9b51cc507e97f3427e01a616a9b6fb7fe3cd SHA256 7befca7f7d7d65cbb260eacd86eff2c1dcae8d859ae2c3e3002e2536d02b2c49
-EBUILD json-glib-0.6.2.ebuild 658 RMD160 8c996b74dc4b69e26129415410d81e61e2f5f2f3 SHA1 7393ceef113e8cf2789291a0eab4e6b86fd562d1 SHA256 19ccae4e8bdf237d336ba5f285d28d1bb05220e1600cc95ab1655c1762aa08ee
-MISC ChangeLog 436 RMD160 c9f578b5f34ee585db3899885f0410713d563609 SHA1 dcd4de5bff4932bea9a452a2608139af55e8423c SHA256 d5720f0253df8f1084c57e39c2de0ddc5244c8b7de55430b9181762b071dab69
+EBUILD json-glib-0.6.2.ebuild 788 RMD160 c978ccfc3bd92cf312ed8ef89ef46754d4de40a3 SHA1 8caad527e01b06abe35c0c9f240b830386e7b63f SHA256 6f390617d1644184cb706e05c01db7e6a0d23d15e17206911d67dad77898536c
+MISC ChangeLog 604 RMD160 624e5af955f8df6729ff067566234d4f1e8a7838 SHA1 843a6662f234c541302f49fc475437df1128e0be SHA256 0e7c96c98152396cf5f95b6dfccdad15e3c2bac8fc2b2d271c9a36ec54816c4f
 MISC metadata.xml 1062 RMD160 8c9644851c8d144f4ea9ad5b9f16e40f8c0e4d80 SHA1 1da40081dc5b39a6f6dcba28a2c985f59a713e5e SHA256 1cc59d76f12fcda3ba90fcbc8bae0a22eadb4dc22ec798e65605ea2df73ee510
diff --git a/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch b/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch
new file mode 100644
index 000000000000..993dcd62d81d
--- /dev/null
+++ b/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch
@@ -0,0 +1,28 @@
+From a19a51df9e95e36edf949e68581731bd31959081 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@linux.intel.com>
+Date: Mon, 13 Apr 2009 21:08:21 +0000
+Subject: [tests] Use 'static' when registering enum types
+
+Bug 1393 - Regression tests fails on OpenBSD
+
+When registering a GEnumClass we need to set the GEnumValue array
+as static const because g_enum_register_static() does not contain
+the word "static" just for fun.
+
+Reported by: Jasper <jasper@humppa.nl>
+---
+diff --git a/tests/test-serialize-full.c b/tests/test-serialize-full.c
+index f549fe1..95925da 100644
+--- a/tests/test-serialize-full.c
++++ b/tests/test-serialize-full.c
+@@ -92,7 +92,7 @@ test_enum_get_type (void)
+ 
+   if (G_UNLIKELY (e_type == 0))
+     {
+-      const GEnumValue values[] = {
++      static const GEnumValue values[] = {
+         { TEST_ENUM_FOO, "TEST_ENUM_FOO", "foo" },
+         { TEST_ENUM_BAR, "TEST_ENUM_BAR", "bar" },
+         { TEST_ENUM_BAZ, "TEST_ENUM_BAZ", "baz" },
+--
+cgit v0.8.2
diff --git a/dev-libs/json-glib/json-glib-0.6.2.ebuild b/dev-libs/json-glib/json-glib-0.6.2.ebuild
index bd28eece7aff..63c11feeb01a 100644
--- a/dev-libs/json-glib/json-glib-0.6.2.ebuild
+++ b/dev-libs/json-glib/json-glib-0.6.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.6.2.ebuild,v 1.1 2009/06/13 08:09:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.6.2.ebuild,v 1.2 2009/07/06 12:11:11 voyageur Exp $
 
-inherit gnome2
+EAPI=2
+inherit gnome2 eutils
 
 DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
 HOMEPAGE="http://live.gnome.org/JsonGlib"
@@ -19,3 +20,8 @@ DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	# http://bugzilla.openedhand.com/show_bug.cgi?id=1393
+	epatch "${FILESDIR}"/${P}-fixtests.patch
+}