fix segfault #35443

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 009d917b0ef5ef9ddf269befae5187f54081f969..4e87984ea7e2a7c72f03aa918c6535d071d9e447 100644 (file)
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.5 2003/12/31 17:13:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.6 2003/12/31 18:41:01 vapier Exp $
+
+*gcompris-4.2-r1 (31 Dec 2003)
+
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix segfault when all locale vars are unset in environment (LANG, etc...) #35443.
 
 *gcompris-4.2 (08 Dec 2003)
 

diff --git a/games-kids/gcompris/files/4.2-lang.patch b/games-kids/gcompris/files/4.2-lang.patch
new file mode 100644 (file)
index 0000000..11e25b1
--- /dev/null
+++ b/games-kids/gcompris/files/4.2-lang.patch
@@ -0,0 +1,11 @@
+--- src/gcompris/properties.c.orig     2003-12-31 13:30:18.831332888 -0500
++++ src/gcompris/properties.c  2003-12-31 13:29:18.723470672 -0500
+@@ -61,7 +61,7 @@
+   if(locale == NULL)
+     locale = getenv("LANG");
+ 
+-  if (!strcmp(locale, "C"))
++  if (locale != NULL && !strcmp(locale, "C"))
+     {
+       tmp->locale             = gnome_config_get_string ("/gcompris/Preferences/locale=en_US.UTF-8");
+     } 

diff --git a/games-kids/gcompris/files/digest-gcompris-4.2 b/games-kids/gcompris/files/digest-gcompris-4.2-r1
similarity index 100%
rename from games-kids/gcompris/files/digest-gcompris-4.2
rename to games-kids/gcompris/files/digest-gcompris-4.2-r1

diff --git a/games-kids/gcompris/gcompris-4.2.ebuild b/games-kids/gcompris/gcompris-4.2-r1.ebuild
similarity index 95%
rename from games-kids/gcompris/gcompris-4.2.ebuild
rename to games-kids/gcompris/gcompris-4.2-r1.ebuild
index ddfd60a28566dcc6e6e38cfc38ee9a4762a8bbbb..1f16e8391344c22b81292a737f468f3d05418537 100644 (file)
--- a/games-kids/gcompris/gcompris-4.2.ebuild
+++ b/games-kids/gcompris/gcompris-4.2-r1.ebuild
@@ -30,6 +30,12 @@ DEPEND="virtual/x11
                        media-libs/libvorbis
                        media-libs/libao )"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${PV}-lang.patch
+}
+
 src_compile() {
        export GNUCHESS="${GAMES_BINDIR}/gnuchess"