[pkgsrc/trunk]: pkgsrc/net/libsoup24 don't overpatch libsoup, just make infor...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/78acb606d3b1
branches:  trunk
changeset: 621665:78acb606d3b1
user:      richard <richard%pkgsrc.org@localhost>
date:      Sun Jul 14 11:26:14 2013 +0000

description:
don't overpatch libsoup, just make informational some errors

diffstat:

 net/libsoup24/Makefile                            |   4 +-
 net/libsoup24/distinfo                            |   4 +-
 net/libsoup24/patches/patch-libsoup_soup-logger.c |  41 +---------------------
 3 files changed, 7 insertions(+), 42 deletions(-)

diffs (85 lines):

diff -r 795e5c3e12fb -r 78acb606d3b1 net/libsoup24/Makefile
--- a/net/libsoup24/Makefile    Sun Jul 14 10:14:26 2013 +0000
+++ b/net/libsoup24/Makefile    Sun Jul 14 11:26:14 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2013/06/10 18:57:55 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2013/07/14 11:26:14 richard Exp $
 
 DISTNAME=      libsoup-2.42.2
 PKGNAME=       ${DISTNAME:S/libsoup/libsoup24/}
@@ -31,6 +31,8 @@
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-4.[01].*) || !empty(CC_VERSION:Mgcc-[1-3].*)
 CONFIGURE_ARGS+=       --disable-more-warnings
+.elif !emptry(CC_VERSION:Mgcc-4.[8].*)
+_WRAP_EXTRA_ARGS.CC+=  -Wno-error=format-zero-length
 .endif
 
 .if !empty(PKGSRC_COMPILER:Mclang)
diff -r 795e5c3e12fb -r 78acb606d3b1 net/libsoup24/distinfo
--- a/net/libsoup24/distinfo    Sun Jul 14 10:14:26 2013 +0000
+++ b/net/libsoup24/distinfo    Sun Jul 14 11:26:14 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2013/07/14 10:14:26 richard Exp $
+$NetBSD: distinfo,v 1.35 2013/07/14 11:26:14 richard Exp $
 
 SHA1 (libsoup-2.42.2.tar.xz) = 8d2a660879c4cf00379ceab04c3e479dedd1405c
 RMD160 (libsoup-2.42.2.tar.xz) = a8bd5d643b5ec3c837eaca1c229cff18727c815f
 Size (libsoup-2.42.2.tar.xz) = 732296 bytes
-SHA1 (patch-libsoup_soup-logger.c) = e6422db7f127d26d764bbad7983316f41386c19b
+SHA1 (patch-libsoup_soup-logger.c) = 064a843b8600fbae746ad44b17db6a9194250c72
 SHA1 (patch-libsoup_soup-xmlrpc.c) = 4d718e7ac61d30361c7835114ee1ad6f31e12343
 SHA1 (patch-tests_coding-test.c) = 2b76cf778cf389d9c67abb2b5222656e7e4191fb
diff -r 795e5c3e12fb -r 78acb606d3b1 net/libsoup24/patches/patch-libsoup_soup-logger.c
--- a/net/libsoup24/patches/patch-libsoup_soup-logger.c Sun Jul 14 10:14:26 2013 +0000
+++ b/net/libsoup24/patches/patch-libsoup_soup-logger.c Sun Jul 14 11:26:14 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-libsoup_soup-logger.c,v 1.2 2013/07/14 10:14:26 richard Exp $
+$NetBSD: patch-libsoup_soup-logger.c,v 1.3 2013/07/14 11:26:14 richard Exp $
 
-fix problems concerning -Werror=format-zero-length and -Werror=format
+fix problems concerning -Werror=format
 
 --- libsoup/soup-logger.c.orig 2013-03-10 16:57:01.000000000 +0000
 +++ libsoup/soup-logger.c
@@ -21,40 +21,3 @@
 +                         "Authorization: Basic [%.*s]", (int)len, decoded);
        g_free (decoded);
  }
- 
-@@ -582,7 +582,7 @@ got_informational (SoupMessage *msg, gpo
-       g_mutex_lock (&priv->lock);
- 
-       print_response (logger, msg);
--      soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "");
-+      soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', " ");
- 
-       if (msg->status_code == SOUP_STATUS_CONTINUE && msg->request_body->data) {
-               SoupLoggerLogLevel log_level;
-@@ -601,7 +601,7 @@ got_informational (SoupMessage *msg, gpo
-                                          "%s", msg->request_body->data);
-               }
- 
--              soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "");
-+              soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', " ");
-       }
- 
-       g_mutex_unlock (&priv->lock);
-@@ -616,7 +616,7 @@ got_body (SoupMessage *msg, gpointer use
-       g_mutex_lock (&priv->lock);
- 
-       print_response (logger, msg);
--      soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "");
-+      soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', " ");
- 
-       g_mutex_unlock (&priv->lock);
- }
-@@ -665,7 +665,7 @@ soup_logger_request_started (SoupSession
-               soup_logger_set_id (logger, socket);
- 
-       print_request (logger, msg, session, socket, restarted);
--      soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', "");
-+      soup_logger_print (logger, SOUP_LOGGER_LOG_MINIMAL, ' ', " ");
- }
- 
- static void