summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/gtkpod/patches/patch-aa12
-rw-r--r--audio/gtkpod/patches/patch-ab12
-rw-r--r--audio/gtkpod/patches/patch-ac13
-rw-r--r--audio/gtkpod/patches/patch-ba29
-rw-r--r--audio/gtkpod/patches/patch-bb22
-rw-r--r--audio/gtkpod/patches/patch-bc18
-rw-r--r--audio/gtkpod/patches/patch-bd31
-rw-r--r--audio/gtkpod/patches/patch-be18
-rw-r--r--audio/gtkpod/patches/patch-bf19
-rw-r--r--audio/gtkpod/patches/patch-bh13
-rw-r--r--audio/gtkpod/patches/patch-bi16
11 files changed, 29 insertions, 174 deletions
diff --git a/audio/gtkpod/patches/patch-aa b/audio/gtkpod/patches/patch-aa
deleted file mode 100644
index 0e392d4355d..00000000000
--- a/audio/gtkpod/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/01 13:29:52 smb Exp $
-
---- src/misc.c.orig 2005-07-15 10:39:37.000000000 -0400
-+++ src/misc.c
-@@ -347,6 +347,7 @@ GList *glist_duplicate (GList *list)
- * does not check prefs to see if the current prefs want gtkpod itself to
- * mount the ipod drive, that should be checked before making this call.
- */
-+#include <sys/param.h>
- #include <sys/mount.h>
- #include <errno.h>
- #include <stdio.h>
diff --git a/audio/gtkpod/patches/patch-ab b/audio/gtkpod/patches/patch-ab
deleted file mode 100644
index a313299ea24..00000000000
--- a/audio/gtkpod/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/01 13:29:52 smb Exp $
-
---- src/Makefile.am.orig 2005-09-17 18:19:42.000000000 -0400
-+++ src/Makefile.am 2005-09-17 18:20:23.000000000 -0400
-@@ -3,6 +3,7 @@
- AM_CFLAGS = @PACKAGE_CFLAGS@
-
- INCLUDES = @PACKAGE_CFLAGS@ \
-+ -DHAVE_statvfs \
- -DMOUNT_BIN=\""@MOUNT@\"" \
- -DUMOUNT_BIN=\""@UMOUNT@\"" \
- -DEJECT_BIN=\""@EJECT@\"" \
diff --git a/audio/gtkpod/patches/patch-ac b/audio/gtkpod/patches/patch-ac
deleted file mode 100644
index 1eebbc67f46..00000000000
--- a/audio/gtkpod/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/01 13:29:52 smb Exp $
-
---- src/info.c.orig 2005-09-17 18:18:15.000000000 -0400
-+++ src/info.c 2005-09-17 18:18:47.000000000 -0400
-@@ -687,7 +687,7 @@
- {
- for (;;)
- {
-- usleep (SPACE_TIMEOUT*1000);
-+ (void) sleep (SPACE_TIMEOUT/1000);
- if (!space_uptodate) th_space_update ();
- }
- }
diff --git a/audio/gtkpod/patches/patch-ba b/audio/gtkpod/patches/patch-ba
deleted file mode 100644
index bac648747d1..00000000000
--- a/audio/gtkpod/patches/patch-ba
+++ /dev/null
@@ -1,29 +0,0 @@
-$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
deleted file mode 100644
index 1d5d720659c..00000000000
--- a/audio/gtkpod/patches/patch-bb
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index b23755dad34..00000000000
--- a/audio/gtkpod/patches/patch-bc
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 12803e8b774..00000000000
--- a/audio/gtkpod/patches/patch-bd
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index f6608b47a6f..00000000000
--- a/audio/gtkpod/patches/patch-be
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 142beb61ad1..00000000000
--- a/audio/gtkpod/patches/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-$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;
- }
diff --git a/audio/gtkpod/patches/patch-bh b/audio/gtkpod/patches/patch-bh
new file mode 100644
index 00000000000..953dad1c0ef
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2007/07/08 20:49:08 smb Exp $
+
+--- scripts/sync-tomboy.sh.orig 2006-05-17 12:02:30.000000000 +0000
++++ scripts/sync-tomboy.sh
+@@ -124,7 +124,7 @@ I=0
+ ls *.note |
+ (
+ read FILE
+- while [ "$?" == "0" ]; do
++ while [ "$?" = "0" ]; do
+ ((++I))
+
+ # Get the starting and ending lines for the data
diff --git a/audio/gtkpod/patches/patch-bi b/audio/gtkpod/patches/patch-bi
new file mode 100644
index 00000000000..b67d0ba4bf5
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bi
@@ -0,0 +1,16 @@
+$NetBSD: patch-bi,v 1.1 2007/07/08 20:49:08 smb Exp $
+
+--- scripts/sync-ldif.sh.orig 2005-08-29 14:29:24.000000000 +0000
++++ scripts/sync-ldif.sh
+@@ -130,9 +130,9 @@ done
+ IS_IPOD_DIR_VALID
+
+ # Is LDIFILE really a ldif file? just testing the extension, and if the file exists...
+-if [ "${LDIFILE##*.}" == "ldif" ] || [ "${LDIFILE##*.}" == "LDIF" ] && [ -e "$LDIFILE" ] ; then
++if [ "${LDIFILE##*.}" = "ldif" ] || [ "${LDIFILE##*.}" = "LDIF" ] && [ -e "$LDIFILE" ] ; then
+ # The $IPOD_MOUNT/Contacts/ directory will be emptied if '-d' option!
+- if [ "$DELETE" == "OK" ]; then
++ if [ "$DELETE" = "OK" ]; then
+ echo "Old contacts being deleted from $IPOD_MOUNT. Work in progress..."
+ DELETE_VCFILE_FROM_IPOD
+ sleep 1
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 01:17:39 +0000