diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-25 17:37:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-25 17:37:52 +0000 |
commit | 2f51c9978dda4c6e8debca43e4235ecc86914032 (patch) | |
tree | bc41e1c4383040034174c327504f702c8517a123 /x11-misc/fracplanet | |
parent | 51536d2fe4697ba9114d611178bb9e20d3d5b729 (diff) |
gentoo resync : 25.12.2017
Diffstat (limited to 'x11-misc/fracplanet')
-rw-r--r-- | x11-misc/fracplanet/Manifest | 4 | ||||
-rw-r--r-- | x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch | 44 | ||||
-rw-r--r-- | x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch | 22 | ||||
-rw-r--r-- | x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild | 50 |
4 files changed, 0 insertions, 120 deletions
diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest index 93edf1e86566..a4ace99bac69 100644 --- a/x11-misc/fracplanet/Manifest +++ b/x11-misc/fracplanet/Manifest @@ -1,7 +1,3 @@ -AUX fracplanet-0.4.0-gcc6.patch 1312 BLAKE2B ffb2a938992597cb7299eaa8795cb65b20df48d032a47b99c5c55e212aad661e16e575b5a5519c69e452565d90b3415736739c0798d1abda0cf3b89e3cb919ec SHA512 ebd684225f620cc5a02e7f407282a2f8e019cca3a473caf727babfc13478feafbd04af936064f8226ae6acf3c6e35ea72b222b825fbafb95420613a69131e733 -AUX fracplanet-0.4.0-gold.patch 464 BLAKE2B ae5383c199bd80e81e4cb96186c207835fbafefba36da8f36667e563051e77f2900f340ca7046547f7752039d1ab27215a425a3d21ecf61fd5988ae96e94f4ed SHA512 76983ed711ac72e8e9b5fd6aa913549cca6086375968e55ba9711532e018cf98f6e2791c6943062354486c09806ed57f0d8ee835d0ba01890c5fb5c8c325de20 -DIST fracplanet-0.4.0.tar.gz 101700 BLAKE2B d222e342d3238f84b03f9637a3d11af1f27a7935fbb769ff093dd54ff10cafb80f1180eebcca93e5920b8f3f86da56f74d0ca42e692a998f969a2a03c22c97db SHA512 09eed764df60929e5aa22b3f5c34defa11a91c4f6b588259fe0c3c7736fa03a9d138e05fd6ec4800e7943f36e73949804d8a7ed3e29bda6ffdc883ecadf9abf6 DIST fracplanet-0.5.1.tar.gz 111911 BLAKE2B 81f5986bdf7a0ddc1a7ef8fd08bf07fbc23ae38ac1cdc452de6696354d291205cb1183d16c3a7fa8bfb250158229d84d94f3c24dafa09d20518fb5d19b31471f SHA512 40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e -EBUILD fracplanet-0.4.0-r1.ebuild 924 BLAKE2B 42c13da6bc09b972966b2655d3588e2afc1e237c89ad9651ad4905da659c9772f9c614421609782e5268ea3985114fb6f3e13fa294b1eb99728446281d3c2074 SHA512 52374c41729008cc0fa3db5ebd05e1d0981dee8ef3dd45a843d556691f6eddd37d6d02fd13cf54d11ac92c8d5ed6e9643d328fc331da24274cb843bdf6f24142 EBUILD fracplanet-0.5.1.ebuild 900 BLAKE2B c573a2a41fcf96579c1db37161cf713f0d594ce81724b0e125d20a2040e9c1d6592ad0a14bc5c8e0935b1dbd559466a9d2675db58c8ee3798f12bcd162fca02f SHA512 3b280431b2d0edb3f4613bced41fd9d682c94c61a9d4c541a670e61185d0d26ae3fcae5da9064fa0538da1a48ef17b562453762a0edc72acd7be535c04f36d5f MISC metadata.xml 356 BLAKE2B b7514f3974a8e8f91ce709d90bd372dd73f61645ba8e55595570e8cd03aa2038e9b319a2d07b11b319bcd8bad91bb7fbcf87a35852451d6cfcdc30f33d9c9c1e SHA512 71282985fe89e25eaf0c84d2e3b0469317e2e2b1c3de5db8efc9557f8da2970e021e9aa18b625ef8a718feede1232a7c9687bc89615c12b4efd76325d4ad1561 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 <gw.fossdev@gmail.com> -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<uchar>::write_pg - out.write(reinterpret_cast<const char*>(&(*(row->begin()))),row->size()); - } - out.close(); -- return out; -+ return out.good(); - } - - template <> bool Raster<ushort>::write_pgmfile(const std::string& filename,Progress* target) const -@@ -101,7 +101,7 @@ template <> bool Raster<ushort>::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<uchar>((*it)>>8),static_cast<uchar>((*it) & 0x00FF)}; - if (m>=256) - { - // PGM spec is most significant byte first -@@ -115,7 +115,7 @@ template <> bool Raster<ushort>::write_p - } - } - out.close(); -- return out; -+ return out.good(); - } - - template <> bool Raster<ByteRGBA>::write_ppmfile(const std::string& filename,Progress* target) const -@@ -132,7 +132,7 @@ template <> bool Raster<ByteRGBA>::write - out.write(reinterpret_cast<const char*>(&((*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 <GL/glu.h> - #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 - diff --git a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild deleted file mode 100644 index 798e453cef7c..000000000000 --- a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit qmake-utils - -DESCRIPTION="Fractal planet and terrain generator" -HOMEPAGE="https://sourceforge.net/projects/fracplanet/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - virtual/glu - virtual/opengl -" -DEPEND="${RDEPEND} - dev-libs/libxslt" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}/${P}-gold.patch" - "${FILESDIR}/${P}-gcc6.patch" -) - -HTML_DOCS=( fracplanet.{htm,css} ) - -src_configure() { - eqmake4 fracplanet.pro -} - -src_compile() { - xsltproc -stringparam version ${PV} -html htm_to_qml.xsl fracplanet.htm \ - | sed 's/"/\\"/g' | sed 's/^/"/g' | sed 's/$/\\n"/g'> usage_text.h || die - default -} - -src_install() { - dobin ${PN} - doman man/man1/${PN}.1 - einstalldocs -} |