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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686
RepoMan-Options: --force

4 files changed, 49 insertions, 14 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/Manifest b/x11-base/xorg-server/Manifest
index f8b2c03c7db0..cd00c621d8b9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -36,6 +33,7 @@ AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e
 AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
 AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
 AUX 1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch 718 RMD160 04839af0a778bdc02090f04d906f498fc31504e9 SHA1 d8bdfdd36f4b69af6990e69947aa8d503f43b454 SHA256 58f511d956dcd801236f548bfe02162379a50698939fead338e4029aabdef30d
+AUX 1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch 1542 RMD160 a5a193ee488f364d2b46d8140dc50553bfa5a5d2 SHA1 ae124e6fc0280e59884136aef94f9ecb32810e9b SHA256 503145ff5c1e1a171a1662c8362c8d2b86721383450b6b8ddd55afb73e376363
 AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
 AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
 AUX xorg-server-1.4.0.90-automake-1.10.1-fixup.patch 357 RMD160 06d03313a419fcad6b3668888e32dad28defb3a4 SHA1 3bdd2a6faa808445b2b365b420a9ce5882501035 SHA256 afb9593b3cedfdc9c768436df64b4878504804e93984672a58d96660b2b87afc
@@ -54,13 +52,6 @@ DIST xorg-server-1.4.2.tar.bz2 6216638 RMD160 6f12b28d7e4186dfbdec3c9116c65e6831
 DIST xorg-server-1.5.2.tar.bz2 5615666 RMD160 a5693c99cf2b20a94c29cfd267a0bc27626d2914 SHA1 fc8b5ed20af34f504d55a004c35ebacbc603b339 SHA256 2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18358 RMD160 b3f148e92a070a7e8ab1d168d36d3def336efd46 SHA1 807e103ab7be335fb4208b85c9a9456985ef077b SHA256 e6de227a03abf3bcb7d71335f222accc58b81d539f8a78fbe7a4be3a725f4a90
 EBUILD xorg-server-1.4.2.ebuild 17958 RMD160 7164d31633e83ad5051e201fe29eb99fa58f46d1 SHA1 bea7ae3b83083052a5ecd602c3dc0e122f4b52cc SHA256 6ed5d9bda9cd3728450701b98f67c809c3b429550cb56611568333d929624435
-EBUILD xorg-server-1.5.2.ebuild 16293 RMD160 02f992f6e818c518f1080f855defa3b94aaf3f4a SHA1 0d300e1f496c84329f02d37a156ce97142a4f6ec SHA256 5064cbbcfbd42ebaec8edc966a3af65b3f82d189130e0696a1707d67c89e8948
-MISC ChangeLog 87126 RMD160 dce979a2719d5a4eb8110e2532a5b6b6924b687b SHA1 5e80e0590ced67e0027168062118a8ca6bfe31e4 SHA256 791d2cbddd8c4ad9cb175275581ecb7b630bbf7119c941d1fadcd332c48f87a9
+EBUILD xorg-server-1.5.2.ebuild 16368 RMD160 b79d68e7540ee7a23cebf3f8e9c6526d068d8b7f SHA1 044b45b11a9a5be0e56afb96dc75ee8f866f4b51 SHA256 439e6b8ce955c074a3b895176e43b7ee9af1545395f04966da6ec00a844ac6ee
+MISC ChangeLog 87339 RMD160 1949d0b23541c5f47a1e073c08c56e65bc207bd3 SHA1 95e2a09b26b5eba6cae2bc87bf037e87764e70d6 SHA256 e93a4dd42d3994891f2224b917e4f614cd2524092c6b016c3e8c7d77d7f08397
 MISC metadata.xml 363 RMD160 6242c90a70b50a12d16ae53af775871766355562 SHA1 f50538064b1229c80204e9c84ff233749dd09bc5 SHA256 378597a2549cd07dd35551caf550f94f737118c40d17f9ac41eb4f5e2cfcae99
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj03BIACgkQXVaO67S1rtv4XACg0ST5KlcBKjL6z+1H1gQs19Vk
-aTgAn2tC6FbetgIUh96WeUXILI5HwrMd
-=uK0Z
------END PGP SIGNATURE-----
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