gentoo resync 08.09.2018

4 files changed, 69 insertions, 104 deletions

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 46dbb4bd732f..1f14baebbeb0 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -14,13 +14,13 @@ AUX 2016.12/0001-use-external-muParser.patch 1574 BLAKE2B 0114f8b5f45c93117dda73
 AUX 2016.12/0001-use-external-openctm.patch 1841 BLAKE2B 8cd4c14c846df052a44d54386948deb161ee8459750e1fe551e79295c56f93eb7d7e678533e0077a071ea4bc95362dec89d02d20c75b943d188ce457b83ca6e9 SHA512 48532da795602ac867bade00e6a649758f7c6d0c26412c8a4486e23239d3d55220ba22ea5b9ca5e11f97ea224626ebb95bbf89cbb707876575a11be891aabcaa
 AUX 2016.12/meshlab-2016.12-align1.patch 766 BLAKE2B 4a226e853d8c236ff07d408093bd1e197df202a732e8c6cf429f479c2d9101260d33834e877896ea4570d690fc03c0d60d883b88e9591c9c7781fd0117fc3543 SHA512 4f8684a4fe8fdec286672c330e9c489028518bf121ec561221d3108af44ed4afd3cb3d21113b1b5b110afc127c25d9bc5fb6999be4fd815eddfe3aa406b0f7a7
 AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d9094e07818d0ce6265a02426d43648d070e0f7b939e4323a820721450ef7c240dc6f0a8459e3608fb74519eeb7e1efea510e2e76 SHA512 cfa90271bd671244ecc4ad92318f2aad31223990843fb3e185e66b51c8b975c5ed3fec73834e379c1498ce35de1a9e217aa28ff2fdea6233abcbdba09896cc19
+AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
 AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
 AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
-EBUILD meshlab-2016.12-r1.ebuild 3403 BLAKE2B d805907e57a5425ca2e6e249b27ab1581f69e645b9445d590f9f2836e498e10915d25b0ea51430614b7f370d9006d9430a5a17c0d5cb24184b4c60dff5f873eb SHA512 6b875e92f7787fb4f81f0ff7c866835a44d2f0626f6462e761b64701abf6583853fe2cf8974a1e041d5cf563fd1a0060e0d97a61d7cb715eb941104b34db1dff
 EBUILD meshlab-2016.12-r2.ebuild 3499 BLAKE2B 091b524a914ae4e97ddeb36d280e00cfcfe73562528f701dc979bbe8b48d993ee542c3e62f02e21093c678d7c99918f18705f011db51fc376c64a384d4534123 SHA512 ca7e94c0b96acaedcbce13456e4cba2e58d8f98bbd1b0fe860703776c9c31d30658b05ad81c172a79fb1dadd06f5eb51156ff4bc44f4ac97e8f4159e162e11f0
-EBUILD meshlab-2016.12.ebuild 3339 BLAKE2B a583514e9bb2bab3e887be08a62ce64aeef3730716ea73874f100e6afa1cf05aa5bbfb1b0922562a1a567fb31b9b390e1ec2a4456105c48c14ce519161ea7f36 SHA512 358b291e3b255b5a1542b7f0d6668c2696b39cc2c4d30e1fd34b7860c01840f8a49607d1a80b4a33305b7f5cb2d50526b0ead56e597e3792a8575411fd24a3c6
+EBUILD meshlab-2016.12-r3.ebuild 3541 BLAKE2B fa43f8db5d083a4ff06cf5ed7063916c0c751db887b6c1dc99fd22c788c05460a4caa6f3ee9c846e6812a5ccc2b537f05a4b9655e7282ca9fdf18db3d1039d44 SHA512 c821471fc31987425988cc65112b8945f2b22f159ba43ad4a1028b52bfeba346e268f4209b6a032c01192180db10e3154497f5658442be1e01c29f768cb63e99
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
new file mode 100644
index 000000000000..7e58790590a8
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
@@ -0,0 +1,62 @@
+From e1410053455a497d32b1e896eb7e99a7224b6832 Mon Sep 17 00:00:00 2001
+From: Miro Hrončok <miro@hroncok.cz>
+Date: Aug 29 2018 20:40:58 +0000
+Subject: Fix FTBFS (#1604819)
+
+
+---
+
+diff --git a/meshlab-2016.12-qprintable.patch b/meshlab-2016.12-qprintable.patch
+new file mode 100644
+index 0000000..9a916f6
+--- /dev/null
++++ b/meshlab-2016.12-qprintable.patch
+@@ -0,0 +1,20 @@
++--- a/src/meshlabserver/mainserver.cpp	2016-12-23 11:24:59.000000000 +0100
+++++ b/src/meshlabserver/mainserver.cpp.a	2018-08-29 20:32:03.009295180 +0200
++@@ -897,7 +897,7 @@
++     }
++ 
++ 	if (meshDocument.size() < outmeshlist.size())
++-		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
+++		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
++ 	else
++ 	{
++ 		for (int ii = 0; ii < outmeshlist.size(); ++ii)
++@@ -911,7 +911,7 @@
++ 					fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
++ 			}
++ 			else
++-				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
+++				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
++ 		}
++ 
++ 	}
+diff --git a/meshlab-2016.12-qt-includes.patch b/meshlab-2016.12-qt-includes.patch
+new file mode 100644
+index 0000000..66e4f67
+--- /dev/null
++++ b/meshlab-2016.12-qt-includes.patch
+@@ -0,0 +1,21 @@
++--- a/src/meshlabplugins/render_gdp/shaderDialog.h	2016-12-23 11:24:59.000000000 +0100
+++++ b/src/meshlabplugins/render_gdp/shaderDialog.h.a	2018-08-29 20:55:01.414996789 +0200
++@@ -32,6 +32,8 @@
++ #include "shaderStructs.h"
++ #include "ui_shaderDialog.h"
++ #include <QMap>
+++#include <QLineEdit>
+++#include <QSlider>
++ 
++ class QGLWidget;
++ 
++--- ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp	2016-12-23 11:24:59.000000000 +0100
+++++ ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp.a	2018-08-29 21:19:42.411581082 +0200
++@@ -23,6 +23,7 @@
++ 
++ #include "paintbox.h"
++ #include <QFileDialog>
+++#include <QAction>
++ 
++ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
++ {
+
diff --git a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
index 92057cb311ab..4fc8458b15a7 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 		"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
 		"${FILESDIR}/${PV}/${P}-align1.patch"
 		"${FILESDIR}/${PV}/${P}-align2.patch"
+		"${FILESDIR}/${PV}/${P}-asString.patch"
 	)
 
 src_prepare(){
@@ -77,6 +78,10 @@ src_prepare(){
 	#rm -r "external"
 	rm -r "distrib/plugins/U3D_W32" || die
 	rm -r "distrib/plugins/U3D_OSX" || die
+
+	# Fix bug 638796
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}/${PV}/${P}-remove-header.patch"
 }
 
 src_configure() {
diff --git a/media-gfx/meshlab/meshlab-2016.12.ebuild b/media-gfx/meshlab/meshlab-2016.12.ebuild
deleted file mode 100644
index 6d45ceecb02e..000000000000
--- a/media-gfx/meshlab/meshlab-2016.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
-HOMEPAGE="http://www.meshlab.net"
-VCG_VERSION="1.0.1"
-SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	 https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-minimal"
-DEPEND="dev-cpp/eigen:3
-	dev-cpp/muParser
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtxmlpatterns:5
-	>=media-gfx/jhead-3.00-r2
-	media-libs/glew:0
-	media-libs/qhull
-	=media-libs/lib3ds-1*
-	media-libs/openctm
-	sci-libs/levmar
-	sci-libs/mpir"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/meshlab-${PV}/src"
-
-PATCHES=(
-		"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-		"${FILESDIR}/${PV}/0001-update-1.3.3-pluginmanager.patch.patch"
-		#remove ot working plugins
-		"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-		"${FILESDIR}/${PV}/remove-io_TXT.patch"
-		#since structure synth doesn't seem to be compiling
-		"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-		#this has been fixed in the tree
-		"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-		#this causes segfaults
-		"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-		#for when we use minimal
-		"${FILESDIR}/${PV}/0001-compile-server.patch"
-		"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-		"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-		"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-		"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-		"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-		"${FILESDIR}/${PV}/0001-use-external-glew.patch"
-		#cause gnu stack quickstart related qa
-		"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-	)
-
-src_prepare(){
-	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
-	default
-	#proof of patchset
-	#remove libs that are being used from the system
-	rm -r "external/lib3ds-1.3.0" || die "rm failed"
-	rm -r "external/OpenCTM-1.0.3" || die "rm failed"
-	rm -r "external/muparser_v132" || die "rm failed"
-	rm -r "external/muparser_v225" || die "rm failed"
-	rm -r "external/bzip2-1.0.5" || die "rm failed"
-	rm -r "external/jhead-2.95" || die "rm failed"
-	rm -r "external/glew-1.5.1" || die "rm failed"
-	rm -r "external/glew-1.7.0" || die "rm failed"
-	#we still depend on lm.h
-	#rm -r "external"
-	rm -r "distrib/plugins/U3D_W32" || die
-	rm -r "distrib/plugins/U3D_OSX" || die
-}
-
-src_configure() {
-	use minimal || eqmake5 -r meshlab_full.pro
-	use minimal && eqmake5 -r meshlab_mini.pro
-}
-
-src_install() {
-	dobin distrib/{meshlab,meshlabserver}
-	dolib distrib/libcommon.so.1.0.0
-	dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
-	dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
-	exeinto /usr/$(get_libdir)/meshlab/plugins
-	doexe distrib/plugins/*.so
-	insinto /usr/share/meshlab/shaders
-	doins -r distrib/shaders/*
-	insinto /usr/share/meshlab/plugins
-	doins -r distrib/plugins/*
-	insinto /usr/share/meshlab/textures
-	doins -r distrib/textures/*
-	insinto /usr/share/meshlab/sample
-	doins -r distrib/sample/*
-	newicon "${S}"/meshlab/images/eye512.png "${PN}".png
-	make_desktop_entry meshlab "Meshlab" "${PN}" Graphics
-}