[pkgsrc/trunk]: pkgsrc/net/libsoup24 update to 2.38.1

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae54f9d8bb64
branches:  trunk
changeset: 603220:ae54f9d8bb64
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Apr 30 14:22:36 2012 +0000

description:
update to 2.38.1
This is a new major release.

diffstat:

 net/libsoup24/Makefile         |   9 ++--
 net/libsoup24/distinfo         |   9 ++--
 net/libsoup24/patches/patch-aa |  78 ------------------------------------------
 3 files changed, 8 insertions(+), 88 deletions(-)

diffs (115 lines):

diff -r 891803620c4c -r ae54f9d8bb64 net/libsoup24/Makefile
--- a/net/libsoup24/Makefile    Mon Apr 30 14:21:03 2012 +0000
+++ b/net/libsoup24/Makefile    Mon Apr 30 14:22:36 2012 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2012/04/27 12:31:59 obache Exp $
+# $NetBSD: Makefile,v 1.40 2012/04/30 14:22:36 drochner Exp $
 
-DISTNAME=      libsoup-2.36.1
+DISTNAME=      libsoup-2.38.1
 PKGNAME=       ${DISTNAME:S/libsoup/libsoup24/}
-PKGREVISION=   3
 CATEGORIES=    net gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libsoup/2.36/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libsoup/2.38/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnome.org/
diff -r 891803620c4c -r ae54f9d8bb64 net/libsoup24/distinfo
--- a/net/libsoup24/distinfo    Mon Apr 30 14:21:03 2012 +0000
+++ b/net/libsoup24/distinfo    Mon Apr 30 14:22:36 2012 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.26 2012/01/30 18:43:52 drochner Exp $
+$NetBSD: distinfo,v 1.27 2012/04/30 14:22:36 drochner Exp $
 
-SHA1 (libsoup-2.36.1.tar.bz2) = b59e6524e8a75cd57059d539e9d408b44129a198
-RMD160 (libsoup-2.36.1.tar.bz2) = e4f361c07376ca1595e6d53099a81769897ace37
-Size (libsoup-2.36.1.tar.bz2) = 715466 bytes
-SHA1 (patch-aa) = 83207f05095bceb280357c0a9ebb4ab0a9e97770
+SHA1 (libsoup-2.38.1.tar.xz) = 8418440ff59917dee2e5618965cf8683b61258bf
+RMD160 (libsoup-2.38.1.tar.xz) = 6603131f0c1e84225f7b508a18927e3733910ddc
+Size (libsoup-2.38.1.tar.xz) = 620832 bytes
diff -r 891803620c4c -r ae54f9d8bb64 net/libsoup24/patches/patch-aa
--- a/net/libsoup24/patches/patch-aa    Mon Apr 30 14:21:03 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2012/01/29 10:41:19 drochner Exp $
-
-gnome bug #658743
-
---- libsoup/soup-http-input-stream.c.orig      2011-03-27 15:59:43.000000000 +0000
-+++ libsoup/soup-http-input-stream.c
-@@ -45,7 +45,7 @@ typedef struct {
-       goffset offset;
- 
-       GCancellable *cancellable;
--      GSource *cancel_watch;
-+      guint cancel_id;
-       SoupHTTPInputStreamCallback got_headers_cb;
-       SoupHTTPInputStreamCallback got_chunk_cb;
-       SoupHTTPInputStreamCallback finished_cb;
-@@ -310,19 +310,19 @@ soup_http_input_stream_finished (SoupMes
-               priv->finished_cb (stream);
- }
- 
--static gboolean
--soup_http_input_stream_cancelled (GIOChannel *chan, GIOCondition condition,
--                                       gpointer stream)
-+static void
-+soup_http_input_stream_cancelled (GCancellable *cancellable,
-+                                       gpointer user_data)
- {
-+      SoupHTTPInputStream *stream = user_data;
-       SoupHTTPInputStreamPrivate *priv = SOUP_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
- 
--      priv->cancel_watch = NULL;
-+      g_signal_handler_disconnect (cancellable, priv->cancel_id);
-+      priv->cancel_id = 0;
- 
-       soup_session_pause_message (priv->session, priv->msg);
-       if (priv->cancelled_cb)
--              priv->cancelled_cb (stream);
--
--      return FALSE;
-+              priv->cancelled_cb (G_INPUT_STREAM (stream));
- }
- 
- static void
-@@ -332,17 +332,12 @@ soup_http_input_stream_prepare_for_io (G
-                                      gsize count)
- {
-       SoupHTTPInputStreamPrivate *priv = SOUP_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
--      int cancel_fd;
- 
-       priv->cancellable = cancellable;
--      cancel_fd = g_cancellable_get_fd (cancellable);
--      if (cancel_fd != -1) {
--              GIOChannel *chan = g_io_channel_unix_new (cancel_fd);
--              priv->cancel_watch = soup_add_io_watch (priv->async_context, chan,
--                                                      G_IO_IN | G_IO_ERR | G_IO_HUP,
--                                                      soup_http_input_stream_cancelled,
--                                                      stream);
--              g_io_channel_unref (chan);
-+      if (cancellable) {
-+              priv->cancel_id = g_signal_connect (cancellable, "cancelled",
-+                              G_CALLBACK (soup_http_input_stream_cancelled),
-+                              stream);
-       }
- 
-       priv->caller_buffer = buffer;
-@@ -358,10 +353,9 @@ soup_http_input_stream_done_io (GInputSt
- {
-       SoupHTTPInputStreamPrivate *priv = SOUP_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
- 
--      if (priv->cancel_watch) {
--              g_source_destroy (priv->cancel_watch);
--              priv->cancel_watch = NULL;
--              g_cancellable_release_fd (priv->cancellable);
-+      if (priv->cancel_id) {
-+              g_signal_handler_disconnect (priv->cancellable, priv->cancel_id);
-+              priv->cancel_id = 0;
-       }
-       priv->cancellable = NULL;
-