commit: 7dc13b382ca650a5769697f8532ce15315e3dc9d Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Oct 31 19:15:44 2017 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Oct 31 19:15:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc13b38
media-gfx/povray: Fix also openexr code for gcc-6, bug 635098 Closes: https://bugs.gentoo.org/635098 Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../povray/files/povray-3.7.0.0-gcc6-openexr.patch | 39 ++++++++++++++++++++++ media-gfx/povray/povray-3.7.0.0-r1.ebuild | 1 + 2 files changed, 40 insertions(+) diff --git a/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch b/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch new file mode 100644 index 00000000000..8b06d609402 --- /dev/null +++ b/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch @@ -0,0 +1,39 @@ +diff -ruN povray-3.7.0.0.orig/source/base/image/openexr.cpp povray-3.7.0.0/source/base/image/openexr.cpp +--- povray-3.7.0.0.orig/source/base/image/openexr.cpp 2013-11-06 21:28:15.000000000 +0100 ++++ povray-3.7.0.0/source/base/image/openexr.cpp 2017-10-31 20:11:28.244218318 +0100 +@@ -101,7 +101,7 @@ + + void write(const char *c, int n) + { +- if(os.write(c, n) == false) ++ if(! os.write(c, n)) + throw POV_EXCEPTION(kFileDataErr, "Error while writing EXR output"); + } + +@@ -115,7 +115,7 @@ + + void seekp(Int64 pos) + { +- if(os.seekg((unsigned long)pos) == false) ++ if(! os.seekg((unsigned long)pos)) + throw POV_EXCEPTION(kFileDataErr, "Error when writing EXR output"); + } + private: +@@ -142,7 +142,7 @@ + + bool read(char *c, int n) + { +- if(is.read(c, n) == false) ++ if(! is.read(c, n)) + throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file"); + return (is.tellg() < fsize); + } +@@ -157,7 +157,7 @@ + + void seekg(Int64 pos) + { +- if(is.seekg((unsigned long)pos) == false) ++ if(! is.seekg((unsigned long)pos)) + throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file"); + } + private: diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild index 35f061a1475..ac091168ba6 100644 --- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild +++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}"/${P}-user-conf.patch "${FILESDIR}"/${P}-automagic.patch "${WORKDIR}"/${P}_p20160914-fix-c++14.patch + "${FILESDIR}"/${P}-gcc6-openexr.patch ) src_prepare() {
