Convert C99-isms to C89, to make this pckage build with gcc 2.95.

4 files changed, 70 insertions, 5 deletions

diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo
index 5d50c393b62..6e2f5e5f1f7 100644
--- a/audio/tunesbrowser/distinfo
+++ b/audio/tunesbrowser/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/20 20:41:22 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/08/14 11:43:53 kristerw Exp $
 
 SHA1 (tunesbrowser-0.1.5.tar.bz2) = 31feff440625d2dad664b7e9fb8ec4055aa151ef
 Size (tunesbrowser-0.1.5.tar.bz2) = 190729 bytes
 SHA1 (patch-aa) = 39d837625a837d4c927bd220d3f3e030b4b122bd
-SHA1 (patch-ab) = 31e9a1e1b3aabce5c8ad559b5146fe46574b835b
+SHA1 (patch-ab) = d9da00f2daf4cdb33ea69f51ffb294f7130765d7
+SHA1 (patch-ac) = c0bad452914fb27e73713c2026f33aa3a4bb74d5
+SHA1 (patch-ad) = 99d5bcac138e5b7e936c288e7531f2b3c5458c83
diff --git a/audio/tunesbrowser/patches/patch-ab b/audio/tunesbrowser/patches/patch-ab
index cf9832e26d9..25fc66d130f 100644
--- a/audio/tunesbrowser/patches/patch-ab
+++ b/audio/tunesbrowser/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/06/20 20:41:22 agc Exp $
+$NetBSD: patch-ab,v 1.2 2004/08/14 11:43:53 kristerw Exp $
 
---- audioplayer.c	2004/06/05 22:56:15	1.1
-+++ audioplayer.c	2004/06/05 22:56:28
+--- audioplayer.c.orig	Thu Apr 29 13:31:57 2004
++++ audioplayer.c	Sat Aug 14 13:30:09 2004
 @@ -80,8 +80,10 @@
      gst_init(0, NULL);
  
@@ -13,3 +13,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/06/20 20:41:22 agc Exp $
      pipesrc = gst_element_factory_make ("fdsrc", "pipe_source");
      if (!pipesrc)
      {
+@@ -136,11 +138,12 @@
+ 
+ void audioplayer_playpipe(int fd)
+ {
++    GstClock *clock;
+     playing = 1;
+     audioplayer_loadpipe(fd);
+ 
+     gst_element_set_state (GST_ELEMENT (pipeline_thread), GST_STATE_PLAYING);
+-    GstClock *clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
++    clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
+     songstarted = gst_clock_get_time(clock) / GST_SECOND;
+ }
+ 
diff --git a/audio/tunesbrowser/patches/patch-ac b/audio/tunesbrowser/patches/patch-ac
new file mode 100644
index 00000000000..456ce20a566
--- /dev/null
+++ b/audio/tunesbrowser/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.1 2004/08/14 11:43:53 kristerw Exp $
+
+--- daap.c.orig	Sat Aug 14 13:30:46 2004
++++ daap.c	Sat Aug 14 13:34:37 2004
+@@ -453,6 +453,7 @@
+ 
+     for (i = 0; i < currentSongItemCount; i++)
+     {
++        int minutes, seconds;
+         char time[11] = {0};
+         char track[11] = {0};
+         char year[11] = {0};
+@@ -464,8 +465,6 @@
+                 strcasecmp(selected_album, currentSongItems[i].songalbum) != 0)
+             continue;
+ 
+-        int minutes, seconds;
+-
+         seconds = (currentSongItems[i].songtime) / 1000;
+         minutes = seconds / 60;
+         seconds -= minutes * 60;
+@@ -562,11 +561,11 @@
+ 
+ char *get_song_display_str_withalloc(int id)
+ {
++    char *buf;
+     int songindex = findSongByID(id);
+ 
+     if (!songindex) return NULL;
+ 
+-    char *buf;
+     buf = malloc(strlen(currentSongItems[songindex].songartist) + strlen(" - ")
+                  + strlen(currentSongItems[songindex].itemname) + 1);
+ 
diff --git a/audio/tunesbrowser/patches/patch-ad b/audio/tunesbrowser/patches/patch-ad
new file mode 100644
index 00000000000..77d50e0313e
--- /dev/null
+++ b/audio/tunesbrowser/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2004/08/14 11:43:53 kristerw Exp $
+
+--- misc_ui.c.orig	Sat Aug 14 13:32:13 2004
++++ misc_ui.c	Sat Aug 14 13:35:31 2004
+@@ -138,9 +138,9 @@
+ 
+     if (seconds >= 0)
+     {
++        char bufstr[11] = {0};
+         int minutes = seconds / 60;
+         seconds -= minutes * 60;
+-        char bufstr[11] = {0};
+ 
+         snprintf(bufstr, 10, "%i:%02i",
+                  minutes, seconds);