Added some patches for ISO C90 compatibility.

7 files changed, 144 insertions, 1 deletions

diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index 485c0161106..39e0a9ce8ad 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/10/01 15:43:51 smb Exp $
+$NetBSD: distinfo,v 1.3 2005/12/18 21:03:46 rillig Exp $
 
 SHA1 (gtkpod-0.94.0.tar.gz) = 5c6fcb70a90e4ee879e2b2a6fa54b81c57a0378d
 RMD160 (gtkpod-0.94.0.tar.gz) = 0714c6e6f221f124e6f1d53545089af86023600b
@@ -6,3 +6,9 @@ Size (gtkpod-0.94.0.tar.gz) = 983815 bytes
 SHA1 (patch-aa) = b1ffd2a81d5d012bacf069bfbcfb47323cfa0a2d
 SHA1 (patch-ab) = 536611987d882d9c77c21f055bfa0b3299b6b980
 SHA1 (patch-ac) = f1378c5c9154308ce521bf16edd68703f6784980
+SHA1 (patch-ba) = cd23859131e89a3ea7c54a900026589193a16130
+SHA1 (patch-bb) = 599ca360537fc007275096843f7ddcc143148227
+SHA1 (patch-bc) = 50d902cb7f91a16424bec543c7a3dd033cb6f957
+SHA1 (patch-bd) = 7f95521e7b79c5eb5db66e661b6ec1bbbbfa8cad
+SHA1 (patch-be) = b15b57f87b6bb8ece7f99daad4f2824f7a016595
+SHA1 (patch-bf) = 6425770193600e7aca9decd129839a95d1590d31
diff --git a/audio/gtkpod/patches/patch-ba b/audio/gtkpod/patches/patch-ba
new file mode 100644
index 00000000000..bac648747d1
--- /dev/null
+++ b/audio/gtkpod/patches/patch-ba
@@ -0,0 +1,29 @@
+$NetBSD: patch-ba,v 1.1 2005/12/18 21:03:46 rillig Exp $
+
+Keywords: c90
+
+--- src/display_playlists.c.orig	Fri Jun 24 18:17:18 2005
++++ src/display_playlists.c	Sun Dec 18 21:12:39 2005
+@@ -1142,6 +1142,11 @@ void pm_add_playlist (Playlist *playlist
+                     (useful when quitting program) */
+ void pm_remove_playlist (Playlist *playlist, gboolean select)
+ {
++    GtkTreeModel *model;
++    gboolean have_iter = FALSE;
++    GtkTreeIter i;
++    GtkTreeSelection *ts = NULL;
++
+     gboolean pm_delete_playlist_fe (GtkTreeModel *model,
+ 					   GtkTreePath *path,
+ 					   GtkTreeIter *iter,
+@@ -1156,10 +1161,6 @@ void pm_remove_playlist (Playlist *playl
+ 	    }
+ 	    return FALSE;
+ 	};
+-    GtkTreeModel *model;
+-    gboolean have_iter = FALSE;
+-    GtkTreeIter i;
+-    GtkTreeSelection *ts = NULL;
+ 
+   g_return_if_fail (playlist);
+   model = gtk_tree_view_get_model (playlist_treeview);
diff --git a/audio/gtkpod/patches/patch-bb b/audio/gtkpod/patches/patch-bb
new file mode 100644
index 00000000000..1d5d720659c
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bb
@@ -0,0 +1,22 @@
+$NetBSD: patch-bb,v 1.1 2005/12/18 21:03:46 rillig Exp $
+
+Keywords: c90
+
+--- src/display_sorttabs.c.orig	Fri Jul  1 18:53:43 2005
++++ src/display_sorttabs.c	Sun Dec 18 21:15:48 2005
+@@ -2088,12 +2088,14 @@ st_cell_edited (GtkCellRendererText *ren
+ 	  {
+ 	      ExtraTrackData *etr;
+ 	      Track *track = (Track *)g_list_nth_data (members, i);
++	      T_item t_item;
++
+ 	      g_return_if_fail (track);
+ 	      etr = track->userdata;
+ 	      g_return_if_fail (etr);
+ 	      g_return_if_fail (track->itdb);
+ 	      if (!itdb) itdb = track->itdb;
+-	      T_item t_item = ST_to_T (sorttab[inst]->current_category);
++	      t_item = ST_to_T (sorttab[inst]->current_category);
+ 	      if (t_item == T_YEAR)
+ 	      {
+ 		  gint nr = atoi (new_text);
diff --git a/audio/gtkpod/patches/patch-bc b/audio/gtkpod/patches/patch-bc
new file mode 100644
index 00000000000..b23755dad34
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bc
@@ -0,0 +1,18 @@
+$NetBSD: patch-bc,v 1.1 2005/12/18 21:03:46 rillig Exp $
+
+Keywords: c90
+
+--- src/file.c.orig	Fri Jul 15 18:58:40 2005
++++ src/file.c	Sun Dec 18 21:58:03 2005
+@@ -940,8 +940,10 @@ void update_tracks (GList *selected_trac
+     for (gl=selected_tracks; gl; gl=gl->next)
+     {
+ 	Track *track = gl->data;
++	gchar *buf;
++
+ 	g_return_if_fail (track);
+-	gchar *buf = g_strdup_printf (_("Updating %s"),
++	buf = g_strdup_printf (_("Updating %s"),
+ 				      get_track_info (track, TRUE));
+ 	gtkpod_statusbar_message (buf);
+ 	g_free (buf);
diff --git a/audio/gtkpod/patches/patch-bd b/audio/gtkpod/patches/patch-bd
new file mode 100644
index 00000000000..12803e8b774
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bd
@@ -0,0 +1,31 @@
+$NetBSD: patch-bd,v 1.1 2005/12/18 21:03:46 rillig Exp $
+
+Keywords: c90
+
+--- src/itdb_itunesdb.c.orig	Sat Jul 16 09:13:50 2005
++++ src/itdb_itunesdb.c	Sun Dec 18 21:59:37 2005
+@@ -477,9 +477,10 @@ static gunichar2 *fixup_big_utf16 (gunic
+  * return value after use */
+ static struct playcount *playcount_get_next (FImport *fimp)
+ {
+-    g_return_val_if_fail (fimp, NULL);
++    struct playcount *playcount;
+ 
+-    struct playcount *playcount = g_list_nth_data (fimp->playcounts, 0);
++    g_return_val_if_fail (fimp, NULL);
++    playcount = g_list_nth_data (fimp->playcounts, 0);
+ 
+     if (playcount)
+ 	fimp->playcounts = g_list_remove (fimp->playcounts, playcount);
+@@ -1780,8 +1781,10 @@ static gboolean parse_fimp (FImport *fim
+ 	{   /* We just check if it's actually a playlist mhsd (type=2)
+ 	       or not (type = 1, should not be...) */
+ 	    guint32 len = get32lint (cts, seek+8);
++	    guint32 type;
++
+ 	    CHECK_ERROR (fimp, FALSE);
+-	    guint32 type = get32lint (cts, seek+12);
++	    type = get32lint (cts, seek+12);
+ 	    CHECK_ERROR (fimp, FALSE);
+ 	    if (type != 2)
+ 	    {  /* this is not a playlist MHSD -> skip it */
diff --git a/audio/gtkpod/patches/patch-be b/audio/gtkpod/patches/patch-be
new file mode 100644
index 00000000000..f6608b47a6f
--- /dev/null
+++ b/audio/gtkpod/patches/patch-be
@@ -0,0 +1,18 @@
+$NetBSD: patch-be,v 1.1 2005/12/18 21:03:46 rillig Exp $
+
+Keywords: c90
+
+--- src/itdb_playlist.c.orig	Sat Jul  9 08:53:26 2005
++++ src/itdb_playlist.c	Sun Dec 18 22:00:14 2005
+@@ -1184,8 +1184,10 @@ Itdb_Playlist *itdb_playlist_by_id (Itdb
+ /* Return playlist at position @num in @itdb */
+ Itdb_Playlist *itdb_playlist_by_nr (Itdb_iTunesDB *itdb, guint32 num)
+ {
++    Itdb_Playlist *pl;
++
+     g_return_val_if_fail (itdb, NULL);
+-    Itdb_Playlist *pl = g_list_nth_data (itdb->playlists, num);
++    pl = g_list_nth_data (itdb->playlists, num);
+     g_return_val_if_fail (pl, NULL);
+     return pl;
+ }
diff --git a/audio/gtkpod/patches/patch-bf b/audio/gtkpod/patches/patch-bf
new file mode 100644
index 00000000000..142beb61ad1
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bf
@@ -0,0 +1,19 @@
+$NetBSD: patch-bf,v 1.1 2005/12/18 21:03:46 rillig Exp $
+
+Keywords: c90
+
+--- src/misc_track.c.orig	Mon Jun 20 16:32:06 2005
++++ src/misc_track.c	Sun Dec 18 22:01:25 2005
+@@ -544,9 +544,11 @@ guint32 *track_get_timestamp_ptr (Track 
+    illegal, "0" is returned. */
+ guint32 track_get_timestamp (Track *track, T_item t_item)
+ {
++    guint32 *ptr;
++
+     g_return_val_if_fail (track, 0);
+ 
+-    guint32 *ptr = track_get_timestamp_ptr (track, t_item);
++    ptr = track_get_timestamp_ptr (track, t_item);
+     if (ptr)  return *ptr;
+     else      return 0;
+ }