diff options
| -rw-r--r-- | dev-libs/json-glib/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch | 28 | ||||
| -rw-r--r-- | dev-libs/json-glib/json-glib-0.10.2.ebuild (renamed from dev-libs/json-glib/json-glib-0.6.2.ebuild) | 19 | ||||
| -rw-r--r-- | dev-libs/json-glib/metadata.xml | 6 |
4 files changed, 25 insertions, 40 deletions
diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog index 5f072bec6ab3..4be0ad2c22ca 100644 --- a/dev-libs/json-glib/ChangeLog +++ b/dev-libs/json-glib/ChangeLog @@ -1,6 +1,14 @@ # 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.5 2009/11/02 20:19:10 voyageur Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.6 2010/06/25 14:12:14 nirbheek Exp $ + +*json-glib-0.10.2 (25 Jun 2010) + + 25 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> + -json-glib-0.6.2.ebuild, -files/json-glib-0.6.2-fixtests.patch, + +json-glib-0.10.2.ebuild, metadata.xml: + Bump to 0.10.2, add +introspection support, remove old+unused 0.6.2 + version *json-glib-0.8.2 (02 Nov 2009) 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 deleted file mode 100644 index 993dcd62d81d..000000000000 --- a/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.10.2.ebuild index 63c11feeb01a..0e9db68e5c9c 100644 --- a/dev-libs/json-glib/json-glib-0.6.2.ebuild +++ b/dev-libs/json-glib/json-glib-0.10.2.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.2 2009/07/06 12:11:11 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.10.2.ebuild,v 1.1 2010/06/25 14:12:14 nirbheek Exp $ + +EAPI="2" -EAPI=2 inherit gnome2 eutils DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format" HOMEPAGE="http://live.gnome.org/JsonGlib" -SRC_URI="http://folks.o-hand.com/~ebassi/sources/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" +IUSE="doc +introspection" RDEPEND=">=dev-libs/glib-2.15" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 - doc? ( dev-util/gtk-doc )" + doc? ( >=dev-util/gtk-doc-1.11 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.3 )" DOCS="AUTHORS ChangeLog NEWS README" -src_prepare() { - # http://bugzilla.openedhand.com/show_bug.cgi?id=1393 - epatch "${FILESDIR}"/${P}-fixtests.patch +pkg_setup() { + G2CONF="${G2CONF} + $(use_enable introspection)" } diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml index cdb3af2fe43c..307911c5dce9 100644 --- a/dev-libs/json-glib/metadata.xml +++ b/dev-libs/json-glib/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>no-herd</herd> + <herd>gnome</herd> <maintainer> <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> @@ -9,4 +9,8 @@ <longdescription>JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format described by RFC 4627. Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects. JSON-GLib uses GLib native data types and the generic value container GValue for ease of development. It also provides integration with the GObject classes for direct serialization into, and deserialization from, JSON data streams.</longdescription> + <use> + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for + introspection</flag> + </use> </pkgmetadata> |