Add patch from upstrem to fix build failure with gcc 4.7. #427490

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 37 insertions, 13 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/Manifest b/x11-misc/qterm/Manifest
index 7ba5373011dc..8e071c272305 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -2,21 +2,28 @@
 Hash: SHA256
 
 AUX qterm-0.5.11-gentoo.patch 352 SHA256 e1f67ff3f067f122b525653d1b9a95bdc5ab2253c0eb3fe56d0142a2c27c1851 SHA512 ab7485d4b3c735d8d512218654653a51641145c1f6e4bdc744e9d914a529fbc263b748e0b41aaef2398ad3d37f79f1cac4117b2bc5f0a93f5d70d09df188a700 WHIRLPOOL 5b05f372ac3791de766c2bdfb8d6f00897e3d3de25fd5e4eb4072d29ebcb9ccb147721d0bc8621ab10112eb7ef29e06bf229a0c1b285b61aa7403bb33caae12e
+AUX qterm-0.5.12-glibc216.patch 313 SHA256 63b9b27ff7dfc3c439779a65d6e57986974a36a928db674d853056ae6d94b174 SHA512 083c10738bbfcd6a67c251608077d9591f8a652678defd2709e9fc1987b1f8de15bf14b50380db85eb3319ac37c44a48009f1642bda1ecddc8bd6e327f1e6537 WHIRLPOOL 0fc253d0530ca9d5578c769d6c83050b7827907361fdf860b76ef156ba108aa52f3a04efe453dd8d49a6615de74cc918dac96a7af1bbcd0ba263dc22939bd277
 AUX qterm-0.5.12-qt4.patch 404 SHA256 a3964f38c5e0a8c86bf2487245badb64f11a700b8a83bff5d43bdc5dea0b9cd1 SHA512 a884ed7399ce9b9b5a9990cf75387075f3caef157ef02954cde0f9b6605fcd7b29628828ffdcbbc7dd93caf655ff71c8f50c9ead63972177c7cd1f0fbb99dee5 WHIRLPOOL 8b9faf5ac48a96ccd5ca3b8203802ac1b7ab85eb5e491afb90a984af66fc18ce7a5bc48f4d25169cf92d0a6abd6ecf4d131ee0a4633b6b1de50d5b0735308a8c
 DIST qterm-0.5.11.tar.bz2 700771 SHA256 16b2d3438fba83ec3c8ccbce70fd9dca4c54727065a72d17afe6c0c9528b0300
-DIST qterm-0.5.12.tar.bz2 749254 SHA256 bd31051a6c117b05fef3ea163480143837c57632a84eab43e8e142860bcab22a
+DIST qterm-0.5.12.tar.bz2 749254 SHA256 bd31051a6c117b05fef3ea163480143837c57632a84eab43e8e142860bcab22a SHA512 43f302f28edfb7fe4332d054390011e3eba37863be57191a13cedf2fa76d7b5db53d32947b7acd5e7585f2b0c8afe9b4b43334d86040f1f9249e9e767dd715e8 WHIRLPOOL 77b3fb09ea28901a151f8e0707a107677260a52d38a24427155dfa4e36d208bfc08be4016205d4c4f0c7fd374b967ccfed46271644e6dca2aa6e27ac637a991a
 EBUILD qterm-0.5.11.ebuild 760 SHA256 cee76e1af5778baf608e072c24a72527ab09e61fa678f5a875b4ae60286085f5 SHA512 dbb8f1c204cd8cae55f77baee3367d900019c7d92fde66ea68fc54995528003b69e2b4436ed64776d4a95e709b952a18de78689d74e6adf75433d2c9250c69f5 WHIRLPOOL 4729539d9eb73d10255960fe723663b2c18be498f2bfc625299672e9ade65c88b2cd7af8e3f7cca85a280517f47cb79cfe39598f6fdfc64a8c85e8757a238f67
-EBUILD qterm-0.5.12.ebuild 804 SHA256 b3cde970d2edc8cd4f01c36a4f77e07e30c7d7e722169b3154914bb9ea4a93e6 SHA512 d9361f8e9da3410f5a7e75b99e0ea87382959fab07a7913695174f37c0f9ce9f61a0134f411f4838e67d1a08bcd69acff38c8503537897b9801931ca1f68733b WHIRLPOOL a2708e3660bf51780854ae8475ecc8ecdf950358378cc028ae951e96e47372d0f72ccefb00490d60ca08708bd0e40c31d64ebd8f68888d139bc141c385685726
-MISC ChangeLog 6895 SHA256 5b0788e007ec5575f5c4abcc45f14b953f1b08549f8a7f207f93df7076d28578 SHA512 fef0994099060baf4e52928642e4a490caf485dcf5cd8f101d2c70c60f0a9d74166ab1fe1efadded500da966bf21c3cfeec73e179d8d200ac0ec098fd0e55300 WHIRLPOOL 239c81eafddbd38e872a26241eb71790cafc88d9ce77592a1488d026dd5f0fb55e3b30b74d79f90c8f9eb2e107827279a8f14fe017895733f73d481af594a002
+EBUILD qterm-0.5.12.ebuild 838 SHA256 61b4381bd6be1bd4c4bbb39dd1c993d750bb43c5155cfa7ec8daba9a84f81922 SHA512 bd2e21ef1738e1ce2a9e0d63862769b235ff3e173d11b5f64071e00ae5b4f012d13d084885a7c12c67bfe2db0d9cd1eb444c97a8a795371007a30724d543aa68 WHIRLPOOL 6bb099758faf382c4be9df52021c51f6dd53f6240e3592777f70650d515104e72320f5bfbe85549cb4da3913f3365358c3f061a37e886b68f093f93781ba2235
+MISC ChangeLog 7065 SHA256 31e47bd70f113b4479ab89b1a16bb4338ceb0c911a1ba592f1d94d05edbb02a3 SHA512 fe4f70fcad753109811d03679c87ed0c149987bc5dacdcc10007ef5a4f2675d1c6986a772b2a37e3b0efe538313948c6dc6ce8f188c9c57c4a8a332109e735fd WHIRLPOOL bc0942af89123f191ab02fd07cf361c96c82f6c8bae7dde80dc93a542a13d93649628c361fb5de4bb4e71ccf0fa773620d0c21804be799f41d83f3203ffb7f18
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCCkjAAoJEMbwO6tnXQ0sUx8IAI78Lhthhfas2jqvVvqU/NRC
-XAmsnG2KVqV+TeS/Rq3Xn2TD/xhUc/qs26qj79OJZ+0HaYcx+MPC5WilhzhwlXlQ
-0wLkZJpM559JbYPRB6CGhSLDCakRqIc6ckrJzXdUrNjcPqCsO/FQ9G5g7YobD7uD
-prZkeb1ngKOTh5RJaELjYELxnzgpNNt/B3tg00CMZjJiD1IaHKI138auefNbgA1l
-vzo2Fexb0ayCoaRoTOWddIAAcpvZ8SzGY1t8HjvVNPIeY+3mNFkCHd1eKFweQCFw
-E8ygKUHs4YefKUJEsqNhiUscqQ6dGc0Qal/HBk7YhKAErZARlczvoF+emGinrUA=
-=eG70
+iQIcBAEBCAAGBQJQMuFvAAoJEDYO1FT4VRUU+w8P/3UdFeQtj/lWJzgGSU90EGgE
+r6Jsi56cU/NaHAutk1grFCttogkEZvvtrBWjU211QILI8t3/KFjehKUf4z8y28GL
+tjvXzCWUxbnhLYGOAzKVvEI1bCSrsPse+mlseA2f1B9QcNFcJbGk269f5eFj+wbd
+S/L3EesGDq7jGQOGtf52uh7CUXFMByCP4tcmoPv19Av7KENl+vH1WpBGmoozVSjb
+fpY8kzEfhEtZsNeCWlb9wcSy+weJHzrOnIN9FC3lDeQTGD5tjiDFhfLEjOMb2fsV
+ei4jzIRK6DCGS23JUDKGs+nYXAmKYACfYcQ8da9MWHZ/6l8aZFFPRYV813Q4KxfR
+9TcVxXrzNjksMXi+xcanmjfQqgnNmnHAf2NTegpA7L6x34qtukcD7boU35M4qm++
+iK7Vf0SWGgKkBlnvi3Vswp82mxe3AbmupTrBSq1cRLffhGHweUilv2mR2/Xk+PMx
+Kld3IKSZqsLX5VvFlzB3YH+ZR4ZwNz4JL91Z8YHvS+GdektVvJe+0jTCtpSJX60T
+39826mndjb9zNTsI/9YAhBsmAzfPjL5AUR4TkoJYy/4xtelS3vtxDb4I0fk527xE
+mqiulQeiwl5l2y1PicXfiL5WtpuduCHToQVy2k/Guq97eNZFavSgyYJ28Je6zkZ1
+9kDNjsVaxoCIZmnWyH9f
+=Jy/p
 -----END PGP SIGNATURE-----
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() {