From 2f51c9978dda4c6e8debca43e4235ecc86914032 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Dec 2017 17:37:52 +0000 Subject: gentoo resync : 25.12.2017 --- .../fracplanet/files/fracplanet-0.4.0-gcc6.patch | 44 ---------------------- .../fracplanet/files/fracplanet-0.4.0-gold.patch | 22 ----------- 2 files changed, 66 deletions(-) delete mode 100644 x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch delete mode 100644 x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch (limited to 'x11-misc/fracplanet/files') diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch deleted file mode 100644 index 4d760d672f8d..000000000000 --- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Fix compilation with gcc-6 -Author: Gert Wollny -Last-Updated: 2016-07-09 -Forwarded: No -Bug-Debian: https://bugs.debian.org/811642 - ---- fracplanet-0.4.0.orig/image.cpp -+++ fracplanet-0.4.0/image.cpp -@@ -85,7 +85,7 @@ template <> bool Raster::write_pg - out.write(reinterpret_cast(&(*(row->begin()))),row->size()); - } - out.close(); -- return out; -+ return out.good(); - } - - template <> bool Raster::write_pgmfile(const std::string& filename,Progress* target) const -@@ -101,7 +101,7 @@ template <> bool Raster::write_p - progress.step(); - for (const ushort* it=row->begin();it!=row->end();++it) - { -- const uchar p[2]={((*it)>>8),(*it)}; -+ const uchar p[2]={static_cast((*it)>>8),static_cast((*it) & 0x00FF)}; - if (m>=256) - { - // PGM spec is most significant byte first -@@ -115,7 +115,7 @@ template <> bool Raster::write_p - } - } - out.close(); -- return out; -+ return out.good(); - } - - template <> bool Raster::write_ppmfile(const std::string& filename,Progress* target) const -@@ -132,7 +132,7 @@ template <> bool Raster::write - out.write(reinterpret_cast(&((*it).r)),3); - } - out.close(); -- return out; -+ return out.good(); - } - - diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch deleted file mode 100644 index 4a52d1c44a62..000000000000 --- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/triangle_mesh_viewer.h -+++ b/triangle_mesh_viewer.h -@@ -24,6 +24,7 @@ - #ifndef _triangle_mesh_viewer_h_ - #define _triangle_mesh_viewer_h_ - -+#include - #include "parameters_render.h" - #include "random.h" - #include "triangle_mesh.h" - ---- a/fracplanet.pro -+++ b/fracplanet.pro -@@ -8,7 +8,7 @@ - - HEADERS += $$system(ls *.h) - SOURCES += $$system(ls *.cpp) --LIBS += -lboost_program_options -+LIBS += -lboost_program_options -lGLU - - DEFINES += QT_DLL - -- cgit v1.2.3