[pkgsrc/trunk]: pkgsrc/audio/libopendaap Fix two cases of C99 variable declar...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07985f927cab
branches:  trunk
changeset: 500046:07985f927cab
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat Oct 01 18:13:17 2005 +0000

description:
Fix two cases of C99 variable declarations to make this pkg compile when
using gcc 2.95.

diffstat:

 audio/libopendaap/distinfo         |   5 +++--
 audio/libopendaap/patches/patch-aa |  17 +++++++++++++++++
 audio/libopendaap/patches/patch-af |  18 +++++++++++++++---
 3 files changed, 35 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 778a4d8629ea -r 07985f927cab audio/libopendaap/distinfo
--- a/audio/libopendaap/distinfo        Sat Oct 01 17:25:32 2005 +0000
+++ b/audio/libopendaap/distinfo        Sat Oct 01 18:13:17 2005 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/08/05 12:53:08 tonio Exp $
+$NetBSD: distinfo,v 1.10 2005/10/01 18:13:17 kristerw Exp $
 
 SHA1 (libopendaap-0.4.0.tar.bz2) = 5fe4382af7ecc97a6cb510ebec87b40d6cf6ef38
 RMD160 (libopendaap-0.4.0.tar.bz2) = ed8732c6c487ef4902ff2d68552a66418cf2760d
 Size (libopendaap-0.4.0.tar.bz2) = 241953 bytes
+SHA1 (patch-aa) = c350abb98a94e21c12d03b585bcad97c9b926f74
 SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d
 SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1
-SHA1 (patch-af) = b5811cd930bb45be33cd72f31913e3de85db45f3
+SHA1 (patch-af) = ba10291fd391f1f8ba6258924b44b1886b43e98f
diff -r 778a4d8629ea -r 07985f927cab audio/libopendaap/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libopendaap/patches/patch-aa        Sat Oct 01 18:13:17 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.5 2005/10/01 18:13:17 kristerw Exp $
+
+gcc-2.95.3 does not like code intermixed with declarations.
+
+--- ioloop.c.orig      Sat Oct  1 20:07:03 2005
++++ ioloop.c   Sat Oct  1 20:07:34 2005
+@@ -113,9 +113,9 @@
+ 
+ void fd_event_reset(fd_event *event)
+ {
+-    event->signalled = 0;
+     char buf[1] = {0};
+     int flags;
++    event->signalled = 0;
+ 
+     /* set non-blocking on read pipe */
+     flags = fcntl(event->pipe[0], F_GETFL, 0);
diff -r 778a4d8629ea -r 07985f927cab audio/libopendaap/patches/patch-af
--- a/audio/libopendaap/patches/patch-af        Sat Oct 01 17:25:32 2005 +0000
+++ b/audio/libopendaap/patches/patch-af        Sat Oct 01 18:13:17 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.2 2005/08/05 12:53:08 tonio Exp $
+$NetBSD: patch-af,v 1.3 2005/10/01 18:13:17 kristerw Exp $
 
 gcc-2.95.3 does not like code intermixed with declarations.
 
---- client.c.orig      2005-08-04 10:43:47.000000000 +0200
-+++ client.c   2005-08-04 10:44:42.000000000 +0200
+--- client.c.orig      Thu May 12 08:46:29 2005
++++ client.c   Sat Oct  1 20:02:09 2005
 @@ -1379,11 +1379,10 @@
      int requestid = 0;
  
@@ -17,3 +17,15 @@
      if (pCHThis->version_major != 3)
      {
          buf = safe_sprintf(songUrl_42, databaseid, songid, songformat,
+@@ -1643,10 +1642,10 @@
+ static void AsyncWaitUpdate(void *pv_pCHThis, void *unused)
+ {
+     DAAP_SClientHost *pCHThis = (DAAP_SClientHost*)pv_pCHThis;
+-    TRACE("()\n");
+     char hash[33] = {0};
+     char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i";
+     char *buf;
++    TRACE("()\n");
+ 
+     buf = safe_sprintf(updateUrl, pCHThis->sessionid, pCHThis->revision_number,
+                        pCHThis->revision_number);