[pkgsrc/trunk]: pkgsrc/audio/sound-juicer avoid crashes if the disk title or ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d65f9e4b244b
branches:  trunk
changeset: 397341:d65f9e4b244b
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Aug 10 10:00:19 2009 +0000

description:
avoid crashes if the disk title or artist cannot be identified
(just workarounds, the code is too messy for a real fix),
bump PKGREVISION

diffstat:

 audio/sound-juicer/Makefile         |   4 ++--
 audio/sound-juicer/distinfo         |   4 +++-
 audio/sound-juicer/patches/patch-ac |  14 ++++++++++++++
 audio/sound-juicer/patches/patch-ad |  14 ++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diffs (64 lines):

diff -r 06fdec09b57e -r d65f9e4b244b audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile       Mon Aug 10 09:47:23 2009 +0000
+++ b/audio/sound-juicer/Makefile       Mon Aug 10 10:00:19 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2009/07/26 18:31:22 drochner Exp $
+# $NetBSD: Makefile,v 1.27 2009/08/10 10:00:19 drochner Exp $
 #
 
 DISTNAME=              sound-juicer-2.26.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            audio
 MASTER_SITES=          http://www.burtonini.com/computing/ \
                        ${MASTER_SITE_GNOME:=sources/sound-juicer/2.26/}
diff -r 06fdec09b57e -r d65f9e4b244b audio/sound-juicer/distinfo
--- a/audio/sound-juicer/distinfo       Mon Aug 10 09:47:23 2009 +0000
+++ b/audio/sound-juicer/distinfo       Mon Aug 10 10:00:19 2009 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/07/26 18:31:22 drochner Exp $
+$NetBSD: distinfo,v 1.7 2009/08/10 10:00:19 drochner Exp $
 
 SHA1 (sound-juicer-2.26.1.tar.gz) = 46c705d49ec97a4679218387533af20020c26ddb
 RMD160 (sound-juicer-2.26.1.tar.gz) = 322003ffefa9c0c33afb22593af53fc5a7d6618b
 Size (sound-juicer-2.26.1.tar.gz) = 2457595 bytes
 SHA1 (patch-aa) = d7b6bc02f0a6abd4178639f80098c7fac21ea32b
 SHA1 (patch-ab) = 523296c20f9193c32fbc31a120b8fb90875b6cf6
+SHA1 (patch-ac) = c0829a2522a2b4519b3cd69a1d461e3a97527b0b
+SHA1 (patch-ad) = 6a908c4ed4aa8ca4890a9e0c445cb3f94ec6bb94
diff -r 06fdec09b57e -r d65f9e4b244b audio/sound-juicer/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sound-juicer/patches/patch-ac       Mon Aug 10 10:00:19 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2009/08/10 10:00:19 drochner Exp $
+
+--- src/sj-main.c.orig 2009-02-24 13:05:50.000000000 +0100
++++ src/sj-main.c
+@@ -1416,7 +1416,8 @@ void on_artist_edit_changed(GtkEditable 
+ 
+   if (current_album->artist) {
+     former_album_artist = current_album->artist;
+-  }
++  } else
++    former_album_artist = g_strdup("");
+   current_album->artist = gtk_editable_get_chars (widget, 0, -1); /* get all the characters */
+ 
+   if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (track_store), &iter)) {
diff -r 06fdec09b57e -r d65f9e4b244b audio/sound-juicer/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/sound-juicer/patches/patch-ad       Mon Aug 10 10:00:19 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2009/08/10 10:00:19 drochner Exp $
+
+--- src/sj-extracting.c.orig   2009-02-10 22:55:51.000000000 +0100
++++ src/sj-extracting.c
+@@ -855,6 +855,9 @@ sanitize_path (const char* str, const ch
+   gchar *res = NULL;
+   gchar *s;
+ 
++  if (!str)
++    return NULL;
++
+   /* Skip leading periods, otherwise files disappear... */
+   while (*str == '.')
+     str++;