From 8425e1480ae8ee36741c3f02329ddea78b20a342 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 15 May 2012 21:40:27 +0000
Subject: Fix building with -Werror=implicit-function-declaration wrt #415953
 by Kacper Kowalik

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)
---
 x11-apps/xmodmap/ChangeLog                         |  7 ++-
 .../xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch  | 57 ++++++++++++++++++++++
 x11-apps/xmodmap/xmodmap-1.0.7.ebuild              |  4 +-
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch

(limited to 'x11-apps')

diff --git a/x11-apps/xmodmap/ChangeLog b/x11-apps/xmodmap/ChangeLog
index 389053462863..fd44b6a9474a 100644
--- a/x11-apps/xmodmap/ChangeLog
+++ b/x11-apps/xmodmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xmodmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.68 2012/05/15 14:21:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.69 2012/05/15 21:40:27 ssuominen Exp $
+
+  15 May 2012; Samuli Suominen <ssuominen@gentoo.org> xmodmap-1.0.7.ebuild,
+  +files/xmodmap-1.0.7-_GNU_SOURCE.patch:
+  Fix building with -Werror=implicit-function-declaration wrt #415953 by Kacper
+  Kowalik
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> xmodmap-1.0.7.ebuild:
   keyword ~amd64-fbsd
diff --git a/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch b/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch
new file mode 100644
index 000000000000..79f13fba1406
--- /dev/null
+++ b/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch
@@ -0,0 +1,57 @@
+From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon, 23 Apr 2012 14:28:39 +0000
+Subject: include config.h before stdio.h & other system headers
+
+Ensures definitions like _GNU_SOURCE are visible when needed.
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/exec.c b/exec.c
+index dbcb669..419b10e 100644
+--- a/exec.c
++++ b/exec.c
+@@ -54,6 +54,10 @@ from The Open Group.
+  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+diff --git a/pf.c b/pf.c
+index 0eb0f55..3f0c3f4 100644
+--- a/pf.c
++++ b/pf.c
+@@ -26,6 +26,10 @@ from The Open Group.
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+diff --git a/xmodmap.c b/xmodmap.c
+index 58a8e70..0f89629 100644
+--- a/xmodmap.c
++++ b/xmodmap.c
+@@ -26,6 +26,10 @@ from The Open Group.
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
index 8447e33fe67b..e068f5591efc 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.2 2012/05/15 14:21:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.3 2012/05/15 21:40:27 ssuominen Exp $
 
 EAPI=4
 
@@ -13,3 +13,5 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-_GNU_SOURCE.patch )
-- 
cgit v1.2.3-65-gdbad