Fix building with CFLAGS="-O0".

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 27 insertions, 15 deletions

diff --git a/sci-geosciences/gtk-g-rays2/ChangeLog b/sci-geosciences/gtk-g-rays2/ChangeLog
index 33c88e1f2a1d..52884a8dd92d 100644
--- a/sci-geosciences/gtk-g-rays2/ChangeLog
+++ b/sci-geosciences/gtk-g-rays2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gtk-g-rays2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gtk-g-rays2/ChangeLog,v 1.3 2010/04/27 10:59:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gtk-g-rays2/ChangeLog,v 1.4 2010/07/29 11:42:27 ssuominen Exp $
+
+  29 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gtk-g-rays2-1.20.ebuild, +files/gtk-g-rays2-1.20-locale_h.patch:
+  Fix building with CFLAGS="-O0".
 
 *gtk-g-rays2-1.20 (27 Apr 2010)
 
diff --git a/sci-geosciences/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest
index 86d90de3da1b..4a28d81a7095 100644
--- a/sci-geosciences/gtk-g-rays2/Manifest
+++ b/sci-geosciences/gtk-g-rays2/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gtk-g-rays2-1.20-locale_h.patch 385 RMD160 d335e4f66e121d2b8bacfe9f60d7ee00d7691a5d SHA1 de71738c02184378c5840f0f724a10b0f9cdc762 SHA256 c0ac733042a1f8b3957d47817d69fc745ebb29d4088eb82b11a7933327a8338b
 DIST gtk-g-rays2-1.20.tar.bz2 1612888 RMD160 4106bf91dfebe4a1cb0bc6482044ee79f4cfe340 SHA1 56ea66e2366a0e18087f9c211bd9f240b876c347 SHA256 79d82796bdce9e390c1cc818f7fd6564ee0259229e7fc3d7f29a0e82f9ceab92
-EBUILD gtk-g-rays2-1.20.ebuild 895 RMD160 c6b857edea7bf7d7fbe94f329cafad1cc2215ff1 SHA1 4a3a31fe727043c4b522db59f1c90ac4475ec7c5 SHA256 6861a02d5d5c81bf055b698deca6d7198f6cf08cdbc45ee2ed4f0de8a293d232
-MISC ChangeLog 756 RMD160 69b4531a3cf7bb18cd69fd8ac5012be1accc1fd8 SHA1 4a47d0c44a230f718528d4bb7de27f358373f75f SHA256 fa891d300af94866a5fb84fbb3d5bc73b7711ec94c5716fd101445e2e9d407f4
+EBUILD gtk-g-rays2-1.20.ebuild 944 RMD160 0ab03a747a117b0240e0b3f1114c06479893eca0 SHA1 dd83a01f9c795abc813432ddeaa6117376276459 SHA256 39a735102dc084f6c3c67e86290c6b5a06bb6e71a2d3364d28cfe4aa9966029d
+MISC ChangeLog 912 RMD160 3a1b2ea4d411d2a1d8fb4343c1c551a7e78dd90a SHA1 eeeabb8d7bcc6a122b5a7c319b3e468b5af62133 SHA256 0e90cafcd90732ef1680dce9b747721532a0965bac955c95b5f2136e644e735c
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvWw5QACgkQHB6c3gNBRYcGsgCgyps4NaZm2TfAHx2h0ou1RAIf
-4A0An00BWeq/qptzbicNOAm0346L/FB3
-=VaFu
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/gtk-g-rays2/files/gtk-g-rays2-1.20-locale_h.patch b/sci-geosciences/gtk-g-rays2/files/gtk-g-rays2-1.20-locale_h.patch
new file mode 100644
index 000000000000..b88169630a7e
--- /dev/null
+++ b/sci-geosciences/gtk-g-rays2/files/gtk-g-rays2-1.20-locale_h.patch
@@ -0,0 +1,16 @@
+Fix build failure with CFLAGS="-O0" and libc
+messages.c:44:15: error: ‘LC_NUMERIC’ undeclared (first use in this function)
+
+--- src/messages.c
++++ src/messages.c
+@@ -14,6 +14,10 @@
+ #include <time.h>
+ #include "wbt201.h"
+ 
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
+ static char *wmodes[] = {
+     /*0,1*/	NULL,NULL,
+     /*2,3*/	"low_speed_limit1", "high_speed_limit1",
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.20.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.20.ebuild
index 80b6458fdded..697f2cfd7d61 100644
--- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.20.ebuild
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.20.ebuild,v 1.1 2010/04/27 10:59:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.20.ebuild,v 1.2 2010/07/29 11:42:27 ssuominen Exp $
 
 EAPI="3"
 
-inherit gnome2 base
+inherit eutils gnome2 base
 
 DESCRIPTION="GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device"
 HOMEPAGE="http://www.daria.co.uk/gps"
@@ -24,6 +24,7 @@ DEPEND="${DEPEND}
 
 src_prepare() {
 	rm -rf debian/
+	epatch "${FILESDIR}"/${P}-locale_h.patch
 }
 
 src_configure() {