update to librest-0.7.91
This commit is contained in:
jasper
parent
7aca6dd5be
commit
df6ffce717
@ -1,19 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2013/10/26 08:02:57 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2014/03/11 07:56:58 jasper Exp $
|
||||
|
||||
COMMENT = access web services that claim to be RESTful
|
||||
|
||||
GNOME_VERSION = 0.7.90
|
||||
GNOME_VERSION = 0.7.91
|
||||
GNOME_PROJECT = rest
|
||||
PKGNAME = lib${DISTNAME}
|
||||
REVISION = 2
|
||||
|
||||
CATEGORIES = net devel
|
||||
|
||||
SHARED_LIBS += rest-0.7 0.2
|
||||
SHARED_LIBS += rest-extras-0.7 0.0
|
||||
|
||||
HOMEPAGE = http://moblin.org/projects/librest
|
||||
|
||||
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
|
||||
Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (rest-0.7.90.tar.xz) = HWgqyqxNlGzHyYot2dZajIOm/bjKZ1nnC4tQQv5mwCI=
|
||||
SIZE (rest-0.7.90.tar.xz) = 305472
|
||||
SHA256 (rest-0.7.91.tar.xz) = g4gU2TUUPy3JnrefGsacYV57VHM59s0ibdDtTXwWtno=
|
||||
SIZE (rest-0.7.91.tar.xz) = 321120
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-rest_rest-proxy-call-private_h,v 1.1 2013/09/26 07:44:22 jasper Exp $
|
||||
|
||||
From 2b363686aa1cbfa2d778a16b813472f1bf309cbf Mon Sep 17 00:00:00 2001
|
||||
From: Alban Crequy <alban.crequy@collabora.co.uk>
|
||||
Date: Mon, 17 Jun 2013 14:07:15 +0000
|
||||
Subject: call: disconnect GCancellable 'cancel' signal
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=702483
|
||||
|
||||
--- rest/rest-proxy-call-private.h.orig Fri Jul 1 00:05:01 2011
|
||||
+++ rest/rest-proxy-call-private.h Thu Sep 26 08:44:18 2013
|
||||
@@ -47,6 +47,9 @@ struct _RestProxyCallPrivate {
|
||||
guint status_code;
|
||||
gchar *status_message;
|
||||
|
||||
+ GCancellable *cancellable;
|
||||
+ gulong cancel_sig;
|
||||
+
|
||||
RestProxy *proxy;
|
||||
|
||||
RestProxyCallAsyncClosure *cur_call_closure;
|
||||
@ -1,60 +0,0 @@
|
||||
$OpenBSD: patch-rest_rest-proxy-call_c,v 1.1 2013/09/26 07:44:22 jasper Exp $
|
||||
|
||||
From 2b363686aa1cbfa2d778a16b813472f1bf309cbf Mon Sep 17 00:00:00 2001
|
||||
From: Alban Crequy <alban.crequy@collabora.co.uk>
|
||||
Date: Mon, 17 Jun 2013 14:07:15 +0000
|
||||
Subject: call: disconnect GCancellable 'cancel' signal
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=702483
|
||||
|
||||
--- rest/rest-proxy-call.c.orig Tue Aug 14 09:47:51 2012
|
||||
+++ rest/rest-proxy-call.c Thu Sep 26 08:44:18 2013
|
||||
@@ -110,6 +110,12 @@ rest_proxy_call_dispose (GObject *object)
|
||||
{
|
||||
RestProxyCallPrivate *priv = GET_PRIVATE (object);
|
||||
|
||||
+ if (priv->cancellable)
|
||||
+ {
|
||||
+ g_signal_handler_disconnect (priv->cancellable, priv->cancel_sig);
|
||||
+ g_clear_object (&priv->cancellable);
|
||||
+ }
|
||||
+
|
||||
if (priv->params)
|
||||
{
|
||||
rest_params_free (priv->params);
|
||||
@@ -921,8 +927,6 @@ _call_message_call_completed_cb (SoupSession *session,
|
||||
call = REST_PROXY_CALL (
|
||||
g_async_result_get_source_object (G_ASYNC_RESULT (result)));
|
||||
|
||||
- // FIXME: disconnect cancellable ?
|
||||
-
|
||||
finish_call (call, message, &error);
|
||||
|
||||
if (error != NULL)
|
||||
@@ -973,8 +977,11 @@ rest_proxy_call_invoke_async (RestProxyCall *call
|
||||
user_data, rest_proxy_call_invoke_async);
|
||||
|
||||
if (cancellable != NULL)
|
||||
- g_signal_connect (cancellable, "cancelled",
|
||||
- G_CALLBACK (_call_message_call_cancelled_cb), call);
|
||||
+ {
|
||||
+ priv->cancel_sig = g_signal_connect (cancellable, "cancelled",
|
||||
+ G_CALLBACK (_call_message_call_cancelled_cb), call);
|
||||
+ priv->cancellable = g_object_ref (cancellable);
|
||||
+ }
|
||||
|
||||
_rest_proxy_queue_message (priv->proxy,
|
||||
message,
|
||||
@@ -1258,6 +1265,12 @@ rest_proxy_call_cancel (RestProxyCall *call)
|
||||
|
||||
priv = GET_PRIVATE (call);
|
||||
closure = priv->cur_call_closure;
|
||||
+
|
||||
+ if (priv->cancellable)
|
||||
+ {
|
||||
+ g_signal_handler_disconnect (priv->cancellable, priv->cancel_sig);
|
||||
+ g_clear_object (&priv->cancellable);
|
||||
+ }
|
||||
|
||||
if (closure)
|
||||
{
|
||||
@ -1,3 +0,0 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2011/04/28 10:48:38 jasper Exp $
|
||||
@lib lib/librest-0.7.so.${LIBrest-0.7_VERSION}
|
||||
@lib lib/librest-extras-0.7.so.${LIBrest-extras-0.7_VERSION}
|
||||
@ -1,5 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2012/08/15 10:58:25 jasper Exp $
|
||||
%%SHARED%%
|
||||
@comment $OpenBSD: PLIST,v 1.5 2014/03/11 07:56:59 jasper Exp $
|
||||
include/rest-0.7/
|
||||
include/rest-0.7/rest/
|
||||
include/rest-0.7/rest-extras/
|
||||
@ -25,8 +24,10 @@ lib/girepository-1.0/Rest-0.7.typelib
|
||||
lib/girepository-1.0/RestExtras-0.7.typelib
|
||||
lib/librest-0.7.a
|
||||
lib/librest-0.7.la
|
||||
@lib lib/librest-0.7.so.${LIBrest-0.7_VERSION}
|
||||
lib/librest-extras-0.7.a
|
||||
lib/librest-extras-0.7.la
|
||||
@lib lib/librest-extras-0.7.so.${LIBrest-extras-0.7_VERSION}
|
||||
lib/pkgconfig/
|
||||
lib/pkgconfig/rest-0.7.pc
|
||||
lib/pkgconfig/rest-extras-0.7.pc
|
||||
@ -51,13 +52,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.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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user