summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2012-08-21 01:14:41 +0000
committerNaohiro Aota <naota@gentoo.org>2012-08-21 01:14:41 +0000
commit04b4f1c03b684c3f5a1816ef55aa2ca2b46c40ed (patch)
tree6f8395741fe1a52246769f83977c69947ac2d0ce /x11-misc/qterm
parentStable arm, bug #431846 (diff)
downloadgentoo-2-04b4f1c03b684c3f5a1816ef55aa2ca2b46c40ed.tar.gz
gentoo-2-04b4f1c03b684c3f5a1816ef55aa2ca2b46c40ed.tar.bz2
gentoo-2-04b4f1c03b684c3f5a1816ef55aa2ca2b46c40ed.zip
Add patch from upstrem to fix build failure with gcc 4.7. #427490
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/qterm')
-rw-r--r--x11-misc/qterm/ChangeLog6
-rw-r--r--x11-misc/qterm/files/qterm-0.5.12-glibc216.patch12
-rw-r--r--x11-misc/qterm/qterm-0.5.12.ebuild5
3 files changed, 20 insertions, 3 deletions
diff --git a/x11-misc/qterm/ChangeLog b/x11-misc/qterm/ChangeLog
index a20f09771dfd..86b019e0634d 100644
--- a/x11-misc/qterm/ChangeLog
+++ b/x11-misc/qterm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/qterm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.45 2012/07/19 15:35:06 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.46 2012/08/21 01:14:41 naota Exp $
+
+ 21 Aug 2012; Naohiro Aota <naota@gentoo.org>
+ +files/qterm-0.5.12-glibc216.patch, qterm-0.5.12.ebuild:
+ Add patch from upstrem to fix build failure with gcc 4.7. #427490
19 Jul 2012; Michael Palimaka <kensington@gentoo.org> qterm-0.5.12.ebuild:
Add missing slot dependencies on Qt.
diff --git a/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch b/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
new file mode 100644
index 000000000000..a2f7c3b625c1
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main.cpp b/src/main.cpp
+index 6c39d4a..859de70 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -41,6 +41,7 @@ AUTHOR: kingson fiasco
+ #include <fcntl.h>
+ #include <execinfo.h>
+ #include <signal.h>
++#include <unistd.h>
+
+ #define QTERM_SIG_MAX_RETS 50
+ #define QTERM_SIG_LOG_DIR "/var/tmp"
diff --git a/x11-misc/qterm/qterm-0.5.12.ebuild b/x11-misc/qterm/qterm-0.5.12.ebuild
index 5b250de2705c..818936c321f8 100644
--- a/x11-misc/qterm/qterm-0.5.12.ebuild
+++ b/x11-misc/qterm/qterm-0.5.12.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-misc/qterm/qterm-0.5.12.ebuild,v 1.6 2012/07/19 15:35:06 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.12.ebuild,v 1.7 2012/08/21 01:14:41 naota Exp $
EAPI=3
inherit cmake-utils eutils
@@ -23,7 +23,8 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/"${PN}"-0.5.11-gentoo.patch \
- "${FILESDIR}"/${P}-qt4.patch
+ "${FILESDIR}"/${P}-qt4.patch \
+ "${FILESDIR}"/${P}-glibc216.patch
}
src_install() {