Attached diff updates gtkpod to 0.94.0, the latest stable release. If
someone could test this with an ipod, I'd appreciate it.
thanks,
Nikolay
Logfile: /tmp/cvsd.XMJk31736
Index: Makefile
===================================================================
RCS file: /a/devel/cvs/ports/audio/gtkpod/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 13 Nov 2005 14:06:32 -0000 1.6
+++ Makefile 25 Nov 2005 22:26:45 -0000
@@ -2,10 +2,8 @@
COMMENT= "GTK+2 program to synchronize an Apple iPod"
-DISTNAME= gtkpod-0.88.2
-PKGNAME= ${DISTNAME}p0
+DISTNAME= gtkpod-0.94.0
CATEGORIES= audio x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
HOMEPAGE= http://gtkpod.sourceforge.net/
@@ -15,16 +13,20 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+WANTLIB= X11 c cairo fontconfig freetype m pthread xml2 z
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
+
USE_X11= Yes
+BUILD_DEPENDS= ::devel/pkgconfig
LIB_DEPENDS= atk-1.0.800.0::devel/atk \
id3tag.2::audio/libid3tag \
gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
+ glade-2.0.0.4::devel/libglade2 \
glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
pango-1.0.0.0,pangoft2-1.0.0.0,pangocairo-1.0.0.0::devel/pango \
mp4v2.0::audio/faad
-
-WANTLIB= X11 c cairo fontconfig freetype m pthread
MODULES= gettext
Index: distinfo
===================================================================
RCS file: /a/devel/cvs/ports/audio/gtkpod/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 18 Apr 2005 23:42:00 -0000 1.5
+++ distinfo 25 Nov 2005 21:51:28 -0000
@@ -1,4 +1,4 @@
-MD5 (gtkpod-0.88.2.tar.gz) = 12f492d215ee4c7fb55c491f7267deb1
-RMD160 (gtkpod-0.88.2.tar.gz) = 9dc720283a78977f448efdd49195e59d2dbf5653
-SHA1 (gtkpod-0.88.2.tar.gz) = b2abf3bf7c800e7221fc8cf541d875f05ca49699
-SIZE (gtkpod-0.88.2.tar.gz) = 850729
+MD5 (gtkpod-0.94.0.tar.gz) = c6be5d02ac35e554c3c038b8ef6da719
+RMD160 (gtkpod-0.94.0.tar.gz) = 0714c6e6f221f124e6f1d53545089af86023600b
+SHA1 (gtkpod-0.94.0.tar.gz) = 5c6fcb70a90e4ee879e2b2a6fa54b81c57a0378d
+SIZE (gtkpod-0.94.0.tar.gz) = 983815
Index: patches/patch-src_file_export_c
===================================================================
RCS file: /a/devel/cvs/ports/audio/gtkpod/patches/patch-src_file_export_c,v
retrieving revision 1.1
diff -u -r1.1 patch-src_file_export_c
--- patches/patch-src_file_export_c 6 Mar 2005 18:29:08 -0000 1.1
+++ patches/patch-src_file_export_c 25 Nov 2005 22:21:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_file_export_c,v 1.1 2005/03/06 18:29:08 jcs Exp $
---- src/file_export.c.orig Sun Aug 22 04:33:43 2004
-+++ src/file_export.c Sun Mar 6 12:12:51 2005
-@@ -77,7 +77,7 @@ const gchar *EXPORT_FILES_TPL_DFLT="%o;%
+--- src/file_export.c.orig Sat Jun 25 04:52:25 2005
++++ src/file_export.c Fri Nov 25 23:19:43 2005
+@@ -78,7 +78,7 @@ const gchar *EXPORT_FILES_TPL_DFLT="%o;%
/**
* READ_WRITE_BLOCKSIZE - how many bytes we read per fread/fwrite call
*/
Index: patches/patch-src_misc_c
===================================================================
RCS file: patches/patch-src_misc_c
diff -N patches/patch-src_misc_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_misc_c 25 Nov 2005 22:21:56 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- src/misc.c.orig Fri Nov 25 23:21:14 2005
++++ src/misc.c Fri Nov 25 23:21:51 2005
+@@ -386,7 +386,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 */
+@@ -421,7 +421,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 */
+@@ -462,7 +462,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 */
+@@ -499,7 +499,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 */
Index: patches/patch-src_mp3file_c
===================================================================
RCS file: patches/patch-src_mp3file_c
diff -N patches/patch-src_mp3file_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mp3file_c 25 Nov 2005 22:33:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/mp3file.c.orig Fri Nov 25 23:33:27 2005
++++ src/mp3file.c Fri Nov 25 23:33:44 2005
+@@ -1821,7 +1821,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
Index: patches/patch-src_mp4file_h
===================================================================
RCS file: /a/devel/cvs/ports/audio/gtkpod/patches/patch-src_mp4file_h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-src_mp4file_h
--- patches/patch-src_mp4file_h 16 Dec 2004 16:37:14 -0000 1.1.1.1
+++ patches/patch-src_mp4file_h 25 Nov 2005 22:21:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_mp4file_h,v 1.1.1.1 2004/12/16 16:37:14 jcs Exp $
---- src/mp4file.h.orig Sun Dec 12 23:15:03 2004
-+++ src/mp4file.h Sun Dec 12 23:17:00 2004
-@@ -34,3 +34,5 @@
+--- src/mp4file.h.orig Fri Jun 17 15:30:05 2005
++++ src/mp4file.h Fri Nov 25 23:19:43 2005
+@@ -35,3 +35,5 @@
gboolean mp4_write_file_info (gchar *filename, Track *track);
Track *mp4_get_file_info (gchar *name);
#endif
Index: pkg/PLIST
===================================================================
RCS file: /a/devel/cvs/ports/audio/gtkpod/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 18 Apr 2005 23:42:00 -0000 1.2
+++ pkg/PLIST 25 Nov 2005 22:23:05 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2005/04/18 23:42:00 jolan Exp $
bin/gtkpod
share/gtkpod/
+share/gtkpod/gtkpod.glade
+share/gtkpod/gtkpod.gladep
share/gtkpod/pixmaps/
share/gtkpod/pixmaps/gtkpod-add-dirs.png
share/gtkpod/pixmaps/gtkpod-add-files.png
@@ -15,14 +17,21 @@
share/gtkpod/pixmaps/gtkpod-new-playlist.png
share/gtkpod/pixmaps/gtkpod-read.png
share/gtkpod/pixmaps/gtkpod-sync.png
+share/gtkpod/pixmaps/gtkpod.glade
+share/gtkpod/pixmaps/gtkpod.gladep
share/gtkpod/scripts/
+share/gtkpod/scripts/mab2vcard
+share/gtkpod/scripts/sync-abook.sh
share/gtkpod/scripts/sync-evocalendar.sh
share/gtkpod/scripts/sync-evolution.sh
share/gtkpod/scripts/sync-kaddressbook.sh
share/gtkpod/scripts/sync-korganizer.sh
share/gtkpod/scripts/sync-notes.sh
+share/gtkpod/scripts/sync-thunderbird.sh
+share/gtkpod/scripts/sync-webcalendar.sh
share/locale/de/LC_MESSAGES/gtkpod.mo
share/locale/fr/LC_MESSAGES/gtkpod.mo
+share/locale/he/LC_MESSAGES/gtkpod.mo
share/locale/it/LC_MESSAGES/gtkpod.mo
share/locale/ja/LC_MESSAGES/gtkpod.mo
share/locale/sv/LC_MESSAGES/gtkpod.mo
