summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-04 19:45:44 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-04 19:45:44 +0000
commit3c59247bfe65e4d18a5d269d63c169a91078da11 (patch)
tree9bc7d80b29f951b19011f5f537afb5eafe616315 /media-sound/rhythmbox
parentlicense for roger wilco base station (diff)
downloadhistorical-3c59247bfe65e4d18a5d269d63c169a91078da11.tar.gz
historical-3c59247bfe65e4d18a5d269d63c169a91078da11.tar.bz2
historical-3c59247bfe65e4d18a5d269d63c169a91078da11.zip
bug fix
Diffstat (limited to 'media-sound/rhythmbox')
-rw-r--r--media-sound/rhythmbox/ChangeLog6
-rw-r--r--media-sound/rhythmbox/files/digest-rhythmbox-0.4.0-r11
-rw-r--r--media-sound/rhythmbox/files/rhythmbox-0.4.0-locale-crash.patch58
-rw-r--r--media-sound/rhythmbox/rhythmbox-0.4.0-r1.ebuild58
4 files changed, 122 insertions, 1 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 9372daded416..5bdec89bce40 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/rhythmbox
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.6 2002/11/15 12:03:31 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.7 2002/12/04 19:45:43 azarah Exp $
+*rhythmbox-0.4.0 (04 Dec 2002)
+
+ 04 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
+ Fix crash if LANG not set, closing bug #10946.
*rhythmbox-0.4.0 (15 Nov 2002)
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.4.0-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.4.0-r1
new file mode 100644
index 000000000000..0f02f49e7f75
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.4.0-r1
@@ -0,0 +1 @@
+MD5 0060ed6e9220f90a1c4d07ff3a8a882c rhythmbox-0.4.0.tar.gz 987679
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.4.0-locale-crash.patch b/media-sound/rhythmbox/files/rhythmbox-0.4.0-locale-crash.patch
new file mode 100644
index 000000000000..ff5bd6583f54
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.4.0-locale-crash.patch
@@ -0,0 +1,58 @@
+--- rhythmbox-0.4.0/shell/main.c.orig 2002-12-04 20:20:42.000000000 +0200
++++ rhythmbox-0.4.0/shell/main.c 2002-12-04 20:23:48.000000000 +0200
+@@ -74,8 +74,6 @@
+ GNOME_PARAM_APP_DATADIR, DATADIR,
+ NULL);
+
+- gdk_threads_init ();
+-
+ #ifdef ENABLE_NLS
+ /* initialize i18n */
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+@@ -86,22 +84,33 @@
+ /* workaround for non utf8 LC_COLLATE */
+ old_collate = g_strdup_printf ("LC_COLLATE=%s",
+ g_getenv ("LC_COLLATE"));
+- if (strstr (old_collate, "UTF-8") == NULL)
+- {
+- char *lang = NULL, *new_collate;
++ if (old_collate == NULL || strstr (old_collate, "UTF-8") == NULL)
++
++ {
++ char *lang = NULL, *new_collate;
++
++ const char *env;
++
++ env = g_getenv ("LANG");
++ if (env == NULL)
++ {
++ env = "C";
++ }
+
+- if (strlen (g_getenv ("LANG")) >=5)
++ if (strlen (env) >=5)
+ lang = g_strndup (g_getenv ("LANG"), 5);
+- else
+- lang = g_strdup ("en_US");
+-
+- new_collate = g_strdup_printf("LC_COLLATE=%s.UTF-8",
+- lang);
+- putenv (new_collate);
++ else
++ lang = g_strdup ("en_US");
++
++ new_collate = g_strdup_printf ("LC_COLLATE=%s.UTF-8",
++ lang);
++ putenv (new_collate);
++
++ g_free (lang);
++ g_free (new_collate);
++ }
+
+- g_free (lang);
+- g_free (new_collate);
+- }
++ gdk_threads_init ();
+
+ CORBA_exception_init (&ev);
+
diff --git a/media-sound/rhythmbox/rhythmbox-0.4.0-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..e5715df063e2
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.4.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.4.0-r1.ebuild,v 1.1 2002/12/04 19:45:44 azarah Exp $
+
+inherit eutils gnome2
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="RhythmBox - an iTunes clone for GNOME"
+SRC_URI="http://www.rhythmbox.org/download/${P}.tar.gz"
+HOMEPAGE="http://www.rhythmbox.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+RDEPEND=">=x11-libs/gtk+-2.0.0
+ =gnome-base/libgnomeui-2.0*
+ =gnome-base/libglade-2.0*
+ =gnome-base/gnome-panel-2.0*
+ =gnome-base/gnome-vfs-2.0*
+ =gnome-base/libbonobo-2.0*
+ =gnome-base/bonobo-activation-1.0*
+ =gnome-base/libgnomecanvas-2.0*
+ >=media-libs/monkey-media-0.6.0
+ >=gnome-base/gconf-1.2.1
+ >=gnome-base/ORBit2-2.4.1
+ >=sys-devel/gettext-0.11.1
+ >=media-libs/gst-plugins-0.4.2"
+
+DEPEND="${RDEPEND}
+ >=dev-util/pkgconfig-0.12.0
+ dev-util/intltool"
+
+src_unpack() {
+
+ unpack ${A}
+
+ # Fix crash if LANG not set .. bug #10946.
+ cd ${S}; epatch ${FILESDIR}/${P}-locale-crash.patch
+}
+
+src_install () {
+
+ # this is a fix to disable scrollkeeper-update from running in
+ # "make install" since that breaks sandbox.
+ cd help/C
+ cat Makefile | sed s/"install-data-hook: install-data-hook-omf"/"install-data-hook:"/g >Makefile.new
+ mv Makefile.new Makefile
+ cd ../..
+ gnome2_src_install
+
+}
+
+LIBTOOL_FIX="1"
+
+DOC="AUTHORS COPYING ChangeLog INSTALL INSTALL.GNU HACKING NEWS README THANKS TODO"
+SCHEMA="rhythmbox.schemas"
+