- Put accedentally removed get_mmc_profile() patch back.

- Fix crasher bug when last selected track skipped while extracting.

3 files changed, 38 insertions, 0 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 7c3a7ac36303..cfe90a339eea 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sound-juicer
 PORTVERSION=	0.5.10.1
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 DIST_SUBDIR=	gnome2
diff --git a/audio/sound-juicer/files/patch-src::cd-drive.c b/audio/sound-juicer/files/patch-src::cd-drive.c
new file mode 100644
index 000000000000..244fd020d119
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::cd-drive.c
@@ -0,0 +1,20 @@
+--- src/cd-drive.c.orig	Sat Feb  7 18:02:54 2004
++++ src/cd-drive.c	Sat Feb  7 18:03:46 2004
+@@ -66,7 +66,7 @@
+ 
+ /* For dvd_plus_rw_utils.cpp */
+ int get_dvd_r_rw_profile (const char *name);
+-int get_mmc_profile (void *fd);
++int get_mmc_profile (int fd);
+ 
+ static void
+ add_dvd_plus (CDDrive *cdrom)
+@@ -103,7 +103,7 @@
+ 		return CD_MEDIA_TYPE_ERROR;
+ 	}
+ 
+-	mmc_profile = get_mmc_profile ((void *)&fd);
++	mmc_profile = get_mmc_profile (fd);
+ 	close (fd);
+ 
+ 	switch (mmc_profile) {
diff --git a/audio/sound-juicer/files/patch-src::sj-extracting.c b/audio/sound-juicer/files/patch-src::sj-extracting.c
new file mode 100644
index 000000000000..b2aa88dc0bfa
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::sj-extracting.c
@@ -0,0 +1,17 @@
+--- src/sj-extracting.c.orig	Tue Jan 13 20:19:03 2004
++++ src/sj-extracting.c	Sat Feb  7 19:12:38 2004
+@@ -226,7 +226,13 @@
+ pop_and_extract (void)
+ {
+   if (pending == NULL) {
+-    g_assert_not_reached ();
++    gtk_widget_hide (progress_dialog);
++    show_finished_dialog ();
++    cleanup ();
++    extracting = FALSE;
++    if (autostart) {
++      gtk_main_quit ();
++    }
+   } else {
+     char *file_path, *directory;
+     GError *error = NULL;