apply patch to fix when going to edit->preferences, fixes #108895

Package-Manager: portage-2.0.51.22-r3

5 files changed, 82 insertions, 5 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index 6dbd21eb0fdb..a252dbe2eab8 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.57 2005/10/03 03:32:34 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.58 2005/10/14 03:52:23 allanonjl Exp $
+
+*sound-juicer-2.12.2-r1 (14 Oct 2005)
+
+  14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/sound-juicer-2.12.2-file-chooser-3.patch,
+  +sound-juicer-2.12.2-r1.ebuild:
+  apply patch to fix when going to edit->preferences, fixes #108895
 
 *sound-juicer-2.12.2 (03 Oct 2005)
 
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 57c23916e6f5..a78f3719adbb 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,9 +1,12 @@
-MD5 520c3e38ace035b896748a6636d61a85 ChangeLog 8024
-MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 MD5 17b3f276240cce1cb0209c78561daa49 sound-juicer-2.12.2.ebuild 1284
+MD5 6491268d5a5734fc3619db45c8efd20c sound-juicer-2.12.2-r1.ebuild 1437
+MD5 4706b8ba9d6a576d11ac9347f328e9cf ChangeLog 8273
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 MD5 be48f49717ac43a92002c4bf5ed7d6ed sound-juicer-2.10.1.ebuild 1121
 MD5 31312b751ee9ef5a4bc58c2b120d19af sound-juicer-2.10.1-r1.ebuild 1218
-MD5 4538566af04ec19705e775fb45b5dada files/digest-sound-juicer-2.12.2 72
 MD5 4a12b02268da91a70551d700de39f32a files/digest-sound-juicer-2.10.1 72
-MD5 4a12b02268da91a70551d700de39f32a files/digest-sound-juicer-2.10.1-r1 72
+MD5 4538566af04ec19705e775fb45b5dada files/digest-sound-juicer-2.12.2 72
 MD5 62ab878296db63b837c4fb06c0fc685d files/sound-juicer-2.10.1-fbsd.patch 1017
+MD5 cbfffb6cc091ffb81864b0d6c464ad92 files/sound-juicer-2.12.2-file-chooser-3.patch 802
+MD5 4a12b02268da91a70551d700de39f32a files/digest-sound-juicer-2.10.1-r1 72
+MD5 4538566af04ec19705e775fb45b5dada files/digest-sound-juicer-2.12.2-r1 72
diff --git a/media-sound/sound-juicer/files/digest-sound-juicer-2.12.2-r1 b/media-sound/sound-juicer/files/digest-sound-juicer-2.12.2-r1
new file mode 100644
index 000000000000..dd24534972c9
--- /dev/null
+++ b/media-sound/sound-juicer/files/digest-sound-juicer-2.12.2-r1
@@ -0,0 +1 @@
+MD5 e7e873cc77a002eb0d9c4cf502bd343d sound-juicer-2.12.2.tar.bz2 573186
diff --git a/media-sound/sound-juicer/files/sound-juicer-2.12.2-file-chooser-3.patch b/media-sound/sound-juicer/files/sound-juicer-2.12.2-file-chooser-3.patch
new file mode 100644
index 000000000000..2c4d94535bbb
--- /dev/null
+++ b/media-sound/sound-juicer/files/sound-juicer-2.12.2-file-chooser-3.patch
@@ -0,0 +1,13 @@
+--- sound-juicer-2.12.2/src/sj-prefs.c	2005-07-04 05:09:40.000000000 -0400
++++ sound-juicer-2.12.2.new/src/sj-prefs.c	2005-10-13 23:45:43.000000000 -0400
+@@ -249,7 +249,9 @@
+   } else {
+     g_return_if_fail (entry->value->type == GCONF_VALUE_STRING);
+     base_uri = gconf_value_get_string (entry->value);
+-    if (strcmp (gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (basepath_fcb)), base_uri) != 0) { 
++    const char* testing = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (basepath_fcb));
++    //if ( strcmp (gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (basepath_fcb)), base_uri) != 0) { 
++    if ( testing == NULL || strcmp(testing, base_uri) != 0 ) {
+       gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (basepath_fcb), base_uri);
+     }
+   }
diff --git a/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild b/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild
new file mode 100644
index 000000000000..3cc6841f67f2
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.12.2-r1.ebuild,v 1.1 2005/10/14 03:52:23 allanonjl Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="CD ripper for GNOME 2"
+HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="flac vorbis"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-extra/nautilus-cd-burner-2.11.1
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2.9
+	=media-libs/gstreamer-0.8*
+	>=gnome-extra/gnome-media-2.11.91
+	>=media-libs/musicbrainz-2.1
+	=media-libs/gst-plugins-0.8*
+	=media-plugins/gst-plugins-cdparanoia-0.8*
+	=media-plugins/gst-plugins-gnomevfs-0.8*
+	vorbis? (
+		=media-plugins/gst-plugins-vorbis-0.8*
+		=media-plugins/gst-plugins-ogg-0.8* )
+	flac? ( =media-plugins/gst-plugins-flac-0.8* )"
+
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.28
+	>=app-text/scrollkeeper-0.3.5
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+# needed to get around some sandboxing checks
+export GST_INSPECT=/bin/true
+
+G2CONF="--disable-scrollkeeper"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# fix crash for going to edit -> preferences, #108895
+	epatch ${FILESDIR}/${P}-file-chooser-3.patch
+}