Include string.h for memcpy() function in common/image_png.cpp wrt #465504 by Michael Palimaka

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 33 insertions, 21 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index c4cd94eaf6a4..d9695bca173d 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.15 2013/03/02 20:19:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.16 2013/04/11 11:44:52 ssuominen Exp $
+
+  11 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> apitrace-3.0-r1.ebuild,
+  +files/apitrace-3.0-memcpy.patch:
+  Include string.h for memcpy() function in common/image_png.cpp wrt #465504 by
+  Michael Palimaka
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> apitrace-3.0-r1.ebuild:
   Move Qt dependencies to the new category
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 86b6c2ebf314..615fd00010c8 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -3,27 +3,20 @@ Hash: SHA256
 
 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-memcpy.patch 254 SHA256 131aa11bc091b3da9e854120967f24a535f6347b8581a7345f9b8fb680eb2ca8 SHA512 2735c639f0ecf00072110262bc6ec75c80e53451bf4e191fbad4a5752655dacdf37b45c7e333fcfcfe573728542e711e795eee80409a578b02f15e3496161cc2 WHIRLPOOL 1d28e160efad63844579bce22a15784c3017c3dd27d3d298a3569fba9b57492b5e7cec0ce081867464fabc77ea51ff385262b0f9c43449dff3520954e1e85298
 AUX apitrace-3.0-system-libs.patch 2116 SHA256 064a4a1f484d77542b93caba7e6a22b0bba7adf61d9ba43d905e67b7ba31e0e8 SHA512 3b52a4bb4bcb0c5fc8edbcf1d01379bd651287c1cafc217d3e2144963aa5a302249815cf5fea71528df40b5cc1e1616e709e8cbd11b5fe503673fe10bfe74771 WHIRLPOOL 15ed3b49add5c825c3d2f07a954a271543260c40de2d7e25b2ae1438fadf5b4fbfd796951b6a96d5dbeeba8edd0c39382b0f149eedf0cd29235efdaca5091f4a
 DIST apitrace-3.0.tar.gz 1046543 SHA256 96660d582c272534002a4909fe124a7dd81e31bb2145eef4beb352826922de3a SHA512 ff05914567c261ca45ed93447e0dfae283e4fb61e1154727009cce440408088de644ce7a6511c4a173c6deb91d4185312e14353258d04f3065c37479fa8f0e0f WHIRLPOOL 0e02a5846d70e6474efd0135abd9f1d4fbd581dbc4e6e5d3cd860adeb059e33f1a5e5c91749656d88557f554f83b1db133b1ed6e4ba6afdde5e75fee22b27422
-EBUILD apitrace-3.0-r1.ebuild 2557 SHA256 58340e9303db6f57187493ff25a0af20b2ccdf84768c1a950e164b3f07366e64 SHA512 88a727b6d6d994ff4f5bae3fa9b26ffe3fa092be1ac029bfae84e7d92262e435f29c9d1fa29edc2ce966e99ce319e473c36be4501a1d7324f282f7204ff8c1c6 WHIRLPOOL 57a53d70d5623966e6a0bcbb50800101ea156b153f73568e04dc8955279e10726211fbfca62d43afb908ff2143542e18003289b2cffab2238dd7308152f536d4
-MISC ChangeLog 2838 SHA256 0bff122bb01ade2e837c6e94db1a033885aea3eabf9c460e4bac42c2e572ed2c SHA512 13c2a932c65fef6023477cd62d2833f4293569a10f4f84e912667fa891030002c3a6192509aa05e7be332a4121b6c45520ddca636d0cd2f8bc11c8bf1b6d19be WHIRLPOOL 9e26b8e8f3199cda75aa90293a73d02703ab482f533a76c44882e7465fdb83d963d4758e6dafe3aaec7d507ce05e365ee8a2b3f850ec71186641ec806fa4dfde
+EBUILD apitrace-3.0-r1.ebuild 2594 SHA256 a43198490850ae9b9b01c2d31d2ef16d26544b84f032ba84aadff8d058ce43db SHA512 1dfb400b9a8b8b2880911009b457f2c1ad138d3fa89f216d1edaa80b9767fceaf7efec84bb07454329ed96d74c2a7847299c8a212595b97bc7b138badad804fa WHIRLPOOL 277e037a183e5e837513f563307b795c18dc1f4b87667b7689590d8da5af932f411e6654f7b871b74474ed446e90f3f6e4c63ecb66e7cd41c2384311eb7577d8
+MISC ChangeLog 3053 SHA256 89b71a5bd8c3e56b316997b5a1d6128afbd6ba89b9d64a4fc6de04575e2d047e SHA512 a5a80a927ea657d9733fc7261c941024379d9c896d53c5a92523e26f4c4283b3abbb4ea5a4dd6908ea30f3f80c81c1acf2bdc402fe89f5fa5aad865b6446227b WHIRLPOOL f7821bb48e4ab90768bb86c2c0e2838eea5e05d6edb8e2a4c59a90f8fccc5a35f319ac1a43f0d8830e3ec097829c6ae267440d4500e11328175b8b587423469c
 MISC metadata.xml 292 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44 SHA512 82c9c7d2f8caab7c4e6d6b49bf9ae8fcaae5d0e48cabc5af10524fa1b2de2aaf95a09d810eca99bc10629070e1d65b8c6127e489e92deca9b6f35ad98572059d WHIRLPOOL 7b16569e2da612f6e711f008d8c7084ae7c2cb6c7378d812f7b6b059d2a20e68b86b8287ee06f100b8b5696837b787dcd574e12fa22249f157ecbd1a5ae90f09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMl7PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun883MUQAKTFBbRcAL1sLA0f8xqMIRVR
-FPehIMUS75lk6yFTg0zmKPe+UDZV6CyWTs56QnlvD1f9ZcOy38xnGGX4wFk0VBpI
-XJqnGu8G6Bmpush29O1rSu2kg1s098qVB0NRG1dE+0PfmnAbC0O/2S+ZQtiqSZ0z
-9cp1zDvd0JQPZ1NW6syqbUaY/fG6qPTOqr7bS1pFDVBrTLmiLoSAIAFVg2+JyBoV
-e5mXH9YEs3OfI2cLOTmU6zdVPL7XDjczJI0KpWZVn5V9SPAsEKSbBdtn0Jl0cvim
-zkfctFwVh8hcXg9NfFzT/MF/wdF4Wzy8SE+NBnXhOoowQCqYo0QfTM/hkBEKsSHf
-yYMaOe5ACAys8kohHqJzbWZkWKFQBUFkTX/LEnBSaGe9tqbjCKUiLlL19y0iLIE2
-M3vm2o2EMnfCjhODmviCInuCxMu4y11WsLF6XVTkC+UVReOdyD0zNY+1ad4TZCG4
-L33fKcvLiKuneV1M654WEgkKhSBARVHJRXHXX2hBj/oaGez5iLfW48j+Og8S8UgQ
-PDn0q2pVknijzpDTCR7NvYrNShlEmYezQaMhSOYoTrxJhha5yP5Cv0y4RSGdFrlb
-fwRB3mZmlQKKLmdWjyPfRVzth6+hhFnBzyzfI0Uay9f4nrLVQQgkQlpMZOmSlshn
-IpdDpH+1ZxpWmCE5zpM6
-=DOvg
+iQEcBAEBCAAGBQJRZqIqAAoJEEdUh39IaPFNq4AIAKBkDtzsfmABgGmcQ4j07p6p
+smMmTRXLM+liBYLiNdhD4nE2jRF1nVknIQNejssNHF008QrXTot/O+hJ6gYvAU/A
+ONouz2kE96UYKc2QPO9hm4l5dlOgoCjY57+azXZCuveL5El5v4ZtakXKx93OwV/n
+xINtoYA5vTJSFUuOJSl70D4tXZwsfkkBK3RZ6nPnbBa8wYlY9yPkMQg4oc4Igsyj
+QuFUZok9FJudQiM+7BHWXXB5F1w9+IQIA3fzGtf7fnt6ibnAtEoWGdl8u36iPIh/
+lZIlfYH90fmid6YyGDFNg+6YS0EShSysd8IVLRXk199l7RFwSC30LbuRZs1iiSw=
+=jyRf
 -----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-3.0-r1.ebuild b/dev-util/apitrace/apitrace-3.0-r1.ebuild
index d886e709e6ad..34c5e00af58f 100644
--- a/dev-util/apitrace/apitrace-3.0-r1.ebuild
+++ b/dev-util/apitrace/apitrace-3.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 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.4 2013/03/02 20:19:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.5 2013/04/11 11:44:52 ssuominen Exp $
 
-EAPI="4"
+EAPI="5"
 PYTHON_DEPEND="2:2.6"
 
 inherit cmake-utils eutils python multilib vcs-snapshot
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="egl multilib qt4"
 
 RDEPEND="app-arch/snappy
-	media-libs/libpng
+	media-libs/libpng:0=
 	sys-libs/zlib
 	media-libs/mesa[egl?]
 	egl? ( || (
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-system-libs.patch
 	"${FILESDIR}"/${P}-glxtrace-only.patch
 	"${FILESDIR}"/${PN}-3.0-gcc47.patch
+	"${FILESDIR}"/${P}-memcpy.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/apitrace/files/apitrace-3.0-memcpy.patch b/dev-util/apitrace/files/apitrace-3.0-memcpy.patch
new file mode 100644
index 000000000000..7ae8b3d89add
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-3.0-memcpy.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/465504
+http://github.com/apitrace/apitrace/issues/118
+
+--- common/image_png.cpp
++++ common/image_png.cpp
+@@ -31,6 +31,7 @@
+ #include <assert.h>
+ #include <stdint.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <fstream>
+