Update librest07 to 0.7.92 (add introspection option, enabled by default).

vairous fixes and some API addition.

6 files changed, 83 insertions, 13 deletions

diff --git a/www/librest07/Makefile b/www/librest07/Makefile
index 0601ddbb16f..1f7cb787b7b 100644
--- a/www/librest07/Makefile
+++ b/www/librest07/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2014/10/07 16:47:15 adam Exp $
+# $NetBSD: Makefile,v 1.14 2014/12/06 07:41:16 obache Exp $
 #
 
-DISTNAME=	rest-0.7.12
-PKGNAME=	librest07-0.7.12
-PKGREVISION=	10
+DISTNAME=	rest-0.7.92
+PKGNAME=	${DISTNAME:S/rest/librest07/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rest/0.7/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://moblin.org/projects/librest
+HOMEPAGE=	http://wiki.gnome.org/Projects/Librest
 COMMENT=	Library for "RESTful" web services
-#LICENSE=	# TODO: (see mk/license.mk)
+LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -19,7 +18,11 @@ USE_TOOLS+=	pkg-config gmake
 # see pkgsrc/security/mozilla-rootcerts
 CONFIGURE_ARGS+= --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
 
-PKGCONFIG_OVERRIDE+=	rest.pc.in
+PKGCONFIG_OVERRIDE+=	rest.pc.in rest-extras.pc.in
+
+TEST_TARGET=	check
+
+.include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
diff --git a/www/librest07/PLIST b/www/librest07/PLIST
index 83b8d0511f2..523b8bd843d 100644
--- a/www/librest07/PLIST
+++ b/www/librest07/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/11 11:40:18 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/06 07:41:16 obache Exp $
 include/rest-0.7/rest-extras/flickr-proxy-call.h
 include/rest-0.7/rest-extras/flickr-proxy.h
 include/rest-0.7/rest-extras/lastfm-proxy-call.h
@@ -11,14 +11,19 @@ include/rest-0.7/rest/oauth2-proxy.h
 include/rest-0.7/rest/rest-enum-types.h
 include/rest-0.7/rest/rest-param.h
 include/rest-0.7/rest/rest-params.h
+include/rest-0.7/rest/rest-proxy-auth.h
 include/rest-0.7/rest/rest-proxy-call.h
 include/rest-0.7/rest/rest-proxy.h
 include/rest-0.7/rest/rest-xml-node.h
 include/rest-0.7/rest/rest-xml-parser.h
+${PLIST.introspection}lib/girepository-1.0/Rest-0.7.typelib
+${PLIST.introspection}lib/girepository-1.0/RestExtras-0.7.typelib
 lib/librest-0.7.la
 lib/librest-extras-0.7.la
 lib/pkgconfig/rest-0.7.pc
 lib/pkgconfig/rest-extras-0.7.pc
+${PLIST.introspection}share/gir-1.0/Rest-0.7.gir
+${PLIST.introspection}share/gir-1.0/RestExtras-0.7.gir
 share/gtk-doc/html/rest-0.7/FlickrProxy.html
 share/gtk-doc/html/rest-0.7/FlickrProxyCall.html
 share/gtk-doc/html/rest-0.7/LastfmProxy.html
@@ -34,14 +39,19 @@ share/gtk-doc/html/rest-0.7/ch01.html
 share/gtk-doc/html/rest-0.7/ch02.html
 share/gtk-doc/html/rest-0.7/ch03.html
 share/gtk-doc/html/rest-0.7/ch04.html
+share/gtk-doc/html/rest-0.7/ch05.html
 share/gtk-doc/html/rest-0.7/home.png
 share/gtk-doc/html/rest-0.7/index.html
 share/gtk-doc/html/rest-0.7/index.sgml
+share/gtk-doc/html/rest-0.7/ix01.html
+share/gtk-doc/html/rest-0.7/ix02.html
+share/gtk-doc/html/rest-0.7/left-insensitive.png
 share/gtk-doc/html/rest-0.7/left.png
-share/gtk-doc/html/rest-0.7/rest-0.7.devhelp
 share/gtk-doc/html/rest-0.7/rest-0.7.devhelp2
 share/gtk-doc/html/rest-0.7/rest-RestParam.html
 share/gtk-doc/html/rest-0.7/rest-RestParams.html
+share/gtk-doc/html/rest-0.7/right-insensitive.png
 share/gtk-doc/html/rest-0.7/right.png
 share/gtk-doc/html/rest-0.7/style.css
+share/gtk-doc/html/rest-0.7/up-insensitive.png
 share/gtk-doc/html/rest-0.7/up.png
diff --git a/www/librest07/distinfo b/www/librest07/distinfo
index 76cb97daafb..1e00717bc1f 100644
--- a/www/librest07/distinfo
+++ b/www/librest07/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/04/11 11:40:18 drochner Exp $
+$NetBSD: distinfo,v 1.2 2014/12/06 07:41:16 obache Exp $
 
-SHA1 (rest-0.7.12.tar.xz) = a773ec89227dd441b4fb2bb6d0fcd1cdefc529d4
-RMD160 (rest-0.7.12.tar.xz) = 377175439158bc9c7ad65dc107b33143f76f86d5
-Size (rest-0.7.12.tar.xz) = 299480 bytes
+SHA1 (rest-0.7.92.tar.xz) = e8cb955148745e75313766a6b5fb7a0da6bf42e8
+RMD160 (rest-0.7.92.tar.xz) = 5d0a9c31094ebc5ead442df9019c1b714a09b18e
+Size (rest-0.7.92.tar.xz) = 321580 bytes
+SHA1 (patch-rest_oauth-proxy-call.c) = 102dcfab3f08272feb4e8536abbecb983dc3df11
+SHA1 (patch-rest_rest-xml-parser.c) = 23c5c77a146d86afb5c85e18a557374c2a017d79
diff --git a/www/librest07/options.mk b/www/librest07/options.mk
new file mode 100644
index 00000000000..4cfb41d3443
--- /dev/null
+++ b/www/librest07/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2014/12/06 07:41:16 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.librest07
+PKG_SUPPORTED_OPTIONS=	introspection
+PKG_SUGGESTED_OPTIONS=	introspection
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	introspection
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=	yes
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.6.7
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif
diff --git a/www/librest07/patches/patch-rest_oauth-proxy-call.c b/www/librest07/patches/patch-rest_oauth-proxy-call.c
new file mode 100644
index 00000000000..e6ff9d6d97a
--- /dev/null
+++ b/www/librest07/patches/patch-rest_oauth-proxy-call.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-rest_oauth-proxy-call.c,v 1.1 2014/12/06 07:41:16 obache Exp $
+
+oauth: Add missing include
+This fixes a compilation warning about a missing prototype.
+
+https://git.gnome.org/browse/librest/commit/?id=b50ace7738ea03817acdad87fb2b338a86018329
+
+--- rest/oauth-proxy-call.c.orig	2014-09-03 08:29:14.000000000 +0000
++++ rest/oauth-proxy-call.c
+@@ -25,6 +25,7 @@
+ #include <rest/rest-proxy-call.h>
+ #include "oauth-proxy-call.h"
+ #include "oauth-proxy-private.h"
++#include "rest-proxy-call-private.h"
+ #include "sha1.h"
+ 
+ G_DEFINE_TYPE (OAuthProxyCall, oauth_proxy_call, REST_TYPE_PROXY_CALL)
diff --git a/www/librest07/patches/patch-rest_rest-xml-parser.c b/www/librest07/patches/patch-rest_rest-xml-parser.c
new file mode 100644
index 00000000000..035eef45bc4
--- /dev/null
+++ b/www/librest07/patches/patch-rest_rest-xml-parser.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-rest_rest-xml-parser.c,v 1.1 2014/12/06 07:41:16 obache Exp $
+
+xml-parser: Add missing break in switch statement
+This would result in an inappropriate debug message appearing on valid
+text data.
+
+https://git.gnome.org/browse/librest/commit/?id=272db68e131a20652c98453b75b9c743cda2b327
+
+--- rest/rest-xml-parser.c.orig	2014-09-02 19:23:50.000000000 +0000
++++ rest/rest-xml-parser.c
+@@ -197,6 +197,7 @@ rest_xml_parser_parse_from_data (RestXml
+         cur_node->content = g_strdup (G(xmlTextReaderConstValue (reader)));
+         REST_DEBUG (XML_PARSER, "Text content found: %s",
+                  cur_node->content);
++        break;
+       default:
+         REST_DEBUG (XML_PARSER, "Found unknown content with type: 0x%x", 
+                  xmlTextReaderNodeType (reader));