summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-03-25 04:08:58 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-03-25 04:08:58 +0000
commitad6ecc326f66f4ab71787a1e5c37fe48dd779c9c (patch)
tree48c6111f7ffc2ebeab0d8045db67402bbfd26be0 /x11-terms
parentFixes for glpk-4.53 (bug #501320) and library dupes (bug #505404). Added more... (diff)
downloadgentoo-2-ad6ecc326f66f4ab71787a1e5c37fe48dd779c9c.tar.gz
gentoo-2-ad6ecc326f66f4ab71787a1e5c37fe48dd779c9c.tar.bz2
gentoo-2-ad6ecc326f66f4ab71787a1e5c37fe48dd779c9c.zip
Add patch to fix build on non-glibc systems as requested by blueness on irc.
(Portage version: 2.2.9-r1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/ChangeLog6
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch24
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild11
3 files changed, 38 insertions, 3 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 4c7fda0e4216..86e57feb6b51 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-terms/gnome-terminal
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.283 2014/03/09 12:05:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.284 2014/03/25 04:08:58 tetromino Exp $
+
+ 25 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-terminal-3.10.2.ebuild, +files/gnome-terminal-3.10.2-sys-wait.h.patch:
+ Add patch to fix build on non-glibc systems as requested by blueness on irc.
09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-terminal-3.10.2.ebuild:
x86 stable, bug 499954
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch
new file mode 100644
index 000000000000..b51d03c0c55f
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch
@@ -0,0 +1,24 @@
+From 4c82fe8c37718ce2d6040a48d4e643ae6d862be6 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Mon, 1 Apr 2013 11:23:36 +0200
+Subject: [PATCH] Pull in sys/wait.h for WIFEXITED/WEXITSTATUS
+
+---
+ src/terminal-app.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 448e1ae..a92826c 100644
+--- a/src/terminal-app.c
++++ b/src/terminal-app.c
+@@ -41,6 +41,7 @@
+ #include "terminal-defines.h"
+ #include "terminal-prefs.h"
+
++#include <sys/wait.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
+--
+1.9.1
+
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
index 9dcde1459e30..f3dfc30fa19d 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.5 2014/03/09 12:05:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.6 2014/03/25 04:08:58 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 readme.gentoo
+inherit eutils gnome2 readme.gentoo
DESCRIPTION="The Gnome Terminal"
HOMEPAGE="https://help.gnome.org/users/gnome-terminal/"
@@ -42,6 +42,13 @@ DOC_CONTENTS="To get previous working directory inherited in new opened
tab you will need to add the following line to your ~/.bashrc:\n
. /etc/profile.d/vte.sh"
+src_prepare() {
+ # patch from 3.12, fixes buld on non-glibc systems
+ epatch "${FILESDIR}/${PN}-3.10.2-sys-wait.h.patch"
+
+ gnome2_src_prepare
+}
+
src_configure() {
# FIXME: leave smclient configure unset until it accepts values from the
# switch and not from GDK_TARGET, bug #363033