1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00

Update to version 0.99.2.

PR:		ports/91529
Submitted by:	Devon Ryan <dpryan(at)dpryan.com>
This commit is contained in:
Alexey Dokuchaev 2006-01-18 14:47:07 +00:00
parent f5ebd6618c
commit 5107adadf3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=153815
11 changed files with 11 additions and 119 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= gtkpod
PORTVERSION= 0.94.0
PORTREVISION= 2
PORTVERSION= 0.99.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,7 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= danfe@FreeBSD.org
COMMENT= GUI for Apple iPods using GTK2
LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag
LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag \
gpod.300:${PORTSDIR}/audio/libgpod
RUN_DEPENDS= mp3gain:${PORTSDIR}/audio/mp3gain \
iconv:${PORTSDIR}/converters/libiconv

View File

@ -1,3 +1,3 @@
MD5 (gtkpod-0.94.0.tar.gz) = c6be5d02ac35e554c3c038b8ef6da719
SHA256 (gtkpod-0.94.0.tar.gz) = 988b13b529e34235bb1d4412a7fda9061144221c811ef0ce13421f7354c603f2
SIZE (gtkpod-0.94.0.tar.gz) = 983815
MD5 (gtkpod-0.99.2.tar.gz) = 73c2767100a64ac9a2ba488909bc8b3b
SHA256 (gtkpod-0.99.2.tar.gz) = c92d1f7f3d4766efcb41097be878e782776dda3148c09a22dfac46d9c293061f
SIZE (gtkpod-0.99.2.tar.gz) = 975643

View File

@ -15,7 +15,7 @@
@@ -1156,10 +1161,6 @@
}
return FALSE;
};
}
- GtkTreeModel *model;
- gboolean have_iter = FALSE;
- GtkTreeIter i;

View File

@ -1,19 +0,0 @@
--- src/display_sorttabs.c.orig Tue Oct 18 22:25:36 2005
+++ src/display_sorttabs.c Tue Oct 18 22:26:45 2005
@@ -2036,6 +2036,7 @@
gint i, n, inst;
GList *members;
SortTab *st;
+ T_item t_item;
inst = (guint32)data;
st = sorttab[inst];
@@ -2093,7 +2094,7 @@
g_return_if_fail (etr);
g_return_if_fail (track->itdb);
if (!itdb) itdb = track->itdb;
- T_item t_item = ST_to_T (sorttab[inst]->current_category);
+ t_item = ST_to_T (sorttab[inst]->current_category);
if (t_item == T_YEAR)
{
gint nr = atoi (new_text);

View File

@ -1,19 +0,0 @@
--- src/file.c.orig Tue Oct 18 22:28:39 2005
+++ src/file.c Tue Oct 18 22:29:14 2005
@@ -929,6 +929,7 @@
void update_tracks (GList *selected_tracks)
{
GList *gl;
+ gchar *buf;
if (selected_tracks == NULL)
{
@@ -941,7 +942,7 @@
{
Track *track = gl->data;
g_return_if_fail (track);
- gchar *buf = g_strdup_printf (_("Updating %s"),
+ buf = g_strdup_printf (_("Updating %s"),
get_track_info (track, TRUE));
gtkpod_statusbar_message (buf);
g_free (buf);

View File

@ -1,27 +0,0 @@
--- src/itdb_itunesdb.c.orig Tue Oct 18 22:31:11 2005
+++ src/itdb_itunesdb.c Tue Oct 18 22:32:56 2005
@@ -477,9 +477,11 @@
* return value after use */
static struct playcount *playcount_get_next (FImport *fimp)
{
+ struct playcount *playcount;
+
g_return_val_if_fail (fimp, NULL);
- struct playcount *playcount = g_list_nth_data (fimp->playcounts, 0);
+ playcount = g_list_nth_data (fimp->playcounts, 0);
if (playcount)
fimp->playcounts = g_list_remove (fimp->playcounts, playcount);
@@ -1779,9 +1781,10 @@
if (cmp_n_bytes_seek (cts, "mhsd", seek, 4))
{ /* We just check if it's actually a playlist mhsd (type=2)
or not (type = 1, should not be...) */
+ guint32 type;
guint32 len = get32lint (cts, seek+8);
CHECK_ERROR (fimp, FALSE);
- guint32 type = get32lint (cts, seek+12);
+ type = get32lint (cts, seek+12);
CHECK_ERROR (fimp, FALSE);
if (type != 2)
{ /* this is not a playlist MHSD -> skip it */

View File

@ -1,13 +0,0 @@
--- src/itdb_playlist.c.orig Tue Oct 18 22:33:58 2005
+++ src/itdb_playlist.c Tue Oct 18 22:34:23 2005
@@ -1184,8 +1184,9 @@
/* Return playlist at position @num in @itdb */
Itdb_Playlist *itdb_playlist_by_nr (Itdb_iTunesDB *itdb, guint32 num)
{
+ Itdb_Playlist *pl;
g_return_val_if_fail (itdb, NULL);
- Itdb_Playlist *pl = g_list_nth_data (itdb->playlists, num);
+ pl = g_list_nth_data (itdb->playlists, num);
g_return_val_if_fail (pl, NULL);
return pl;
}

View File

@ -1,10 +0,0 @@
--- src/misc.c.orig Tue Oct 18 22:37:32 2005
+++ src/misc.c Tue Oct 18 22:37:48 2005
@@ -347,6 +347,7 @@
* does not check prefs to see if the current prefs want gtkpod itself to
* mount the ipod drive, that should be checked before making this call.
*/
+#include <sys/param.h>
#include <sys/mount.h>
#include <errno.h>
#include <stdio.h>

View File

@ -1,14 +0,0 @@
--- src/misc_track.c.orig Tue Oct 18 22:38:54 2005
+++ src/misc_track.c Tue Oct 18 22:39:25 2005
@@ -544,9 +544,10 @@
illegal, "0" is returned. */
guint32 track_get_timestamp (Track *track, T_item t_item)
{
+ guint32 *ptr;
g_return_val_if_fail (track, 0);
- guint32 *ptr = track_get_timestamp_ptr (track, t_item);
+ ptr = track_get_timestamp_ptr (track, t_item);
if (ptr) return *ptr;
else return 0;
}

View File

@ -1,10 +0,0 @@
--- src/misc_conversion.c.orig Thu Oct 13 18:45:35 2005
+++ src/misc_conversion.c Thu Oct 13 18:46:50 2005
@@ -265,6 +265,7 @@
if (t)
{
+ size_t size;
localtime_r (&t, &tm);
size = strftime (buf, PATH_MAX, format, &tm);
buf[size] = 0;

View File

@ -19,13 +19,17 @@ bin/gtkpod
%%DATADIR%%/pixmaps/gtkpod-sync.png
%%DATADIR%%/pixmaps/gtkpod.glade
%%DATADIR%%/pixmaps/gtkpod.gladep
%%DATADIR%%/scripts/ldif2vcf.sh
%%DATADIR%%/scripts/mab2vcard
%%DATADIR%%/scripts/sync-abook.sh
%%DATADIR%%/scripts/sync-evocalendar.sh
%%DATADIR%%/scripts/sync-evolution.sh
%%DATADIR%%/scripts/sync-kaddressbook.sh
%%DATADIR%%/scripts/sync-knotes.sh
%%DATADIR%%/scripts/sync-korganizer.sh
%%DATADIR%%/scripts/sync-ldif.sh
%%DATADIR%%/scripts/sync-notes.sh
%%DATADIR%%/scripts/sync-palm-jppy.py
%%DATADIR%%/scripts/sync-thunderbird.sh
%%DATADIR%%/scripts/sync-webcalendar.sh
share/locale/de/LC_MESSAGES/gtkpod.mo