Wed Dec 14 02:54:27 2011 UTC ()
Regenerate diffs for GNU patch.


(sbd)
diff -r1.9 -r1.10 pkgsrc/sysutils/gnometoaster/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/gnometoaster/patches/patch-cddb_c
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/gnometoaster/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnometoaster/Attic/distinfo 2011/11/24 13:34:29 1.9
+++ pkgsrc/sysutils/gnometoaster/Attic/distinfo 2011/12/14 02:54:27 1.10
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.9 2011/11/24 13:34:29 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2011/12/14 02:54:27 sbd Exp $
2 2
3SHA1 (gtoaster1.0Beta5.tgz) = c55bf7e8e532956a8907cd29cbfb98a721c5bb3a 3SHA1 (gtoaster1.0Beta5.tgz) = c55bf7e8e532956a8907cd29cbfb98a721c5bb3a
4RMD160 (gtoaster1.0Beta5.tgz) = f8c7386497c56b8e1bf924e099ddf68cbcbd02a0 4RMD160 (gtoaster1.0Beta5.tgz) = f8c7386497c56b8e1bf924e099ddf68cbcbd02a0
5Size (gtoaster1.0Beta5.tgz) = 781796 bytes 5Size (gtoaster1.0Beta5.tgz) = 781796 bytes
6SHA1 (patch-aa) = 6ae7c9aaf606256111c908f429761877238c4a17 6SHA1 (patch-aa) = 6ae7c9aaf606256111c908f429761877238c4a17
7SHA1 (patch-ac) = 761bb56e22e82d7c9b82698f5c0f1147b6e4bc83 7SHA1 (patch-ac) = 761bb56e22e82d7c9b82698f5c0f1147b6e4bc83
8SHA1 (patch-ad) = b8b5349fe092cbf9d8a40da272d379e5fae7ef91 8SHA1 (patch-ad) = b8b5349fe092cbf9d8a40da272d379e5fae7ef91
9SHA1 (patch-ae) = b1a6f1f9bbaa605b9782f67dd8f6cdaf6770a438 9SHA1 (patch-ae) = b1a6f1f9bbaa605b9782f67dd8f6cdaf6770a438
10SHA1 (patch-af) = ca8bb1aa0b5eb267448dc8761ccfcd8428d00503 10SHA1 (patch-af) = ca8bb1aa0b5eb267448dc8761ccfcd8428d00503
11SHA1 (patch-audiotrack_c) = 9fcd4edb86405db91e6a7b2902b344f9b92f1fbb 11SHA1 (patch-audiotrack_c) = 9fcd4edb86405db91e6a7b2902b344f9b92f1fbb
12SHA1 (patch-audiotrack_h) = 83757fbecfa059a4103099bf63c8544b0b7e1cff 12SHA1 (patch-audiotrack_h) = 83757fbecfa059a4103099bf63c8544b0b7e1cff
13SHA1 (patch-cddb_c) = 18ade5a23408c0eaab0a0604b390abcd55d8ebf8 13SHA1 (patch-cddb_c) = 701da519a05b8ded311570fce628ed1328b2f59b
14SHA1 (patch-cddb_h) = bb49ee918f00e5f94f7733422b09a0e8a6ba22e3 14SHA1 (patch-cddb_h) = bb49ee918f00e5f94f7733422b09a0e8a6ba22e3
15SHA1 (patch-cddrives_c) = 6f870d1c3cc7f756575dacde85a8346d886439fb 15SHA1 (patch-cddrives_c) = 6f870d1c3cc7f756575dacde85a8346d886439fb
16SHA1 (patch-cdromlow_h) = 201c5578d2beaa133e3ac05fe24f639f6124736f 16SHA1 (patch-cdromlow_h) = 201c5578d2beaa133e3ac05fe24f639f6124736f
17SHA1 (patch-datacopydlg_c) = 03f04abc74a3604babd215c60b0ade77cec533ab 17SHA1 (patch-datacopydlg_c) = 03f04abc74a3604babd215c60b0ade77cec533ab
18SHA1 (patch-datacopydlg_h) = 458bd156a2c8c081caf76e845a4f1de0ff240553 18SHA1 (patch-datacopydlg_h) = 458bd156a2c8c081caf76e845a4f1de0ff240553
19SHA1 (patch-datatrack_c) = 3b3c763229a4695154f951c7586db02119746f44 19SHA1 (patch-datatrack_c) = 3b3c763229a4695154f951c7586db02119746f44
20SHA1 (patch-defaultentries_h) = c5c6748b93580f90e59bd514ffea204f14b6e08b 20SHA1 (patch-defaultentries_h) = c5c6748b93580f90e59bd514ffea204f14b6e08b
21SHA1 (patch-dialog_c) = 71884bf907425a5d726138b89045ed8e2a8423b2 21SHA1 (patch-dialog_c) = 71884bf907425a5d726138b89045ed8e2a8423b2
22SHA1 (patch-filelist_c) = bf185c8dc1532668aebe1ce932eac48cf0f9ffe6 22SHA1 (patch-filelist_c) = bf185c8dc1532668aebe1ce932eac48cf0f9ffe6
23SHA1 (patch-fileman_c) = 6427c8b101567a2eda1f7974d25b34f983374fa7 23SHA1 (patch-fileman_c) = 6427c8b101567a2eda1f7974d25b34f983374fa7
24SHA1 (patch-fsedit_c) = 142a4b98d307668ea265260c274e454746319b99 24SHA1 (patch-fsedit_c) = 142a4b98d307668ea265260c274e454746319b99
25SHA1 (patch-getdir_c) = 95acbb1e331f71002a6c59f7542238e1c317b85c 25SHA1 (patch-getdir_c) = 95acbb1e331f71002a6c59f7542238e1c317b85c
26SHA1 (patch-menusys_gtk_c) = cbadeb453ba22dfe8f488659c2655183059e5b17 26SHA1 (patch-menusys_gtk_c) = cbadeb453ba22dfe8f488659c2655183059e5b17
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/gnometoaster/patches/Attic/patch-cddb_c (expand / switch to unified diff)

--- pkgsrc/sysutils/gnometoaster/patches/Attic/patch-cddb_c 2011/10/02 01:20:55 1.1
+++ pkgsrc/sysutils/gnometoaster/patches/Attic/patch-cddb_c 2011/12/14 02:54:27 1.2
@@ -1,59 +1,60 @@ @@ -1,59 +1,60 @@
1$NetBSD: patch-cddb_c,v 1.1 2011/10/02 01:20:55 dholland Exp $ 1$NetBSD: patch-cddb_c,v 1.2 2011/12/14 02:54:27 sbd Exp $
2 2
3- fix include silliness 3- fix include silliness
4- fix LP64 problems 4- fix LP64 problems
5 5
6--- cddb.c.orig 2001-10-28 11:41:51.000000000 +0000 6--- cddb.c.orig 2001-10-28 11:41:51.000000000 +0000
7+++ cddb.c 7+++ cddb.c
8@@ -45,10 +45,7 @@ 8@@ -45,11 +45,8 @@
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
11 #include <sys/types.h> 11 #include <sys/types.h>
12-#ifndef __FreeBSD__ 12-#ifndef __FreeBSD__
13 # include <arpa/inet.h> 13 # include <arpa/inet.h>
14-#else 14-#else
15 # include <netinet/in.h> 15 # include <netinet/in.h>
16-#endif 16-#endif
17 #include <netdb.h> 17 #include <netdb.h>
18 #include <string.h> 18 #include <string.h>
19@@ -431,7 +431,7 @@ GList *cddb_serverrequest(gchar *server, 19 #include <unistd.h>
 20@@ -431,7 +428,7 @@ GList *cddb_serverrequest(gchar *server,
20 if (result==210) 21 if (result==210)
21 { 22 {
22 /* the first line is the corresponding cddb_key */ 23 /* the first line is the corresponding cddb_key */
23- entry=g_list_append(entry,(gpointer)es->cddb_key); 24- entry=g_list_append(entry,(gpointer)es->cddb_key);
24+ entry=g_list_append(entry,(gpointer)(intptr_t)es->cddb_key); 25+ entry=g_list_append(entry,(gpointer)(intptr_t)es->cddb_key);
25 /* store a response line */ 26 /* store a response line */
26 while (cddb_poll(cddb_sfd,resstr)) 27 while (cddb_poll(cddb_sfd,resstr))
27 entry=g_list_append(entry,g_strdup(resstr)); 28 entry=g_list_append(entry,g_strdup(resstr));
28@@ -458,7 +458,7 @@ GList *cddb_cachelookup(cddb_essentials  29@@ -458,7 +455,7 @@ GList *cddb_cachelookup(cddb_essentials
29 while ((current!=NULL)&&(result==NULL)) 30 while ((current!=NULL)&&(result==NULL))
30 { 31 {
31 GList *entry=(GList*)current->data; 32 GList *entry=(GList*)current->data;
32- if ((int)entry->data==es->cddb_key) 33- if ((int)entry->data==es->cddb_key)
33+ if ((int)(intptr_t)entry->data==es->cddb_key) 34+ if ((int)(intptr_t)entry->data==es->cddb_key)
34 result=entry; 35 result=entry;
35 current=current->next; 36 current=current->next;
36 }; 37 };
37@@ -754,7 +754,7 @@ void *cddb_commthread(void *s) 38@@ -754,7 +751,7 @@ void *cddb_commthread(void *s)
38 * cancelled. 39 * cancelled.
39 * data can point to additional informations passed to the callback 40 * data can point to additional informations passed to the callback
40 * but may otherwise safely be set to NULL */ 41 * but may otherwise safely be set to NULL */
41-int cddb_lookup(cddb_essentials *es, 42-int cddb_lookup(cddb_essentials *es,
42+cddb_infostruct *cddb_lookup(cddb_essentials *es, 43+cddb_infostruct *cddb_lookup(cddb_essentials *es,
43 int tracknum, 44 int tracknum,
44 cddb_datahandler callback, 45 cddb_datahandler callback,
45 gpointer data) 46 gpointer data)
46@@ -786,12 +786,12 @@ int cddb_lookup(cddb_essentials *es, 47@@ -786,12 +783,12 @@ int cddb_lookup(cddb_essentials *es,
47 pthread_mutex_unlock(&cddb_sem); 48 pthread_mutex_unlock(&cddb_sem);
48  49
49 }; 50 };
50- return (int)info; 51- return (int)info;
51+ return info; 52+ return info;
52 }; 53 };
53  54
54 /* kill a cddb lookup job. this is done e.g. in tracks.c when the last reference 55 /* kill a cddb lookup job. this is done e.g. in tracks.c when the last reference
55 * to a track has been cleared and the track is about to be deleted */ 56 * to a track has been cleared and the track is about to be deleted */
56-void cddb_killjob(int jobid) 57-void cddb_killjob(int jobid)
57+void cddb_killjob(cddb_infostruct *jobid) 58+void cddb_killjob(cddb_infostruct *jobid)
58 { 59 {
59 if (jobid) 60 if (jobid)