Fix build with gcc-4.7 (bug #424731).

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

4 files changed, 63 insertions, 4 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index 609d2065649f..750621f36796 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.11 2012/03/18 22:55:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.12 2012/08/07 09:02:33 radhermit Exp $
+
+  07 Aug 2012; Tim Harder <radhermit@gentoo.org> apitrace-3.0-r1.ebuild,
+  +files/apitrace-3.0-gcc47.patch:
+  Fix build with gcc-4.7 (bug #424731).
 
   18 Mar 2012; Tim Harder <radhermit@gentoo.org> -apitrace-3.0.ebuild:
   Remove old.
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index dea23dfde4f2..fa4abf3eb5cf 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX apitrace-2.0-glxtrace-only.patch 2605 SHA256 1ffb7f76a5f681bc83996ff967caaab1369d59d8ee6b6d7212c3889eaef824d4 SHA512 44f99a9917dbb9365b9596d22729a9826bc7d39608167ec35f7f5257591c27787870a491453d586af8d7cd3a32782df470e9bc11180139a43b1d3cf02b288623 WHIRLPOOL 8d1e141e14c5fadbd05ba67b0fb8617e065135ae0bc2245fa2496e0b9edd8a40cbcc425ed744b30f1f4221fadf3959aab8b66efcd5d35411a49133c89e9fc176
 AUX apitrace-2.0-system-libs.patch 2057 SHA256 e37b5adddbfb6aac39f6f808ae548760e1cfaedc0ce6a877ce1a29a4159f9615 SHA512 c35b6390d431f3e56cdd11eacacefbb922c05c8235e49baaca2a0d6ca88424e0f3c6d1b945e0a5ea3351931a6a934fb610da0724e361cd79784eb0e0cc837be5 WHIRLPOOL a4064407a7b55e5c74e2cf1a91dd2d5b3ca71880e96e6816f38b4022fe0c8bd62c42eaca4f4227e49cc611efe56a433f8eff3dba38092e7eb1be8217e5bce111
 AUX apitrace-2.0-zlib-1.2.6.patch 1040 SHA256 b723578120b3e898915b48c1bcf34eacefdcbd43e0925638c7b5730710c76c01 SHA512 198772c231fe7f86b824736f21540a19514efb71e5665a225b785c33ffb71a71c336488ab566a0a918206bd013b667e73e81def5fd88178dfb28c8918ae15073 WHIRLPOOL 936914ad8e9b4a25fc52d0857737f064c0d13628b907995a390e3ee6eb4ee69e351eca98ae42956aa5d9e8b26f8cba8045eb49875ed61c426ed152288268eab9
+AUX apitrace-3.0-gcc47.patch 1038 SHA256 1791317489873ba84280c29220976789d7f2b15c6cdebdb463a394c9c8405c41 SHA512 3120a5c61db7dbc7f91a5f489be2451b2069f14a4acf9a068d1a039731baf8330790c5ab949ef26f2111785fe19218d0ec153c09314cb0990f76cddd679957a0 WHIRLPOOL 74921c03cc2f655acf6645f7a17446bb990244c81ca4104569b2880669f197fb40a7808a88b5deaca231a42fceac4186aa1b3a8ed6335508c41084025f5dfeb5
 AUX apitrace-3.0-glxtrace-only.patch 2085 SHA256 7828fc4db5ba76bac78e58214f732aa93703feb31a229be740135bc0fc8d9db1 SHA512 b9dc94f09e4ad4a4bc76e1c029e8cca14f66da14e37e8e3c1d771296a684af586896d9f29fd38d4efb82c0de3a346faa4e8ea987a485722ed3f0e10e36e322bc WHIRLPOOL 952bb535887b9d3455bb251bb30a86d716532f51c5ffd80a50fb86f595eb7878b23dfd0c3cf36e5b1fd0c5d944e5a15b574c6069bfeca9605bb2b041194b9a76
 AUX apitrace-3.0-system-libs.patch 2116 SHA256 064a4a1f484d77542b93caba7e6a22b0bba7adf61d9ba43d905e67b7ba31e0e8 SHA512 3b52a4bb4bcb0c5fc8edbcf1d01379bd651287c1cafc217d3e2144963aa5a302249815cf5fea71528df40b5cc1e1616e709e8cbd11b5fe503673fe10bfe74771 WHIRLPOOL 15ed3b49add5c825c3d2f07a954a271543260c40de2d7e25b2ae1438fadf5b4fbfd796951b6a96d5dbeeba8edd0c39382b0f149eedf0cd29235efdaca5091f4a
 DIST apitrace-2.0.tar.gz 943001 SHA256 a037d24a4bb01c67a7ac517b22b0d3a1b303ccfff0f1249f143e529aaa98f705 SHA512 5c8c52fef8e37a733914b893cc59887c733e2bdbd56c11dbf70bbfcd9446e3c5c7c554a665039273855dffc59ad771b502421df642ee0eb1779fd54a820f7415 WHIRLPOOL 2f2ed2eb2b610decaeaf906730336742dbd8f2021c510067debd5a84a47ee3c417d293d309827f05838714f00e5f441bad9241b3044b9ec49b5919bc58f6ea3c
 DIST apitrace-3.0.tar.gz 1046543 SHA256 96660d582c272534002a4909fe124a7dd81e31bb2145eef4beb352826922de3a SHA512 ff05914567c261ca45ed93447e0dfae283e4fb61e1154727009cce440408088de644ce7a6511c4a173c6deb91d4185312e14353258d04f3065c37479fa8f0e0f WHIRLPOOL 0e02a5846d70e6474efd0135abd9f1d4fbd581dbc4e6e5d3cd860adeb059e33f1a5e5c91749656d88557f554f83b1db133b1ed6e4ba6afdde5e75fee22b27422
 EBUILD apitrace-2.0-r1.ebuild 2126 SHA256 19d3a72ebe39b6be4cb24782bb38bf2a64ae671eec876974efea8f5a361ee6b6 SHA512 764c20009c36ec94b424ceb67e314455dc875a8cfb5b46094a203651a225c1845516ca97feb943647de23d23f3db88fb33f2cc27a57de8de21261166d2dd1934 WHIRLPOOL 00da66e9d0f2e650b3219a151ae9f30f87683637f39ce14356104e7d0975d291e914f9bdeaff0131bcf1eb63f050f5918fb08705b02096013c5558b47d4dd11e
-EBUILD apitrace-3.0-r1.ebuild 2569 SHA256 b7076a40441c6ec41d4d6cdfe5035dfc0006943f524d983424f78e55bd5f2bf3 SHA512 ad5c80889b1728762af71c0db0a657ab90d53d90f946e1a8f9577f09d1856fe6a9725e3bbb657370960dc2f837a5163baf40ca34a1ce577961d2e33a1982f075 WHIRLPOOL fddb41405c18d8ce7dde092b6c7c28373d18d076b98c69ed98af58ab6e413282fc9b4e97719f16cf34cadfb331352ee1b5eae9e85bac95b38ea08a28ea9b5df5
-MISC ChangeLog 2258 SHA256 28d494291cfd50fabd6dc65adabfefa6857e4c74ee57f75fdb565ae3c677a4bf SHA512 98b4af3db52e7ec88483f99c5e9194f2ce2a7093eb2ea47bc9b9f6c6fc4072c75a0ba4c5790bed11a0e2adf722022a0cece8ad19cf1623a86d1aef3f9c3921d8 WHIRLPOOL f6e49b4d7f5cebc78e78b8c985e1bf28b3e781379c8e1482e1376f5ed2fd4d137fc3df19299801bb6dc521a21819130ab1a2ab93639ceecd287c2d54c8b45fed
+EBUILD apitrace-3.0-r1.ebuild 2606 SHA256 e8f2a19a1bdb6b4a674d837e6d1dd1e3aab2f0fff5d1a57a6332857bb7b2ada1 SHA512 42cef6d88ba8d7d7a118d278007322303c1951947b83a3aca2b48ffa3a6fde1286924e5aea268cc2c751f7244825b87c04fe060992f6d6b2053902861a43b50f WHIRLPOOL 63f48849c320959772db8911c5a2b8966c4403d7c3828f8f5e622fecce6fbddd83b7173e4188f6fa85eb86e078f8d25466bcf134aa7eb6f0636944d2dcadbc57
+MISC ChangeLog 2407 SHA256 7c27f361164fcb4a96c839b1d32b92551fddcc61f77c3c75d6d796a376904c81 SHA512 20b40c1a9f1ce1cb8c4c027b71fd992d10782cda5eb865f68cb8f34171acf125aac38610d3a181c0cf18b0391fa2332d27ea384bf83719bfeeb115d8bbd2da38 WHIRLPOOL a57e41c5e69ff58598a91abb2f23ef2b44381fd1c63e346c387815d789e56b61924806e41cc80a82d0e8b3b82b115f46fdcccfb3c1032c895adaea5d821cc1cd
 MISC metadata.xml 292 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44 SHA512 82c9c7d2f8caab7c4e6d6b49bf9ae8fcaae5d0e48cabc5af10524fa1b2de2aaf95a09d810eca99bc10629070e1d65b8c6127e489e92deca9b6f35ad98572059d WHIRLPOOL 7b16569e2da612f6e711f008d8c7084ae7c2cb6c7378d812f7b6b059d2a20e68b86b8287ee06f100b8b5696837b787dcd574e12fa22249f157ecbd1a5ae90f09
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQINmzAAoJEEqz6FtPBkyjQF8IAIVi5Ps8z69hR94qrTOQZyLA
+mtpR5Bc17UGnn3ZZYUg/lbGuLSBfP8jzsXxT7rCwcB8ZfpDzT411aQzrfxHjGzAT
+v2mIiEi2fB/bU5K81ybuMhE7Vk9BAjO6CceUDDaf/oRG1uRM2El3fVLy1u+RtcDL
+whXyXXul/ZVDOd25yetCKZjiDP/Y18pVKZthocFn+sF00S90+032d1qPiWYeM1RX
+cDDugx8jAle/aWl2XdNL7TlaLZS7w0ylfwWPWDQICIz9sUM1HsP5RhWkbKwFwXPo
+RGcNrLz455gX6i4BhOtW7/W8szolZ6x3tOEpPcRCIS/z6V1pp/bHbQAPhIv0DsY=
+=D9qh
+-----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-3.0-r1.ebuild b/dev-util/apitrace/apitrace-3.0-r1.ebuild
index 1a59227884bc..7ff2e103c14c 100644
--- a/dev-util/apitrace/apitrace-3.0-r1.ebuild
+++ b/dev-util/apitrace/apitrace-3.0-r1.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/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.1 2012/03/18 21:35:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.2 2012/08/07 09:02:33 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -39,6 +39,7 @@ EMULTILIB_PKG="true"
 PATCHES=(
 	"${FILESDIR}"/${P}-system-libs.patch
 	"${FILESDIR}"/${P}-glxtrace-only.patch
+	"${FILESDIR}"/${PN}-3.0-gcc47.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/apitrace/files/apitrace-3.0-gcc47.patch b/dev-util/apitrace/files/apitrace-3.0-gcc47.patch
new file mode 100644
index 000000000000..37e87fc93500
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-3.0-gcc47.patch
@@ -0,0 +1,39 @@
+From bdd9281dd964c36ac94ef3a9fd5d4f7dd24a3d06 Mon Sep 17 00:00:00 2001
+From: Martin Olsson <martin@minimum.se>
+Date: Mon, 26 Mar 2012 10:40:45 +0200
+Subject: [PATCH] Fix compile error "isatty was not declared"; missing
+ unistd.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When I built apitrace on Fedora 16, using the usual:
+
+	cmake -H. -Bbuild
+	make -C build
+
+...then I got this compile error:
+
+	apitrace/cli/cli_dump.cpp: In function ‘int command(int, char**)’:
+	apitrace/cli/cli_dump.cpp:176:25: error: ‘isatty’ was not declared in this scope
+---
+ cli/cli_dump.cpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
+index 28c91af..f52b83c 100644
+--- a/cli/cli_dump.cpp
++++ b/cli/cli_dump.cpp
+@@ -28,6 +28,9 @@
+ #include <string.h>
+ #include <limits.h> // for CHAR_MAX
+ #include <getopt.h>
++#ifndef _WIN32
++#include <unistd.h> // for isatty()
++#endif
+ 
+ #include "cli.hpp"
+ #include "cli_pager.hpp"
+-- 
+1.7.8.6
+