[gentoo-commits] repo/gentoo:master commit in: sci-misc/repsnapper/files/, profiles/, sci-misc/repsnapper/
commit: a21ffc68b96c51c49c0d6f4299f2d5efd69bfacf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Feb 11 14:14:25 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 11 14:18:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21ffc68
sci-misc/repsnapper: Remove last-rited package
Closes: https://bugs.gentoo.org/649066
Signed-off-by: Andreas Sturmlechner gentoo.org>
profiles/package.mask | 1 -
sci-misc/repsnapper/Manifest | 3 --
.../repsnapper/files/repsnapper-2.4a_p0-gcc6.patch | 54 --
sci-misc/repsnapper/files/std-c11.patch| 31 -
sci-misc/repsnapper/metadata.xml | 8
sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild| 33 -
sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild | 36 ---
sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild | 34 --
sci-misc/repsnapper/repsnapper-.ebuild | 29
9 files changed, 229 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index cdf1ec207ef..90c729aa57f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -596,7 +596,6 @@ media-libs/qimageblitz
# Ancient, blocks x11-libs/gtkglext cleanup, open bug #649066
# Masked for removal in 30 days.
dev-cpp/gtkglextmm
-sci-misc/repsnapper
# Michał Górny (2020-01-12)
# Python 2 only, depends on OpenStack which is Py3 now. No release
diff --git a/sci-misc/repsnapper/Manifest b/sci-misc/repsnapper/Manifest
deleted file mode 100644
index 748c922283e..000
--- a/sci-misc/repsnapper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST repsnapper-2.3.2a3.tar.gz 137 BLAKE2B
31fdfe0cb6c7b6c9358ecef1a8fc82cbfa82c337b6120e605bd103e5f5236780add8aa40308695adfd65c619b7174a4e7bcf35442950c2eb2bda9a993c58
SHA512
f68510baefb898954f58aa5e35909b8215edcd8ee74028e717ad97293091f4b323628ca0ba80ff685d1aef0db4785a2887986b89a95769a70f8f23ab031dafa4
-DIST repsnapper-2.4a0.tar.gz 888457 BLAKE2B
5c554c6dae2a3d6fede6c0fa86bd9b4ddac00530c466f1b8b0f20b3ac5e129677a18d9020cf0c1e80eb930040319a3e28609b43d282971fdbb937cc601fe2374
SHA512
b79c51f53ae29d09f5a328366c10b9e775d396f6da0ef24aa71b522fbd718af2f658700838f64ba01ce9c5cab90e39960b0ca5ed2554f802ff37ef258ae89031
-DIST repsnapper-2.4a3.tar.gz 888546 BLAKE2B
c9934c337ea2f46a74342f1ce935b00d34a6242304bb6779dc1ae4bdb959c39c3e0162f1fce8aad73681fd937eb43145fbfc4c5de404e290ee77e1f6874734af
SHA512
ebe586a9212edbf699444a9c89b25702facd1018751658b831e9e662cd1bc2c54e6827802c0d89055c2882cef7db343bf036c08a9a1fc28bc66acee895bca6aa
diff --git a/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch
b/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch
deleted file mode 100644
index 80a3c56eb86..000
--- a/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f6a411fa829f144800d123c1256d7d7648736437 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiago=20St=C3=BCrmer=20Daitx?=
-Date: Thu, 1 Sep 2016 00:02:48 -0300
-Subject: [PATCH 1/2] replace abs() with std::abs() for gcc6 compatibility
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building with GCC 6 fails with "call of overloaded ‘abs(double)’ is
-ambiguous" - for some reason only on PowerPC and PPC64.
- libraries/amf/amftools-code/include/STL_File.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/amf/amftools-code/include/STL_File.h
b/libraries/amf/amftools-code/include/STL_File.h
-index 0bc01bed..2d9d656f 100644
a/libraries/amf/amftools-code/include/STL_File.h
-+++ b/libraries/amf/amftools-code/include/STL_File.h
-@@ -89,7 +89,7 @@ class aWeldVertex {
- Vec3D v;
- int OrigIndex;
-
-- static inline bool IsSoftLessThan(const aWeldVertex& v1, const
aWeldVertex& v2){if(abs(v1.v.z - v2.v.z) <= WeldThresh){ if(abs(v1.v.y -
v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y
< v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less
then (generates a "hash" for sorting vertices by z for set
-+ static inline bool IsSoftLessThan(const aWeldVertex& v1, const
aWeldVertex& v2){if(std::abs(v1.v.z - v2.v.z) <= WeldThresh){
if(std::abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x <
v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return
(v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting
vertices by z for set
- static double WeldThresh; //weld threshold for importing from STL
- };
-
-
-From 93c81e3794a3eb7c2b7c7611803a3107fb25027b Mon Sep 17 00:00:00 2001
-From: "Ying-Chun Liu (PaulLiu)"
-Date: Wed, 4 Jan 2017 13:50:56 +0800
-Subject: [PATCH 2/2] Fix FTBFS for glibmm Glib::RefPtr
-
-Now we can use operator RefPtr::operator bool() to test if it is NULL.
-RefPtr::operator== can not work on int.
-
[gentoo-commits] repo/gentoo:master commit in: sci-misc/repsnapper/files/, sci-misc/repsnapper/
commit: ee4a29effa2dc4c4d279dcfa57d4d8ff6574f6f0
Author: Slawomir Lis gentoo org>
AuthorDate: Wed Sep 21 06:50:54 2016 +
Commit: Slawek Lis gentoo org>
CommitDate: Wed Sep 21 11:56:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4a29ef
sci-misc/repsnapper: Added patch to fix compilation error with newer gcc
This bug is issued in newer gcc's because of abs() method is moved into
std namespace. Added a patch to fix the issue.
Reported in bug 594474
Reported-By: Toralf Förster gmx.de>
Package-Manager: portage-2.3.0
sci-misc/repsnapper/files/std_abs.patch | 11 +++
sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild | 1 +
sci-misc/repsnapper/repsnapper-.ebuild| 3 +++
3 files changed, 15 insertions(+)
diff --git a/sci-misc/repsnapper/files/std_abs.patch
b/sci-misc/repsnapper/files/std_abs.patch
new file mode 100644
index ..35aefe9
--- /dev/null
+++ b/sci-misc/repsnapper/files/std_abs.patch
@@ -0,0 +1,11 @@
+--- libraries/amf/amftools-code/include/STL_File.h.orig2016-09-21
08:35:10.600313039 +0200
libraries/amf/amftools-code/include/STL_File.h 2016-09-21
08:35:58.303647256 +0200
+@@ -89,7 +89,7 @@
+ Vec3D v;
+ int OrigIndex;
+
+- static inline bool IsSoftLessThan(const aWeldVertex& v1, const
aWeldVertex& v2){if(abs(v1.v.z - v2.v.z) <= WeldThresh){ if(abs(v1.v.y -
v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y
< v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less
then (generates a "hash" for sorting vertices by z for set
++ static inline bool IsSoftLessThan(const aWeldVertex& v1, const
aWeldVertex& v2){if(std::abs(v1.v.z - v2.v.z) <= WeldThresh){
if(std::abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x <
v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return
(v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting
vertices by z for set
+ static double WeldThresh; //weld threshold for importing from STL
+ };
+
diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
index a976a17..ce016a8 100644
--- a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
+++ b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
@@ -31,6 +31,7 @@ RDEPEND=${DEPEND}
src_prepare() {
epatch "${FILESDIR}/std-c11.patch"
+ epatch "${FILESDIR}/std_abs.patch"
eautoreconf
append-cxxflags -std=c++11
}
diff --git a/sci-misc/repsnapper/repsnapper-.ebuild
b/sci-misc/repsnapper/repsnapper-.ebuild
index c56bddd..34e7a93 100644
--- a/sci-misc/repsnapper/repsnapper-.ebuild
+++ b/sci-misc/repsnapper/repsnapper-.ebuild
@@ -25,5 +25,8 @@ DEPEND="
RDEPEND=${DEPEND}
src_prepare() {
+ epatch "${FILESDIR}/std-c11.patch"
+ epatch "${FILESDIR}/std_abs.patch"
eautoreconf
+ append-cxxflags -std=c++11
}
[gentoo-commits] repo/gentoo:master commit in: sci-misc/repsnapper/files/
commit: f152575b2fd5035de6a0ffa74076df784096c3d0
Author: Slawomir Lis gentoo org>
AuthorDate: Mon Dec 28 19:44:11 2015 +
Commit: Slawek Lis gentoo org>
CommitDate: Mon Dec 28 19:45:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f152575b
fixed patch lost #569976, #569628
Package-Manager: portage-2.2.26
sci-misc/repsnapper/files/std-c11.patch | 31 +++
1 file changed, 31 insertions(+)
diff --git a/sci-misc/repsnapper/files/std-c11.patch
b/sci-misc/repsnapper/files/std-c11.patch
new file mode 100644
index 000..a8ff67a
--- /dev/null
+++ b/sci-misc/repsnapper/files/std-c11.patch
@@ -0,0 +1,31 @@
+--- src/slicer/poly.cpp.orig 2015-12-28 07:54:32.774722105 +0100
src/slicer/poly.cpp2015-12-28 07:54:41.188055896 +0100
+@@ -225,7 +225,7 @@
+ // Start with first vertex as closest
+ uint nindex = 0;
+ mindist = (vertices[0]-p).squared_length();
+- if (isnan(mindist)) { // for infinity point p return point 0 and distance 0
++ if (std::isnan(mindist)) { // for infinity point p return point 0 and
distance 0
+ mindist = 0.;
+ return 0;
+ }
+--- src/slicer/printlines.cpp.orig 2015-12-28 07:54:05.814720635 +0100
src/slicer/printlines.cpp 2015-12-28 07:54:19.821388065 +0100
+@@ -240,7 +240,7 @@
+ if (abs(absolute_extrusion) < 0.1)
+ travel_speed = max(minspeed, speed); // in case speed is too low
+
+- if (!isnan(absolute_extrusion))
++ if (!std::isnan(absolute_extrusion))
+ // allowed to push/pull at arbitrary speed
+ extrudedMaterial += absolute_extrusion;
+ else
+@@ -335,7 +335,7 @@
+ else
+ factor = 1./newlines.size();
+ newlines[i].absolute_extrusion *= factor;
+-assert(!isnan(newlines[i].absolute_extrusion));
++assert(!std::isnan(newlines[i].absolute_extrusion));
+
+ }
+ return newlines;
