Update to version 0.99.12.

5 files changed, 20 insertions, 53 deletions

diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 4338d1bbe167..91e4ff3fb6ab 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkpod
-PORTVERSION=	0.99.10
-PORTREVISION=	1
+PORTVERSION=	0.99.12
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +15,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GUI for Apple iPods using GTK2
 
 LIB_DEPENDS=	id3tag.0:${PORTSDIR}/audio/libid3tag \
-		gpod.2:${PORTSDIR}/audio/libgpod
+		gpod.3:${PORTSDIR}/audio/libgpod
 RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain \
 		iconv:${PORTSDIR}/converters/libiconv
 
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index 35b562b5c792..d5a4d3fcd4b5 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkpod-0.99.10.tar.gz) = cbc2d03585aaf41915e26c7c83aad412
-SHA256 (gtkpod-0.99.10.tar.gz) = cd8ec2258aa3e774ef1f743117ddc86e7d89bc3f40fc03492b7b0893f9669ece
-SIZE (gtkpod-0.99.10.tar.gz) = 1068561
+MD5 (gtkpod-0.99.12.tar.gz) = 13162a7e9912028922aafcf81d908394
+SHA256 (gtkpod-0.99.12.tar.gz) = cf8cc91b0a4e817ba470c3d56b196048c2a38ef50c9a5b882eaddd5f40e9c33b
+SIZE (gtkpod-0.99.12.tar.gz) = 1218052
diff --git a/audio/gtkpod/files/patch-src::mp4file.c b/audio/gtkpod/files/patch-src::mp4file.c
deleted file mode 100644
index 3d5399d18d11..000000000000
--- a/audio/gtkpod/files/patch-src::mp4file.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/mp4file.c.orig	2007-11-02 18:19:06.000000000 +0200
-+++ src/mp4file.c	2007-11-02 18:19:59.000000000 +0200
-@@ -149,7 +149,7 @@
-     g_return_val_if_fail (mp4File != MP4_INVALID_FILE_HANDLE, FALSE);
- 
-     if (MP4GetMetadataFreeForm(mp4File, "iTunNORM",
--			       &ppValue, &pValueSize))
-+			       &ppValue, &pValueSize, NULL))
-     {
- 	gchar *str;
- 	guint sc1=0, sc2=0;
-@@ -171,7 +171,7 @@
-     }
- 
-     if (MP4GetMetadataFreeForm(mp4File, "replaygain_track_gain",
--			       &ppValue, &pValueSize))
-+			       &ppValue, &pValueSize, NULL))
-     {
- 	gchar *str;
- 	gdouble rg;
-@@ -367,7 +367,7 @@
- 		    u_int8_t *image_data;
- 		    u_int32_t image_data_len;
- 		    if (MP4GetMetadataCoverArt (mp4File,
--						&image_data, &image_data_len))
-+						&image_data, &image_data_len, 0))
- 		    {
- 			if (image_data)
- 			{
-@@ -452,7 +452,7 @@
- 	    MP4GetMetadataAlbum (mp4File, &m_album);
- 	    MP4GetMetadataGenre (mp4File, &m_genre);*/
- 	    MP4GetMetadataTool (mp4File, &m_tool);
--	    MP4GetMetadataCoverArt (mp4File, &m_covert, &m_size);
-+	    MP4GetMetadataCoverArt (mp4File, &m_covert, &m_size, 0);
- 	    MP4MetadataDelete (mp4File);
- #endif
- 	    value = charset_from_utf8 (track->title);
diff --git a/audio/gtkpod/pkg-descr b/audio/gtkpod/pkg-descr
index 5516c7a5da5e..18356a9da445 100644
--- a/audio/gtkpod/pkg-descr
+++ b/audio/gtkpod/pkg-descr
@@ -15,7 +15,7 @@ mini, iPod photo, iPod shuffle, iPod nano, and iPod video.  It allows you to:
     * Modify/Refresh ID3 tags, optionally updating the original file
     * Synchronize directories
     * Normalize the volume of your tracks (via mp3gain or the replay-gain tag)
-    * Write the updated iTunesDB and added songs to your iPod
+    * Download and display of Album Art from the Internet
     * Work offline and synchronize your new playlists/songs with the iPod later
     * Export your korganizer/kaddressbook/thunderbird/evocalendar/evolution/
       webcalendar/... data to the iPod (scripts for other programs can be
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 2094a2ac9260..1ce76466f1e3 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -3,6 +3,13 @@ bin/gtkpod
 %%DATADIR%%/data/cdshine.png
 %%DATADIR%%/data/cdshine_main.png
 %%DATADIR%%/data/default-cover.png
+%%DATADIR%%/data/gphoto_album_menuitem-32.png
+%%DATADIR%%/data/gphoto_album_menuitem-48.png
+%%DATADIR%%/data/gphoto_images_menuitem-32.png
+%%DATADIR%%/data/gphoto_images_menuitem-48.png
+%%DATADIR%%/data/gphoto_tools_menuitem-32.png
+%%DATADIR%%/data/gphoto_tools_menuitem-48.png
+%%DATADIR%%/data/gphoto_playlist_icon-48.png
 %%DATADIR%%/data/gtkpod-add-dirs.png
 %%DATADIR%%/data/gtkpod-add-files.png
 %%DATADIR%%/data/gtkpod-add-playlists.png
@@ -12,15 +19,12 @@ bin/gtkpod
 %%DATADIR%%/data/gtkpod-logo.png
 %%DATADIR%%/data/gtkpod-new-playlist.png
 %%DATADIR%%/data/gtkpod-read.png
+%%DATADIR%%/data/gtkpod-read-16.png
 %%DATADIR%%/data/gtkpod-sync.png
-%%DATADIR%%/scripts/convert-flac2m4a.sh
-%%DATADIR%%/scripts/convert-flac2mp3.sh
-%%DATADIR%%/scripts/convert-m4a2mp3.sh
-%%DATADIR%%/scripts/convert-mp32m4a.sh
-%%DATADIR%%/scripts/convert-ogg2m4a.sh
-%%DATADIR%%/scripts/convert-ogg2mp3.sh
-%%DATADIR%%/scripts/convert-wav2m4a.sh
-%%DATADIR%%/scripts/convert-wav2mp3.sh
+%%DATADIR%%/data/tunes_playlist_icon-48.png
+%%DATADIR%%/scripts/convert-2m4a.sh
+%%DATADIR%%/scripts/convert-2mp3.sh
+%%DATADIR%%/scripts/gtkpod-convert-common.sh
 %%DATADIR%%/scripts/ldif2vcf.sh
 %%DATADIR%%/scripts/mab2vcard
 %%DATADIR%%/scripts/sync-abook.sh
@@ -58,6 +62,8 @@ 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/ro/LC_MESSAGES/gtkpod.mo
+share/locale/ru/LC_MESSAGES/gtkpod.mo
 share/locale/sv/LC_MESSAGES/gtkpod.mo
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README