summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-12-31 18:41:03 +0000
committerMike Frysinger <vapier@gentoo.org>2003-12-31 18:41:03 +0000
commita21baa6ec1c4473a92716344d7fc4b3d01003058 (patch)
tree179dec09491811589c9cbcbd37baa71b75fcfc65 /games-kids
parentFix bug that causes awk script to fail when pipe is not closed. Closes bug 36792 (diff)
downloadgentoo-2-a21baa6ec1c4473a92716344d7fc4b3d01003058.tar.gz
gentoo-2-a21baa6ec1c4473a92716344d7fc4b3d01003058.tar.bz2
gentoo-2-a21baa6ec1c4473a92716344d7fc4b3d01003058.zip
fix segfault #35443
Diffstat (limited to 'games-kids')
-rw-r--r--games-kids/gcompris/ChangeLog7
-rw-r--r--games-kids/gcompris/files/4.2-lang.patch11
-rw-r--r--games-kids/gcompris/files/digest-gcompris-4.2-r1 (renamed from games-kids/gcompris/files/digest-gcompris-4.2)0
-rw-r--r--games-kids/gcompris/gcompris-4.2-r1.ebuild (renamed from games-kids/gcompris/gcompris-4.2.ebuild)6
4 files changed, 23 insertions, 1 deletions
diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 009d917b0ef5..4e87984ea7e2 100644
--- 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
index 000000000000..11e25b100052
--- /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
index e6328038c5e1..e6328038c5e1 100644
--- a/games-kids/gcompris/files/digest-gcompris-4.2
+++ b/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
index ddfd60a28566..1f16e8391344 100644
--- 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"