moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

openscad: update to 2019.05.

Browse source
This commit is contained in:
bra1nwave 2019-07-09 18:58:38 +02:00 • committed by Juan RP
parent e977840278
commit 1b44a19812
3 changed files with 7 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/openscad/patches/8fb64db99ce05da1c72efb8b2f572995fef2ea86.patch
View file

@ -1,22 +0,0 @@
From 8fb64db99ce05da1c72efb8b2f572995fef2ea86 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sun, 21 Oct 2018 12:02:50 -0400
Subject: [PATCH] Build fix for boost 1.69
---
src/CSGTreeEvaluator.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/CSGTreeEvaluator.cc src/CSGTreeEvaluator.cc
index 245d7e07d9..51d3439348 100644
--- src/CSGTermEvaluator.cc 2015-04-01 23:10:53.000000000 +0200
+++ - 2018-12-13 13:35:04.981075600 +0100
@@ -109,7 +109,7 @@
shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom);
// Since is_convex() doesn't handle non-planar faces, we need to tessellate
// also in the indeterminate state so we cannot just use a boolean comparison. See #1061
- bool convex = ps->convexValue();
+ bool convex{ps->convexValue()};
if (ps && !convex) {
assert(ps->getDimension() == 3);
PolySet *ps_tri = new PolySet(3, ps->convexValue());

34
srcpkgs/openscad/patches/uic_qgettext.patch
View file

@ -1,34 +0,0 @@
From 4fa5f0340a2b7b031a0b39f7de0ca795d52bb68b Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sun, 27 Nov 2016 19:29:04 +0100
Subject: [PATCH] Handle 2 argument translation calls generated by Qt 5.7.1
(fixes #1872).
---
src/qtgettext.h | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git src/qtgettext.h src/qtgettext.h
index 6e66716..dbc4f17 100644
--- src/qtgettext.h
+++ src/qtgettext.h
@@ -16,10 +16,16 @@
#define N_(String) String
-inline QString _( const char *msgid, int category )
+inline QString _(const char *msgid, int category)
{
- Q_UNUSED( category );
- return QString::fromUtf8( _( msgid ) );
+ Q_UNUSED(category);
+ return QString::fromUtf8(_(msgid));
+}
+
+inline QString _(const char *msgid, const char *disambiguation)
+{
+ Q_UNUSED(disambiguation);
+ return QString::fromUtf8(_(msgid));
}
#endif

15
srcpkgs/openscad/template
View file

@ -1,15 +1,14 @@
# Template file for 'openscad' # Template file for 'openscad'
pkgname=openscad pkgname=openscad
version=2015.03.2 version=2019.05
revision=11 revision=1
_distver="${version%.*}-${version##*.}"
wrksrc="${pkgname}-${_distver}"
build_style=qmake build_style=qmake
hostmakedepends="bison flex pkg-config" hostmakedepends="bison flex pkg-config"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel" makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
short_desc="The programmers solid 3D CAD modeller" qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
short_desc="Solid 3D CAD modeller"
maintainer="Pierre Allegraud <pierre.allegraud@crans.org>" maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://www.openscad.org" homepage="http://www.openscad.org"
distfiles="http://files.openscad.org/${pkgname}-${_distver}.src.tar.gz" distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
checksum="a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083" checksum=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59