diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-03 12:21:56 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-06-03 12:21:56 +0800 |
| commit | 31ca390e4cd2fcd65d91c80d4f92545cb8f2936c (patch) | |
| tree | d7a5641f8ecc7edc83b38a9990e52d018a34a252 /audio/rhythmbox-devel | |
| parent | 889c5ba1ab9450d69f99ad9142b7d9ce6abb08fb (diff) | |
| download | marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.tar marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.tar.gz marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.tar.bz2 marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.tar.lz marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.tar.xz marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.tar.zst marcuscom-ports-31ca390e4cd2fcd65d91c80d4f92545cb8f2936c.zip | |
The error cannot be NULL, so instead set the error message to a single
space.
Obtained from: Rhythmbox CVS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6362 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/rhythmbox-devel')
| -rw-r--r-- | audio/rhythmbox-devel/Makefile | 4 | ||||
| -rw-r--r-- | audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c | 18 |
2 files changed, 9 insertions, 13 deletions
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index d192be795..57dec0d9b 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.58 2006/05/28 19:48:16 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.59 2006/06/02 20:19:18 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.9.4.1 -PORTREVISION= 5 +PORTREVISION= 6 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 index 9e4f77ea5..f12bc25fc 100644 --- a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c +++ b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c @@ -1,15 +1,11 @@ ---- 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, +--- metadata/rb-metadata-gst.c.orig Sat Jun 3 00:21:25 2006 ++++ metadata/rb-metadata-gst.c Sat Jun 3 00:21:34 2006 +@@ -1068,7 +1068,7 @@ rb_metadata_load (RBMetaData *md, + g_set_error (error, + RB_METADATA_ERROR, + RB_METADATA_ERROR_NOT_AUDIO_IGNORE, - NULL); -+ if (error != NULL) -+ *error = NULL; ++ " "); } } else { /* yay, it worked */ |