diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile index bc5baea8ed3..492ab080f62 100644 --- a/audio/gtkpod/Makefile +++ b/audio/gtkpod/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.29 2008/10/13 14:55:14 martynas Exp $ +# $OpenBSD: Makefile,v 1.30 2009/03/06 20:44:24 ckuethe Exp $ COMMENT= GTK+2 program to synchronize an Apple iPod -DISTNAME= gtkpod-0.99.12 -PKGNAME= ${DISTNAME}p1 +DISTNAME= gtkpod-0.99.14 +PKGNAME= ${DISTNAME} CATEGORIES= audio x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} @@ -24,20 +24,18 @@ LIB_DEPENDS= id3tag.>=2::audio/libid3tag \ gpod.>=600.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 \ - art_lgpl_2.>=5::graphics/libart \ curl.::net/curl \ gnomevfs-2::x11/gnome/vfs2 \ gconf-2.>=5::devel/gconf2 \ - gnomecanvas-2::x11/gnome/libgnomecanvas \ ORBit-2.>=2::devel/ORBit2 \ mp4v2.>=3::multimedia/libmp4v2 WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \ Xcomposite Xdamage c cairo expat fontconfig freetype m \ - pthread z gailutil \ + pthread z \ xml2 glitz png glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ - pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0 art_lgpl_2 \ - pixman-1 + pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0 \ + pixman-1 dbus-1 gio-2.0 MODULES= devel/gettext textproc/intltool diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo index bcad9184e6c..34954c1fee6 100644 --- a/audio/gtkpod/distinfo +++ b/audio/gtkpod/distinfo @@ -1,5 +1,5 @@ -MD5 (gtkpod-0.99.12.tar.gz) = ExYqfpkSAokiqvz4HZCDlA== -RMD160 (gtkpod-0.99.12.tar.gz) = 3kHUqzyQdBbojoH7x5yh2CQRxMQ= -SHA1 (gtkpod-0.99.12.tar.gz) = q3wD7hqHX+K6uVPVgFoqTWX81mk= -SHA256 (gtkpod-0.99.12.tar.gz) = z4zJGwpOgXukcMPVaxlgSMKjjvUMmluILq3dX0Dpwzs= -SIZE (gtkpod-0.99.12.tar.gz) = 1218052 +MD5 (gtkpod-0.99.14.tar.gz) = 95SOzrlVswL0xH2kwOHsEg== +RMD160 (gtkpod-0.99.14.tar.gz) = 7EgGkYMQswccM9Rhrzo1S1gmqEw= +SHA1 (gtkpod-0.99.14.tar.gz) = kpd0IMC1ToXdyA++LpnNSl5Ogbk= +SHA256 (gtkpod-0.99.14.tar.gz) = c+EoNIJnmuDMd0qkoHrslJFZgoizaYZQXsPRxqB37D0= +SIZE (gtkpod-0.99.14.tar.gz) = 1856919 diff --git a/audio/gtkpod/patches/patch-src_file_convert_c b/audio/gtkpod/patches/patch-src_file_convert_c index c9efb488ea5..32079d56e7d 100644 --- a/audio/gtkpod/patches/patch-src_file_convert_c +++ b/audio/gtkpod/patches/patch-src_file_convert_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_file_convert_c,v 1.1 2007/11/22 22:46:42 ckuethe Exp $ ---- src/file_convert.c.orig Sun Nov 18 11:25:06 2007 -+++ src/file_convert.c Sun Nov 18 11:34:35 2007 +$OpenBSD: patch-src_file_convert_c,v 1.2 2009/03/06 20:44:24 ckuethe Exp $ +--- src/file_convert.c.orig Sat Jan 17 22:52:32 2009 ++++ src/file_convert.c Thu Feb 26 23:27:50 2009 @@ -33,6 +33,10 @@ # include #endif @@ -12,7 +12,7 @@ $OpenBSD: patch-src_file_convert_c,v 1.1 2007/11/22 22:46:42 ckuethe Exp $ #include "display_itdb.h" #include "file_convert.h" #include "info.h" -@@ -43,9 +47,6 @@ +@@ -44,9 +48,6 @@ #include #include #include @@ -22,16 +22,7 @@ $OpenBSD: patch-src_file_convert_c,v 1.1 2007/11/22 22:46:42 ckuethe Exp $ #include #undef DEBUG_CONV -@@ -216,7 +217,7 @@ struct _ConvTrack - gchar *fname_root; /* filename root of converted file */ - gchar *fname_extension; /* filename extension of converted file */ - GPid pid; /* PID of child doing the conversion */ -- gint stderr; /* stderr of child doing the conversion */ -+ gint mystderr; /* stderr of child doing the conversion */ - Track *track; /* for reference, don't access inside threads! */ - iTunesDB *itdb; /* for reference, don't access inside threads! */ - gint threadnum; /* number of thread working on this track */ -@@ -624,6 +625,8 @@ static void conversion_prefs_changed (Conversion *conv +@@ -645,6 +646,8 @@ static void conversion_prefs_changed (Conversion *conv gboolean background_transfer; gdouble maxsize; GList *gl; @@ -40,7 +31,7 @@ $OpenBSD: patch-src_file_convert_c,v 1.1 2007/11/22 22:46:42 ckuethe Exp $ g_return_if_fail (conv); -@@ -645,13 +648,16 @@ static void conversion_prefs_changed (Conversion *conv +@@ -666,13 +669,16 @@ static void conversion_prefs_changed (Conversion *conv } conv->max_threads_num = prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM); @@ -61,21 +52,3 @@ $OpenBSD: patch-src_file_convert_c,v 1.1 2007/11/22 22:46:42 ckuethe Exp $ } } -@@ -2296,7 +2302,7 @@ static gboolean conversion_convert_track (Conversion * - &ctr->pid, /* child's PID */ - NULL, /* child's stdin */ - NULL, /* child's stdout */ -- &ctr->stderr, /* child's stderr */ -+ &ctr->mystderr, /* child's stderr */ - &error); - - child_pid = ctr->pid; -@@ -2322,7 +2328,7 @@ static gboolean conversion_convert_track (Conversion * - gint status; - - /* set up i/o channel to main thread */ -- ctr->gio_channel = g_io_channel_unix_new (ctr->stderr); -+ ctr->gio_channel = g_io_channel_unix_new (ctr->mystderr); - g_io_channel_set_flags (ctr->gio_channel, - G_IO_FLAG_NONBLOCK, NULL); - g_io_channel_set_close_on_unref (ctr->gio_channel, TRUE); diff --git a/audio/gtkpod/patches/patch-src_file_export_c b/audio/gtkpod/patches/patch-src_file_export_c index 9e0722ef3ce..c7ce8146f6a 100644 --- a/audio/gtkpod/patches/patch-src_file_export_c +++ b/audio/gtkpod/patches/patch-src_file_export_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_file_export_c,v 1.4 2006/10/18 18:02:13 ckuethe Exp $ ---- src/file_export.c.orig Wed Oct 18 11:25:05 2006 -+++ src/file_export.c Wed Oct 18 11:24:15 2006 -@@ -43,6 +43,7 @@ +$OpenBSD: patch-src_file_export_c,v 1.5 2009/03/06 20:44:24 ckuethe Exp $ +--- src/file_export.c.orig Sat Jan 17 22:52:32 2009 ++++ src/file_export.c Thu Feb 26 23:12:07 2009 +@@ -42,6 +42,7 @@ #include #include #include @@ -9,7 +9,7 @@ $OpenBSD: patch-src_file_export_c,v 1.4 2006/10/18 18:02:13 ckuethe Exp $ #include #include #include -@@ -102,8 +103,11 @@ static gboolean +@@ -100,8 +101,11 @@ static gboolean copy_file_fd_sync (FILE *from, FILE *to) { gboolean result = FALSE; @@ -22,7 +22,7 @@ $OpenBSD: patch-src_file_export_c,v 1.4 2006/10/18 18:02:13 ckuethe Exp $ if((from) && (to)) { int read_bytes = 0, write_bytes = 0; -@@ -140,6 +144,7 @@ copy_file_fd_sync (FILE *from, FILE *to) +@@ -138,6 +142,7 @@ copy_file_fd_sync (FILE *from, FILE *to) } while(!(feof(from))); } diff --git a/audio/gtkpod/patches/patch-src_file_itunesdb_c b/audio/gtkpod/patches/patch-src_file_itunesdb_c index f208e146855..154367f8a3f 100644 --- a/audio/gtkpod/patches/patch-src_file_itunesdb_c +++ b/audio/gtkpod/patches/patch-src_file_itunesdb_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ ---- src/file_itunesdb.c.orig Wed Jun 27 13:29:33 2007 -+++ src/file_itunesdb.c Sun Nov 18 11:19:49 2007 -@@ -563,7 +563,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi +$OpenBSD: patch-src_file_itunesdb_c,v 1.5 2009/03/06 20:44:24 ckuethe Exp $ +--- src/file_itunesdb.c.orig Sat Jan 17 22:52:32 2009 ++++ src/file_itunesdb.c Thu Feb 26 23:12:27 2009 +@@ -585,7 +585,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi gp_itdb_add_extra_full (itdb); eitdb = itdb->userdata; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ eitdb->offline = offline; -@@ -588,9 +588,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi +@@ -610,9 +610,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi Track *track = gl->data; ExtraTrackData *etr; @@ -22,7 +22,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ fill_in_extended_info (track, total, num); gp_track_validate_entries (track); /* properly set value for has_artwork */ -@@ -630,7 +630,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi +@@ -652,7 +652,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi while (extendeddeletion) { Track *track = extendeddeletion->data; @@ -31,7 +31,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ mark_track_for_deletion (itdb, track); extendeddeletion = g_list_delete_link (extendeddeletion, extendeddeletion); -@@ -654,15 +654,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi +@@ -676,15 +676,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi GHashTable *track_hash = g_hash_table_new (g_direct_hash, g_direct_equal); Playlist *mpl = itdb_playlist_mpl (itdb); @@ -50,7 +50,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ duptr = itdb_track_duplicate (track); /* add to database -- if duplicate detection is on and the same track already exists in the database, the already -@@ -681,15 +681,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi +@@ -703,15 +703,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi GList *glm; Playlist *duppl; Playlist *pl = gl->next->data; /* skip MPL */ @@ -69,7 +69,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ glm->data = newtr; } /* if it's the podcasts list, don't add the list again if -@@ -700,7 +700,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi +@@ -722,7 +722,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi Playlist *podcasts = itdb_playlist_podcasts (itdb); for (glm=duppl->members; glm; glm=glm->next) { @@ -78,7 +78,7 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ itdb_playlist_add_track (podcasts, glm->data, -1); } itdb_playlist_free (duppl); -@@ -779,9 +779,9 @@ iTunesDB *gp_merge_itdb (iTunesDB *old_itdb) +@@ -801,9 +801,9 @@ static iTunesDB *gp_merge_itdb (iTunesDB *old_itdb) ExtraiTunesDBData *old_eitdb; iTunesDB *new_itdb; @@ -90,9 +90,9 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ if (old_itdb->usertype & GP_ITDB_TYPE_LOCAL) { -@@ -880,8 +880,11 @@ iTunesDB *gp_load_ipod (iTunesDB *itdb) - ok_to_load = FALSE; - } +@@ -905,8 +905,11 @@ iTunesDB *gp_load_ipod (iTunesDB *itdb) + ok_to_load = FALSE; + } } - g_free (itunesdb); - g_free (mountpoint); @@ -101,6 +101,6 @@ $OpenBSD: patch-src_file_itunesdb_c,v 1.4 2007/12/31 18:35:42 ckuethe Exp $ + g_free (itunesdb); + g_free (mountpoint); + } - + if (ok_to_load) { diff --git a/audio/gtkpod/patches/patch-src_info_c b/audio/gtkpod/patches/patch-src_info_c index 6e0449a45a1..9077bc0759c 100644 --- a/audio/gtkpod/patches/patch-src_info_c +++ b/audio/gtkpod/patches/patch-src_info_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_info_c,v 1.2 2007/11/22 22:46:42 ckuethe Exp $ ---- src/info.c.orig Wed Jun 27 13:29:33 2007 -+++ src/info.c Sun Nov 18 11:21:32 2007 -@@ -579,14 +579,17 @@ gboolean ipod_connected (void) +$OpenBSD: patch-src_info_c,v 1.3 2009/03/06 20:44:24 ckuethe Exp $ +--- src/info.c.orig Sat Jan 17 22:52:32 2009 ++++ src/info.c Thu Feb 26 23:13:11 2009 +@@ -593,14 +593,17 @@ gboolean ipod_connected (void) /* we'll use statvfs to determine free space on the iPod where available, df otherwise */ @@ -22,7 +22,7 @@ $OpenBSD: patch-src_info_c,v 1.2 2007/11/22 22:46:42 ckuethe Exp $ int status; g_mutex_lock (space_mutex); -@@ -598,13 +601,13 @@ static void th_space_update (void) +@@ -612,13 +615,13 @@ static void th_space_update (void) } if (mp) { diff --git a/audio/gtkpod/patches/patch-src_mp4file_h b/audio/gtkpod/patches/patch-src_mp4file_h index cd197e78324..16eb27d8cd9 100644 --- a/audio/gtkpod/patches/patch-src_mp4file_h +++ b/audio/gtkpod/patches/patch-src_mp4file_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_mp4file_h,v 1.3 2007/03/17 21:55:40 ckuethe Exp $ ---- src/mp4file.h.orig Thu Jun 22 08:24:35 2006 -+++ src/mp4file.h Thu Mar 15 08:42:22 2007 +$OpenBSD: patch-src_mp4file_h,v 1.4 2009/03/06 20:44:24 ckuethe Exp $ +--- src/mp4file.h.orig Sat Jan 17 22:52:32 2009 ++++ src/mp4file.h Thu Feb 26 23:12:48 2009 @@ -35,4 +35,6 @@ gboolean mp4_write_file_info (gchar *filename, Track *track); Track *mp4_get_file_info (gchar *name); diff --git a/audio/gtkpod/pkg/PLIST b/audio/gtkpod/pkg/PLIST index fdb527af6c7..f7c6a62fbb6 100644 --- a/audio/gtkpod/pkg/PLIST +++ b/audio/gtkpod/pkg/PLIST @@ -1,18 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.8 2008/10/13 14:55:14 martynas Exp $ +@comment $OpenBSD: PLIST,v 1.9 2009/03/06 20:44:24 ckuethe Exp $ @bin bin/gtkpod +@man man/man1/gtkpod.1 share/applications/gtkpod.desktop share/gtkpod/ share/gtkpod/data/ -share/gtkpod/data/cdshine.png -share/gtkpod/data/cdshine_main.png share/gtkpod/data/default-cover.png -share/gtkpod/data/gphoto_album_menuitem-32.png -share/gtkpod/data/gphoto_album_menuitem-48.png -share/gtkpod/data/gphoto_images_menuitem-32.png -share/gtkpod/data/gphoto_images_menuitem-48.png -share/gtkpod/data/gphoto_playlist_icon-48.png -share/gtkpod/data/gphoto_tools_menuitem-32.png -share/gtkpod/data/gphoto_tools_menuitem-48.png share/gtkpod/data/gtkpod-add-dirs.png share/gtkpod/data/gtkpod-add-files.png share/gtkpod/data/gtkpod-add-playlists.png @@ -20,12 +12,71 @@ share/gtkpod/data/gtkpod-icon-32-2.png share/gtkpod/data/gtkpod-icon-32.png share/gtkpod/data/gtkpod-icon-48.png share/gtkpod/data/gtkpod-logo.png -share/gtkpod/data/gtkpod-new-playlist.png share/gtkpod/data/gtkpod-read-16.png share/gtkpod/data/gtkpod-read.png -share/gtkpod/data/gtkpod-sync.png share/gtkpod/data/gtkpod.glade -share/gtkpod/data/tunes_playlist_icon-48.png +share/gtkpod/data/photo-toolbar-album.png +share/gtkpod/data/photo-toolbar-photos.png +share/gtkpod/doc/ +share/gtkpod/doc/adding-cover-art-from-a-browser.html +share/gtkpod/doc/adding-files-and-folders.html +share/gtkpod/doc/advanced-features.html +share/gtkpod/doc/copying-content-to-the-ipod.html +share/gtkpod/doc/cover-art.html +share/gtkpod/doc/exporting-files-from-the-ipod.html +share/gtkpod/doc/figures/ +share/gtkpod/doc/figures/add-folders.png +share/gtkpod/doc/figures/cover-fullsize.png +share/gtkpod/doc/figures/cover-popupmenu.png +share/gtkpod/doc/figures/cover-setfromfile.png +share/gtkpod/doc/figures/coverart.png +share/gtkpod/doc/figures/edit-track-details.png +share/gtkpod/doc/figures/gtkpod.png +share/gtkpod/doc/getting-started.html +share/gtkpod/doc/gtkpod-info.html +share/gtkpod/doc/gtkpod.html +share/gtkpod/doc/gtkpod.xml +share/gtkpod/doc/hooking-up-the-ipod.html +share/gtkpod/doc/ipod-and-content.html +share/gtkpod/doc/ipod-file-recovery.html +share/gtkpod/doc/layout-of-gtkpod.html +share/gtkpod/doc/managing-playlists.html +share/gtkpod/doc/playcounts-and-ratings.html +share/gtkpod/doc/playlists-podcasts-and-photos.html +share/gtkpod/doc/setting-ipod-properties.html +share/gtkpod/doc/the-sysinfo-file.html +share/gtkpod/doc/troubleshooting-faq.html +share/gtkpod/doc/view-and-edit-track-details.html +share/gtkpod/icons/ +share/gtkpod/icons/hicolor/ +share/gtkpod/icons/hicolor/16x16/ +share/gtkpod/icons/hicolor/16x16/places/ +share/gtkpod/icons/hicolor/16x16/places/playlist-photo.png +share/gtkpod/icons/hicolor/16x16/places/playlist.png +share/gtkpod/icons/hicolor/16x16/status/ +share/gtkpod/icons/hicolor/16x16/status/star-none.png +share/gtkpod/icons/hicolor/16x16/status/star-set.png +share/gtkpod/icons/hicolor/16x16/status/star-unset.png +share/gtkpod/icons/hicolor/22x22/ +share/gtkpod/icons/hicolor/22x22/places/ +share/gtkpod/icons/hicolor/22x22/places/playlist-photo.png +share/gtkpod/icons/hicolor/22x22/places/playlist.png +share/gtkpod/icons/hicolor/24x24/ +share/gtkpod/icons/hicolor/24x24/places/ +share/gtkpod/icons/hicolor/24x24/places/playlist-photo.png +share/gtkpod/icons/hicolor/24x24/places/playlist.png +share/gtkpod/icons/hicolor/32x32/ +share/gtkpod/icons/hicolor/32x32/places/ +share/gtkpod/icons/hicolor/32x32/places/playlist-photo.png +share/gtkpod/icons/hicolor/32x32/places/playlist.png +share/gtkpod/icons/hicolor/48x48/ +share/gtkpod/icons/hicolor/48x48/places/ +share/gtkpod/icons/hicolor/48x48/places/playlist-photo.png +share/gtkpod/icons/hicolor/48x48/places/playlist.png +share/gtkpod/icons/hicolor/scalable/ +share/gtkpod/icons/hicolor/scalable/places/ +share/gtkpod/icons/hicolor/scalable/places/playlist-photo.svg +share/gtkpod/icons/hicolor/scalable/places/playlist.svg share/gtkpod/scripts/ share/gtkpod/scripts/convert-2m4a.sh share/gtkpod/scripts/convert-2mp3.sh @@ -47,6 +98,15 @@ share/gtkpod/scripts/sync-tomboy.sh share/gtkpod/scripts/sync-webcalendar.sh share/icons/ share/icons/hicolor/ +share/icons/hicolor/16x16/ +share/icons/hicolor/16x16/apps/ +share/icons/hicolor/16x16/apps/gtkpod.png +share/icons/hicolor/22x22/ +share/icons/hicolor/22x22/apps/ +share/icons/hicolor/22x22/apps/gtkpod.png +share/icons/hicolor/24x24/ +share/icons/hicolor/24x24/apps/ +share/icons/hicolor/24x24/apps/gtkpod.png share/icons/hicolor/32x32/ share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/gtkpod.png @@ -56,6 +116,9 @@ share/icons/hicolor/48x48/apps/gtkpod.png share/icons/hicolor/64x64/ share/icons/hicolor/64x64/apps/ share/icons/hicolor/64x64/apps/gtkpod.png +share/icons/hicolor/scalable/ +share/icons/hicolor/scalable/apps/ +share/icons/hicolor/scalable/apps/gtkpod.svg share/locale/de/LC_MESSAGES/gtkpod.mo share/locale/es/LC_MESSAGES/gtkpod.mo share/locale/fr/LC_MESSAGES/gtkpod.mo @@ -67,3 +130,4 @@ share/locale/ru/LC_MESSAGES/gtkpod.mo share/locale/sv/LC_MESSAGES/gtkpod.mo @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database +share/locale/zh_CN/LC_MESSAGES/gtkpod.mo