diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-08-22 20:22:44 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-08-22 20:22:44 +0000 |
| commit | 083619dd8af8afad4a9ddbee176c26ceab70cc7e (patch) | |
| tree | 2206021e3be3b653d4bb169655515e5ebc1fc643 /audio | |
| parent | Fix build with gcc-3.4 (diff) | |
Don't free the discid before querying the CDDB database. This fixes a
problem where discs would sometimes show up with unknown CDDB data in gnome-cd.
Obtained from: gnome-media CVS (based on)
Notes
Notes:
svn path=/head/; revision=117060
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gnome-media/Makefile | 2 | ||||
| -rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_cddb.c | 19 | ||||
| -rw-r--r-- | audio/gnomemedia2/Makefile | 2 | ||||
| -rw-r--r-- | audio/gnomemedia2/files/patch-gnome-cd_cddb.c | 19 |
4 files changed, 40 insertions, 2 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 6b079e2c4601..7eeb0111b18d 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.6 diff --git a/audio/gnome-media/files/patch-gnome-cd_cddb.c b/audio/gnome-media/files/patch-gnome-cd_cddb.c new file mode 100644 index 000000000000..45422866cac8 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_cddb.c @@ -0,0 +1,19 @@ +--- gnome-cd/cddb.c.orig Sun May 9 11:19:57 2004 ++++ gnome-cd/cddb.c Sun Aug 22 16:18:18 2004 +@@ -197,7 +197,6 @@ + } + + info = g_hash_table_lookup (cddb_cache, discid); +- g_free (discid); + + if (info != NULL) { + gcd->disc_info = info; +@@ -228,6 +227,8 @@ + data->nsecs, "GnomeCD", VERSION); + + gnome_cdrom_free_cddb_data (data); ++ g_free (discid); ++ g_free (offsets); + } + + int diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 6b079e2c4601..7eeb0111b18d 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.6 diff --git a/audio/gnomemedia2/files/patch-gnome-cd_cddb.c b/audio/gnomemedia2/files/patch-gnome-cd_cddb.c new file mode 100644 index 000000000000..45422866cac8 --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_cddb.c @@ -0,0 +1,19 @@ +--- gnome-cd/cddb.c.orig Sun May 9 11:19:57 2004 ++++ gnome-cd/cddb.c Sun Aug 22 16:18:18 2004 +@@ -197,7 +197,6 @@ + } + + info = g_hash_table_lookup (cddb_cache, discid); +- g_free (discid); + + if (info != NULL) { + gcd->disc_info = info; +@@ -228,6 +227,8 @@ + data->nsecs, "GnomeCD", VERSION); + + gnome_cdrom_free_cddb_data (data); ++ g_free (discid); ++ g_free (offsets); + } + + int |