diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gtkpod/Makefile | 9 | ||||
| -rw-r--r-- | audio/gtkpod/PLIST | 86 | ||||
| -rw-r--r-- | audio/gtkpod/distinfo | 15 | ||||
| -rw-r--r-- | audio/gtkpod/patches/patch-ad | 26 | ||||
| -rw-r--r-- | audio/gtkpod/patches/patch-ae | 22 | ||||
| -rw-r--r-- | audio/gtkpod/patches/patch-bj | 35 |
6 files changed, 84 insertions, 109 deletions
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile index 6be9646d901..bff22233a0d 100644 --- a/audio/gtkpod/Makefile +++ b/audio/gtkpod/Makefile @@ -1,15 +1,10 @@ -# $NetBSD: Makefile,v 1.22 2009/02/09 22:56:21 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2009/02/15 09:43:38 wiz Exp $ # -DISTNAME= gtkpod-0.99.12 -PKGREVISION= 2 +DISTNAME= gtkpod-0.99.14 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/} -#PATCHFILES= gtkpod-0.99.8_libgpod-0.4.2.diff -#PATCH_SITES= http://ftp.osuosl.org/pub/gentoo/distfiles/ -#PATCH_DIST_STRIP= -p1 - MAINTAINER= smb@NetBSD.org HOMEPAGE= http://www.gtkpod.org/ COMMENT= GUI for iPod using GTK2 diff --git a/audio/gtkpod/PLIST b/audio/gtkpod/PLIST index 627110cf660..98c851a1ae6 100644 --- a/audio/gtkpod/PLIST +++ b/audio/gtkpod/PLIST @@ -1,16 +1,8 @@ -@comment $NetBSD: PLIST,v 1.5 2008/12/04 16:55:42 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/02/15 09:43:38 wiz Exp $ bin/gtkpod +man/man1/gtkpod.1 share/applications/gtkpod.desktop -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 @@ -18,12 +10,54 @@ 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/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/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/hicolor/16x16/places/playlist-photo.png +share/gtkpod/icons/hicolor/16x16/places/playlist.png +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/places/playlist-photo.png +share/gtkpod/icons/hicolor/22x22/places/playlist.png +share/gtkpod/icons/hicolor/24x24/places/playlist-photo.png +share/gtkpod/icons/hicolor/24x24/places/playlist.png +share/gtkpod/icons/hicolor/32x32/places/playlist-photo.png +share/gtkpod/icons/hicolor/32x32/places/playlist.png +share/gtkpod/icons/hicolor/48x48/places/playlist-photo.png +share/gtkpod/icons/hicolor/48x48/places/playlist.png +share/gtkpod/icons/hicolor/scalable/places/playlist-photo.svg +share/gtkpod/icons/hicolor/scalable/places/playlist.svg share/gtkpod/scripts/convert-2m4a.sh share/gtkpod/scripts/convert-2mp3.sh share/gtkpod/scripts/gtkpod-convert-common.sh @@ -42,9 +76,13 @@ share/gtkpod/scripts/sync-thunderbird-nano.sh share/gtkpod/scripts/sync-thunderbird.sh share/gtkpod/scripts/sync-tomboy.sh share/gtkpod/scripts/sync-webcalendar.sh +share/icons/hicolor/16x16/apps/gtkpod.png +share/icons/hicolor/22x22/apps/gtkpod.png +share/icons/hicolor/24x24/apps/gtkpod.png share/icons/hicolor/32x32/apps/gtkpod.png share/icons/hicolor/48x48/apps/gtkpod.png share/icons/hicolor/64x64/apps/gtkpod.png +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 @@ -54,11 +92,33 @@ 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 +share/locale/zh_CN/LC_MESSAGES/gtkpod.mo +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor @dirrm share/gtkpod/scripts +@dirrm share/gtkpod/icons/hicolor/scalable/places +@dirrm share/gtkpod/icons/hicolor/scalable +@dirrm share/gtkpod/icons/hicolor/48x48/places +@dirrm share/gtkpod/icons/hicolor/48x48 +@dirrm share/gtkpod/icons/hicolor/32x32/places +@dirrm share/gtkpod/icons/hicolor/32x32 +@dirrm share/gtkpod/icons/hicolor/24x24/places +@dirrm share/gtkpod/icons/hicolor/24x24 +@dirrm share/gtkpod/icons/hicolor/22x22/places +@dirrm share/gtkpod/icons/hicolor/22x22 +@dirrm share/gtkpod/icons/hicolor/16x16/status +@dirrm share/gtkpod/icons/hicolor/16x16/places +@dirrm share/gtkpod/icons/hicolor/16x16 +@dirrm share/gtkpod/icons/hicolor +@dirrm share/gtkpod/icons +@dirrm share/gtkpod/doc/figures +@dirrm share/gtkpod/doc @dirrm share/gtkpod/data @dirrm share/gtkpod @comment in xdg-dirs: @dirrm share/applications diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo index 6f89069da1e..b15b0cb9bdf 100644 --- a/audio/gtkpod/distinfo +++ b/audio/gtkpod/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.9 2008/03/02 07:02:01 jlam Exp $ +$NetBSD: distinfo,v 1.10 2009/02/15 09:43:38 wiz Exp $ -SHA1 (gtkpod-0.99.12.tar.gz) = ab7c03ee1a875fe2bab953d5805a2a4d65fcd669 -RMD160 (gtkpod-0.99.12.tar.gz) = de41d4ab3c907416e88e81fbc79ca1d82411c4c4 -Size (gtkpod-0.99.12.tar.gz) = 1218052 bytes -SHA1 (gtkpod-0.99.8_libgpod-0.4.2.diff) = a5090b4597922cc81fc33efd9a3f7e1278b57708 -RMD160 (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2e8094b8eba3179279d1b91133df588833e9df3e -Size (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2580 bytes -SHA1 (patch-ad) = 66265b590f68f3ad5aee9aa9f331954930967da9 -SHA1 (patch-ae) = a2da63d59d90b137d32482632c08db19fcbf1ec9 +SHA1 (gtkpod-0.99.14.tar.gz) = 92977420c0b54e85ddc80fbe2e99cd4a5e4e81b9 +RMD160 (gtkpod-0.99.14.tar.gz) = ec4806918310b3071c33d461af3a354b5826a84c +Size (gtkpod-0.99.14.tar.gz) = 1856919 bytes SHA1 (patch-bi) = 664a807d14318fd205a89dacc3084212cc9c6d5e -SHA1 (patch-bj) = 1142f4d4833463427e8aa687cf395213b6c53251 +SHA1 (patch-bj) = 6caafe347a5d4cdb6cdfa48d72121272d75e8a80 diff --git a/audio/gtkpod/patches/patch-ad b/audio/gtkpod/patches/patch-ad deleted file mode 100644 index 8750da5e3c4..00000000000 --- a/audio/gtkpod/patches/patch-ad +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2008/03/02 07:02:01 jlam Exp $ - ---- configure.orig 2007-12-17 23:38:40.000000000 -0500 -+++ configure -@@ -6553,15 +6553,17 @@ fi - if test "$LEX" = :; then - LEX=${am_missing_run}flex - fi --if ! test "y$LEX" = "yflex"; then -- if ! test "y$LEX" = "ylex"; then -+case "$LEX" in -+flex|*/flex|lex|*/lex) -+ ;; -+*) - { { echo "$as_me:$LINENO: error: *** flex or lex required - See \`config.log' for more details." >&5 - echo "$as_me: error: *** flex or lex required - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -- fi --fi -+ ;; -+esac - - # Extract the first word of "mount", so it can be a program name with args. - set dummy mount; ac_word=$2 diff --git a/audio/gtkpod/patches/patch-ae b/audio/gtkpod/patches/patch-ae deleted file mode 100644 index 3617ea9b547..00000000000 --- a/audio/gtkpod/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2008/03/02 07:02:01 jlam Exp $ - ---- configure.in.orig 2007-12-17 23:37:46.000000000 -0500 -+++ configure.in -@@ -53,11 +53,13 @@ LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODUL - - dnl we need 'flex' - AM_PROG_LEX --if ! test "y$LEX" = "yflex"; then -- if ! test "y$LEX" = "ylex"; then -+case "$LEX" in -+flex|*/flex|lex|*/lex) -+ ;; -+*) - AC_MSG_FAILURE([*** flex or lex required]) -- fi --fi -+ ;; -+esac - - dnl Retrieve the path of mount and umount binaries - AC_PATH_PROG(MOUNT, mount) diff --git a/audio/gtkpod/patches/patch-bj b/audio/gtkpod/patches/patch-bj index 90f0bf254f9..96922b43e86 100644 --- a/audio/gtkpod/patches/patch-bj +++ b/audio/gtkpod/patches/patch-bj @@ -1,17 +1,8 @@ -$NetBSD: patch-bj,v 1.3 2008/01/06 17:04:14 rillig Exp $ +$NetBSD: patch-bj,v 1.4 2009/02/15 09:43:38 wiz Exp $ ---- src/file_convert.c.orig 2007-12-18 04:37:43.000000000 +0000 -+++ src/file_convert.c 2008-01-06 18:00:56.000000000 +0000 -@@ -216,7 +216,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 Cstderr; /* 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 */ -@@ -647,7 +647,11 @@ static void conversion_prefs_changed (Co +--- src/file_convert.c.orig 2009-01-18 05:52:32.000000000 +0000 ++++ src/file_convert.c +@@ -668,7 +668,11 @@ static void conversion_prefs_changed (Co conv->max_threads_num = prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM); if (conv->max_threads_num == 0) { /* set to maximum available number of processors */ @@ -23,21 +14,3 @@ $NetBSD: patch-bj,v 1.3 2008/01/06 17:04:14 rillig Exp $ /* paranoia mode on */ if (conv->max_threads_num <= 0) { -@@ -2308,7 +2312,7 @@ static gboolean conversion_convert_track - &ctr->pid, /* child's PID */ - NULL, /* child's stdin */ - NULL, /* child's stdout */ -- &ctr->stderr, /* child's stderr */ -+ &ctr->Cstderr,/* child's stderr */ - &error); - - child_pid = ctr->pid; -@@ -2334,7 +2338,7 @@ static gboolean conversion_convert_track - 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->Cstderr); - g_io_channel_set_flags (ctr->gio_channel, - G_IO_FLAG_NONBLOCK, NULL); - g_io_channel_set_close_on_unref (ctr->gio_channel, TRUE); |