x11-base/xorg-server: add patch to fix build issue with some locales (see bug #237119)

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686, RepoMan options: --force)

3 files changed, 46 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 46fc14f4b087..402e34c5cbb3 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.360 2008/10/14 17:51:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.361 2008/10/18 00:04:37 remi Exp $
+
+  17 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch,
+  xorg-server-1.5.2.ebuild:
+  add patch to fix build issue with some locales (see bug #237119)
 
   14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   -xorg-server-1.3.0.0-r4.ebuild, -xorg-server-1.3.0.0-r5.ebuild,
diff --git a/x11-base/xorg-server/files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch b/x11-base/xorg-server/files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch
new file mode 100644
index 000000000000..5ceca801dfdf
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch
@@ -0,0 +1,38 @@
+From b22ab25991aba5ad71f26a68ea3b9366ac63ef4a Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Sat, 18 Oct 2008 01:01:23 +0200
+Subject: [PATCH] force LANG=C when running awk due to unintended errors with some locales
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This bug was reported by a user trying to build the server with a
+Turkish locale (tr_TR). The problem is that the Turkish alphabet is
+latin-based, but not entirely similar. The bug comes from vesamodes
+which has "Interlaced", which is then converted to lowercase by
+modelines2c.awk. Execept that with a Turkish locale
+tolower("Interlaced") is not "interlaced" but "ınterlaced", which the
+rest of the script fails to understand.
+
+This patch forces LANG=C when running the awk script to always get the
+intended latin en_US alphabet.
+---
+ hw/xfree86/common/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
+index 0f44075..7f422c2 100644
+--- a/hw/xfree86/common/Makefile.am
++++ b/hw/xfree86/common/Makefile.am
+@@ -24,7 +24,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
+ MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
+ 
+ xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
+-	cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
++	cat $(MODEDEFSOURCES) | LANG=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
+ 
+ BUILT_SOURCES = xf86DefModeSet.c
+ 
+-- 
+1.6.0.2
+
diff --git a/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
index 5efd9904cc12..715b737dcae8 100644
--- a/x11-base/xorg-server/xorg-server-1.5.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.2 2008/10/14 17:46:28 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.3 2008/10/18 00:04:37 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -275,6 +275,7 @@ EPATCH_SUFFIX="patch"
 GENTOO_PATCHES=(
 	"${FILESDIR}/1.4-fpic-libxf86config.patch"
 	"${FILESDIR}/1.4-fix-kdrive-automake.patch"
+	"${FILESDIR}/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch"
 	)
 
 # These have been sent upstream