diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-03-18 21:32:08 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-03-18 21:32:08 +0000 |
| commit | c2d3bc1ef1c94a36d0e3b8fe2c50b584aa68ca11 (patch) | |
| tree | f0b35a77737120cb7f97db0ff0f17ea3062b4def /dev-util/apitrace | |
| parent | add word removal to last message (diff) | |
| download | gentoo-2-c2d3bc1ef1c94a36d0e3b8fe2c50b584aa68ca11.tar.gz gentoo-2-c2d3bc1ef1c94a36d0e3b8fe2c50b584aa68ca11.tar.bz2 gentoo-2-c2d3bc1ef1c94a36d0e3b8fe2c50b584aa68ca11.zip | |
Fix build with zlib-1.2.6.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/apitrace')
| -rw-r--r-- | dev-util/apitrace/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/apitrace/apitrace-2.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch | 44 |
3 files changed, 52 insertions, 3 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index 0a871dad8d70..94a40ae48754 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.8 2012/03/16 22:34:36 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.9 2012/03/18 21:32:06 radhermit Exp $ + + 18 Mar 2012; Tim Harder <radhermit@gentoo.org> apitrace-2.0-r1.ebuild, + +files/apitrace-2.0-zlib-1.2.6.patch: + Fix build with zlib-1.2.6. 16 Mar 2012; Tim Harder <radhermit@gentoo.org> -apitrace-1.0-r1.ebuild, -files/apitrace-1.0-automagic-qt.patch, diff --git a/dev-util/apitrace/apitrace-2.0-r1.ebuild b/dev-util/apitrace/apitrace-2.0-r1.ebuild index 48973cf8957a..ac75993046b3 100644 --- a/dev-util/apitrace/apitrace-2.0-r1.ebuild +++ b/dev-util/apitrace/apitrace-2.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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-2.0-r1.ebuild,v 1.1 2011/12/15 07:28:36 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-2.0-r1.ebuild,v 1.2 2012/03/18 21:32:06 radhermit Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -35,6 +35,7 @@ EMULTILIB_PKG="true" PATCHES=( "${FILESDIR}"/${P}-system-libs.patch "${FILESDIR}"/${P}-glxtrace-only.patch + "${FILESDIR}"/${P}-zlib-1.2.6.patch ) pkg_setup() { diff --git a/dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch b/dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch new file mode 100644 index 000000000000..5f761d4fb01d --- /dev/null +++ b/dev-util/apitrace/files/apitrace-2.0-zlib-1.2.6.patch @@ -0,0 +1,44 @@ +--- apitrace-apitrace-e2c4320/common/trace_file.cpp ++++ apitrace-apitrace-e2c4320/common/trace_file.cpp +@@ -132,35 +132,35 @@ + + bool ZLibFile::rawWrite(const void *buffer, size_t length) + { +- return gzwrite(m_gzFile, buffer, length) != -1; ++ return gzwrite((gzFile)m_gzFile, buffer, length) != -1; + } + + bool ZLibFile::rawRead(void *buffer, size_t length) + { +- return gzread(m_gzFile, buffer, length) != -1; ++ return gzread((gzFile)m_gzFile, buffer, length) != -1; + } + + int ZLibFile::rawGetc() + { +- return gzgetc(m_gzFile); ++ return gzgetc((gzFile)m_gzFile); + } + + void ZLibFile::rawClose() + { + if (m_gzFile) { +- gzclose(m_gzFile); ++ gzclose((gzFile)m_gzFile); + m_gzFile = NULL; + } + } + + void ZLibFile::rawFlush() + { +- gzflush(m_gzFile, Z_SYNC_FLUSH); ++ gzflush((gzFile)m_gzFile, Z_SYNC_FLUSH); + } + + File::Offset ZLibFile::currentOffset() + { +- return File::Offset(gztell(m_gzFile)); ++ return File::Offset(gztell((gzFile)m_gzFile)); + } + + bool ZLibFile::supportsOffsets() const |