diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-03 04:19:18 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-03 04:19:18 +0800 |
| commit | 889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb (patch) | |
| tree | 6e5734834c6d7b706cfd1cee99fcaab4ef128e95 /audio | |
| parent | 6e7048b4adb2db78fc89d0e4071ffaf3288d0f3f (diff) | |
| download | marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.tar marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.tar.gz marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.tar.bz2 marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.tar.lz marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.tar.xz marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.tar.zst marcuscom-ports-889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb.zip | |
Fix a crash that can occur if there are unknown files in the rb library, and
library watching is enabled.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6361 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/rhythmbox-devel/Makefile | 4 | ||||
| -rw-r--r-- | audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c | 15 | ||||
| -rw-r--r-- | audio/rhythmbox/Makefile | 4 | ||||
| -rw-r--r-- | audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c | 15 |
4 files changed, 34 insertions, 4 deletions
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index 66b14dd48..d192be795 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.57 2006/05/28 02:44:18 mezz Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.58 2006/05/28 19:48:16 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.9.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 diff --git a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c new file mode 100644 index 000000000..9e4f77ea5 --- /dev/null +++ b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c @@ -0,0 +1,15 @@ +--- metadata/rb-metadata-gst.c.orig Fri Jun 2 15:42:35 2006 ++++ metadata/rb-metadata-gst.c Fri Jun 2 16:15:13 2006 +@@ -1065,10 +1065,8 @@ rb_metadata_load (RBMetaData *md, + "%s", msg); + g_free (msg); + } else { +- g_set_error (error, +- RB_METADATA_ERROR, +- RB_METADATA_ERROR_NOT_AUDIO_IGNORE, +- NULL); ++ if (error != NULL) ++ *error = NULL; + } + } else { + /* yay, it worked */ diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 66b14dd48..d192be795 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.57 2006/05/28 02:44:18 mezz Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.58 2006/05/28 19:48:16 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.9.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 diff --git a/audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c b/audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c new file mode 100644 index 000000000..9e4f77ea5 --- /dev/null +++ b/audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c @@ -0,0 +1,15 @@ +--- metadata/rb-metadata-gst.c.orig Fri Jun 2 15:42:35 2006 ++++ metadata/rb-metadata-gst.c Fri Jun 2 16:15:13 2006 +@@ -1065,10 +1065,8 @@ rb_metadata_load (RBMetaData *md, + "%s", msg); + g_free (msg); + } else { +- g_set_error (error, +- RB_METADATA_ERROR, +- RB_METADATA_ERROR_NOT_AUDIO_IGNORE, +- NULL); ++ if (error != NULL) ++ *error = NULL; + } + } else { + /* yay, it worked */ |