| 1 |
commit: 7dc13b382ca650a5769697f8532ce15315e3dc9d |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 31 19:15:44 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 31 19:15:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dc13b38 |
| 7 |
|
| 8 |
media-gfx/povray: Fix also openexr code for gcc-6, bug 635098 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/635098 |
| 11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 12 |
|
| 13 |
.../povray/files/povray-3.7.0.0-gcc6-openexr.patch | 39 ++++++++++++++++++++++ |
| 14 |
media-gfx/povray/povray-3.7.0.0-r1.ebuild | 1 + |
| 15 |
2 files changed, 40 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..8b06d609402 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/povray/files/povray-3.7.0.0-gcc6-openexr.patch |
| 22 |
@@ -0,0 +1,39 @@ |
| 23 |
+diff -ruN povray-3.7.0.0.orig/source/base/image/openexr.cpp povray-3.7.0.0/source/base/image/openexr.cpp |
| 24 |
+--- povray-3.7.0.0.orig/source/base/image/openexr.cpp 2013-11-06 21:28:15.000000000 +0100 |
| 25 |
++++ povray-3.7.0.0/source/base/image/openexr.cpp 2017-10-31 20:11:28.244218318 +0100 |
| 26 |
+@@ -101,7 +101,7 @@ |
| 27 |
+ |
| 28 |
+ void write(const char *c, int n) |
| 29 |
+ { |
| 30 |
+- if(os.write(c, n) == false) |
| 31 |
++ if(! os.write(c, n)) |
| 32 |
+ throw POV_EXCEPTION(kFileDataErr, "Error while writing EXR output"); |
| 33 |
+ } |
| 34 |
+ |
| 35 |
+@@ -115,7 +115,7 @@ |
| 36 |
+ |
| 37 |
+ void seekp(Int64 pos) |
| 38 |
+ { |
| 39 |
+- if(os.seekg((unsigned long)pos) == false) |
| 40 |
++ if(! os.seekg((unsigned long)pos)) |
| 41 |
+ throw POV_EXCEPTION(kFileDataErr, "Error when writing EXR output"); |
| 42 |
+ } |
| 43 |
+ private: |
| 44 |
+@@ -142,7 +142,7 @@ |
| 45 |
+ |
| 46 |
+ bool read(char *c, int n) |
| 47 |
+ { |
| 48 |
+- if(is.read(c, n) == false) |
| 49 |
++ if(! is.read(c, n)) |
| 50 |
+ throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file"); |
| 51 |
+ return (is.tellg() < fsize); |
| 52 |
+ } |
| 53 |
+@@ -157,7 +157,7 @@ |
| 54 |
+ |
| 55 |
+ void seekg(Int64 pos) |
| 56 |
+ { |
| 57 |
+- if(is.seekg((unsigned long)pos) == false) |
| 58 |
++ if(! is.seekg((unsigned long)pos)) |
| 59 |
+ throw POV_EXCEPTION(kFileDataErr, "Error while reading EXR file"); |
| 60 |
+ } |
| 61 |
+ private: |
| 62 |
|
| 63 |
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild |
| 64 |
index 35f061a1475..ac091168ba6 100644 |
| 65 |
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild |
| 66 |
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild |
| 67 |
@@ -44,6 +44,7 @@ PATCHES=( |
| 68 |
"${FILESDIR}"/${P}-user-conf.patch |
| 69 |
"${FILESDIR}"/${P}-automagic.patch |
| 70 |
"${WORKDIR}"/${P}_p20160914-fix-c++14.patch |
| 71 |
+ "${FILESDIR}"/${P}-gcc6-openexr.patch |
| 72 |
) |
| 73 |
|
| 74 |
src_prepare() { |
Archives