cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to gtkpod 0.99.8. Prompted by fgsch, suggestions from Deanna Phillips.

Browse Source 
ok mbalmer
This commit is contained in:
ckuethe 2006-10-15 22:44:35 +00:00
parent ced0b25392
commit 4cbb2f6104
8 changed files with 141 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/gtkpod/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2006/09/18 11:40:06 espie Exp $
# $OpenBSD: Makefile,v 1.15 2006/10/15 22:44:35 ckuethe Exp $
COMMENT= "GTK+2 program to synchronize an Apple iPod"
DISTNAME= gtkpod-0.99.4
PKGNAME= ${DISTNAME}p2
DISTNAME= gtkpod-0.99.8
#PKGNAME= ${DISTNAME}
CATEGORIES= audio x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
@ -21,7 +21,7 @@ USE_X11= Yes
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= atk-1.0.>=800.0::devel/atk \
id3tag.>=2::audio/libid3tag \
gpod.>=302.0::audio/libgpod \
gpod.>=400.0::audio/libgpod \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
glade-2.0.>=0.4::devel/libglade2 \
glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2 \

8
audio/gtkpod/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gtkpod-0.99.4.tar.gz) = 5d153249b2586ffefc47e0f4a58ef58e
RMD160 (gtkpod-0.99.4.tar.gz) = f61d02b0c7074c43183545332011babd4761c4c5
SHA1 (gtkpod-0.99.4.tar.gz) = 04a61ae61e4c46a3a00bf2b7a1e55cadbec82a58
SIZE (gtkpod-0.99.4.tar.gz) = 975599
MD5 (gtkpod-0.99.8.tar.gz) = f04b67605204d9076d30d83b72b78463
RMD160 (gtkpod-0.99.8.tar.gz) = 6ad6305393d66f7a84cc11e475045c8137a20c80
SHA1 (gtkpod-0.99.8.tar.gz) = 023b55bc3cd9efba9fc7aa016ae63538a98cf1cf
SIZE (gtkpod-0.99.8.tar.gz) = 1074007

12
audio/gtkpod/patches/patch-src_file_export_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_file_export_c,v 1.2 2006/01/20 06:27:28 jolan Exp $
--- src/file_export.c.orig Sat Dec 10 10:04:28 2005
+++ src/file_export.c Fri Jan 6 15:45:20 2006
@@ -78,7 +78,7 @@ const gchar *EXPORT_FILES_TPL_DFLT="%o;%
/**
* READ_WRITE_BLOCKSIZE - how many bytes we read per fread/fwrite call
*/
-#define READ_WRITE_BLOCKSIZE 65536
+#define READ_WRITE_BLOCKSIZE 1024
#ifdef G_THREADS_ENABLED

92
audio/gtkpod/patches/patch-src_file_itunesdb_c Normal file
View File

@ -0,0 +1,92 @@
$OpenBSD: patch-src_file_itunesdb_c,v 1.1 2006/10/15 22:44:35 ckuethe Exp $
--- src/file_itunesdb.c.orig Tue Oct 3 11:45:05 2006
+++ src/file_itunesdb.c Tue Oct 3 11:48:46 2006
@@ -547,7 +547,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_
gp_itdb_add_extra_full (itdb);
eitdb = itdb->userdata;
- g_return_val_if_fail (eitdb, (release_widgets(), NULL));
+ g_return_val_if_fail (eitdb, (release_widgets(), (iTunesDB *)NULL));
eitdb->offline = offline;
@@ -571,9 +571,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_
{
Track *track = gl->data;
ExtraTrackData *etr;
- g_return_val_if_fail (track, (release_widgets(), NULL));
+ g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
etr = track->userdata;
- g_return_val_if_fail (etr, (release_widgets(), NULL));
+ g_return_val_if_fail (etr, (release_widgets(), (iTunesDB *)NULL));
fill_in_extended_info (track, total, num);
gp_track_validate_entries (track);
/* properly set value for has_artwork */
@@ -609,7 +609,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_
while (extendeddeletion)
{
Track *track = extendeddeletion->data;
- g_return_val_if_fail (track, (release_widgets(), NULL));
+ g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
mark_track_for_deletion (itdb, track);
extendeddeletion = g_list_delete_link (extendeddeletion,
extendeddeletion);
@@ -632,15 +632,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_
GHashTable *track_hash = g_hash_table_new (g_direct_hash,
g_direct_equal);
Playlist *mpl = itdb_playlist_mpl (itdb);
- g_return_val_if_fail (mpl, (release_widgets(), NULL));
- g_return_val_if_fail (old_eitdb, (release_widgets(), NULL));
+ g_return_val_if_fail (mpl, (release_widgets(), (iTunesDB *)NULL));
+ g_return_val_if_fail (old_eitdb, (release_widgets(), (iTunesDB *)NULL));
/* add tracks from @old_itdb to new itdb */
for (gl=old_itdb->tracks; gl; gl=gl->next)
{
Track *duptr, *addtr;
Track *track = gl->data;
- g_return_val_if_fail (track, (release_widgets(), NULL));
+ g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
duptr = itdb_track_duplicate (track);
/* add to database -- if duplicate detection is on and the
same track already exists in the database, the already
@@ -659,15 +659,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_
GList *glm;
Playlist *duppl;
Playlist *pl = gl->next->data; /* skip MPL */
- g_return_val_if_fail (pl, (release_widgets(), NULL));
+ g_return_val_if_fail (pl, (release_widgets(), (iTunesDB *)NULL));
duppl = itdb_playlist_duplicate (pl);
/* switch members */
for (glm=duppl->members; glm; glm=glm->next)
{
Track *newtr;
- g_return_val_if_fail (glm->data, (release_widgets(), NULL));
+ g_return_val_if_fail (glm->data, (release_widgets(), (iTunesDB *)NULL));
newtr = g_hash_table_lookup (track_hash, glm->data);
- g_return_val_if_fail (newtr, (release_widgets(), NULL));
+ g_return_val_if_fail (newtr, (release_widgets(), (iTunesDB *)NULL));
glm->data = newtr;
}
/* if it's the podcasts list, don't add the list again if
@@ -678,7 +678,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_
Playlist *podcasts = itdb_playlist_podcasts (itdb);
for (glm=duppl->members; glm; glm=glm->next)
{
- g_return_val_if_fail (glm->data, (release_widgets(), NULL));
+ g_return_val_if_fail (glm->data, (release_widgets(), (iTunesDB *)NULL));
itdb_playlist_add_track (podcasts, glm->data, -1);
}
itdb_playlist_free (duppl);
@@ -740,9 +740,9 @@ iTunesDB *gp_merge_itdb (iTunesDB *old_i
ExtraiTunesDBData *old_eitdb;
iTunesDB *new_itdb;
- g_return_val_if_fail (old_itdb, NULL);
+ g_return_val_if_fail (old_itdb, (iTunesDB *)NULL);
old_eitdb = old_itdb->userdata;
- g_return_val_if_fail (old_eitdb, NULL);
+ g_return_val_if_fail (old_eitdb, (iTunesDB *)NULL);
if (old_itdb->usertype & GP_ITDB_TYPE_LOCAL)
{

41
audio/gtkpod/patches/patch-src_info_c Normal file
View File

@ -0,0 +1,41 @@
$OpenBSD: patch-src_info_c,v 1.1 2006/10/15 22:44:35 ckuethe Exp $
--- src/info.c.orig Tue Oct 3 12:05:13 2006
+++ src/info.c Tue Oct 3 12:07:38 2006
@@ -576,14 +576,17 @@ gboolean ipod_connected (void)
/* we'll use statvfs to determine free space on the iPod where
available, df otherwise */
-#ifdef HAVE_STATVFS
+#if 1
#include <sys/types.h>
-#include <sys/statvfs.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/mount.h>
+
/* update space_ipod_free and space_ipod_used */
static void th_space_update (void)
{
gchar *mp=NULL;
- struct statvfs stat;
+ struct statfs sf;
int status;
g_mutex_lock (space_mutex);
@@ -595,13 +598,13 @@ static void th_space_update (void)
}
if (mp)
{
- status = statvfs (mp, &stat);
+ status = statfs (mp, &sf);
if (status != 0) {
/* XXX: why would this fail - what to do here??? */
goto done;
}
- space_ipod_free = (gdouble)stat.f_bavail * stat.f_frsize;
- space_ipod_used = ((gdouble)stat.f_blocks * stat.f_frsize) -
+ space_ipod_free = (gdouble)sf.f_bavail * sf.f_bsize;
+ space_ipod_used = ((gdouble)sf.f_blocks * sf.f_bsize) -
space_ipod_free;
space_uptodate = TRUE;

39
audio/gtkpod/patches/patch-src_misc_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-src_misc_c,v 1.1 2006/01/20 06:27:28 jolan Exp $
--- src/misc.c.orig Sat Dec 10 10:04:28 2005
+++ src/misc.c Fri Jan 6 15:45:20 2006
@@ -400,7 +400,7 @@ mount_ipod(void)
switch (pid)
{
case 0: /* child */
- execl(MOUNT_BIN, "mount", str, NULL);
+ execl(MOUNT_BIN, "mount", str, (void *)NULL);
exit (1);
break;
case -1: /* parent and error */
@@ -435,7 +435,7 @@ unmount_ipod(void)
switch (pid)
{
case 0: /* child */
- execl (UMOUNT_BIN, "umount", mp, NULL);
+ execl (UMOUNT_BIN, "umount", mp, (void *)NULL);
exit (1); /* this is only reached in case of an error */
break;
case -1: /* parent and error */
@@ -476,7 +476,7 @@ unmount_ipod(void)
switch (pid)
{
case 0: /* child */
- execl (eject_bin, "eject", ipod_device, NULL);
+ execl (eject_bin, "eject", ipod_device, (void *)NULL);
exit (1); /* this is only reached in case of an error */
break;
case -1: /* parent and error */
@@ -513,7 +513,7 @@ static void do_script (gchar *script)
switch (pid)
{
case 0: /* child */
- execl("/bin/sh", "sh", script, NULL);
+ execl("/bin/sh", "sh", script, (void *)NULL);
exit(0);
break;
case -1: /* parent and error */

95
audio/gtkpod/patches/patch-src_misc_confirm_c
View File

@ -1,95 +0,0 @@
$OpenBSD: patch-src_misc_confirm_c,v 1.1 2006/04/03 20:03:37 jolan Exp $
--- src/misc_confirm.c.orig Fri Dec 9 08:55:34 2005
+++ src/misc_confirm.c Wed Mar 29 09:59:33 2006
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-09 23:52:06 jcs>
+/* Time-stamp: <2006-03-29 23:35:27 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -550,13 +550,14 @@ static void delete_playlist_ok (struct D
}
else
{
- /* remove playlist */
- gp_playlist_remove (dd->pl);
+ /* first use playlist name */
msg = g_strdup_printf (
ngettext ("Deleted playlist '%s' including %d member track",
"Deleted playlist '%s' including %d member tracks",
n),
dd->pl->name, n);
+ /* then remove playlist */
+ gp_playlist_remove (dd->pl);
}
break;
case DELETE_ACTION_PLAYLIST:
@@ -566,9 +567,11 @@ static void delete_playlist_ok (struct D
}
else
{
- gp_playlist_remove (dd->pl);
+ /* first use playlist name */
msg = g_strdup_printf (_("Deleted playlist '%s'"),
dd->pl->name);
+ /* then remove playlist */
+ gp_playlist_remove (dd->pl);
}
break;
case DELETE_ACTION_LOCAL:
@@ -585,7 +588,7 @@ static void delete_playlist_ok (struct D
case DELETE_ACTION_LOCAL:
if (itdb_playlist_is_mpl (dd->pl))
{ /* for safety reasons this is not implemented (would
- remove all tracks from your local harddisk */
+ remove all tracks from your local harddisk) */
g_return_if_reached ();
}
else
@@ -597,13 +600,14 @@ static void delete_playlist_ok (struct D
dd->pl->members->data,
dd->deleteaction);
}
- /* remove playlist */
- gp_playlist_remove (dd->pl);
+ /* first use playlist name */
msg = g_strdup_printf (
ngettext ("Deleted playlist '%s' including %d member track on harddisk",
"Deleted playlist '%s' including %d member tracks on harddisk",
n),
dd->pl->name, n);
+ /* then remove playlist */
+ gp_playlist_remove (dd->pl);
}
break;
case DELETE_ACTION_DATABASE:
@@ -620,13 +624,14 @@ static void delete_playlist_ok (struct D
}
else
{
- /* remove playlist */
- gp_playlist_remove (dd->pl);
+ /* first use playlist name */
msg = g_strdup_printf (
ngettext ("Deleted playlist '%s' including %d member track",
"Deleted playlist '%s' including %d member tracks",
n),
dd->pl->name, n);
+ /* then remove playlist */
+ gp_playlist_remove (dd->pl);
}
break;
case DELETE_ACTION_PLAYLIST:
@@ -636,9 +641,11 @@ static void delete_playlist_ok (struct D
}
else
{
- gp_playlist_remove (dd->pl);
+ /* first use playlist name */
msg = g_strdup_printf (_("Deleted playlist '%s'"),
dd->pl->name);
+ /* then remove playlist */
+ gp_playlist_remove (dd->pl);
}
break;
case DELETE_ACTION_IPOD:

12
audio/gtkpod/patches/patch-src_mp3file_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_mp3file_c,v 1.2 2006/04/03 20:03:37 jolan Exp $
--- src/mp3file.c.orig Sun Feb 19 04:20:06 2006
+++ src/mp3file.c Tue Mar 28 15:53:57 2006
@@ -1908,7 +1908,7 @@ static gboolean mp3_calc_gain (gchar *pa
execl(mp3gain_path, mp3gain_exec,
"-q", /* quiet */
"-k", /* set ReplayGain so that clipping is prevented */
- path, NULL);
+ path, (void *)NULL);
errsv = errno;
fprintf(stderr, "execl() failed: %s\n", strerror(errsv));
/* mp3gain (can) return 1 on success. So only values greater 1 can