diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-11 11:44:52 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-11 11:44:52 +0000 |
| commit | 8ac4a29d4d0b87cd4a8e6772d81bda0dbad60af6 (patch) | |
| tree | 0012e07431e8a602beda65eb0320abada325549c /dev-util/apitrace | |
| parent | version bump (diff) | |
| download | gentoo-2-8ac4a29d4d0b87cd4a8e6772d81bda0dbad60af6.tar.gz gentoo-2-8ac4a29d4d0b87cd4a8e6772d81bda0dbad60af6.tar.bz2 gentoo-2-8ac4a29d4d0b87cd4a8e6772d81bda0dbad60af6.zip | |
Include string.h for memcpy() function in common/image_png.cpp wrt #465504 by Michael Palimaka
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-util/apitrace')
| -rw-r--r-- | dev-util/apitrace/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/apitrace/apitrace-3.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-3.0-memcpy.patch | 13 |
3 files changed, 23 insertions, 4 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/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> + |