[arch-commits] Commit in openscad/trunk (CHANGELOG PKGBUILD openscad-boost-1.69.patch)

[Kyle Keen]

    Date: Wednesday, May 15, 2019 @ 01:40:54
  Author: kkeen
Revision: 467246

upgpkg: openscad 2019.05-1

Modified:
  openscad/trunk/CHANGELOG
  openscad/trunk/PKGBUILD
Deleted:
  openscad/trunk/openscad-boost-1.69.patch

---------------------------+
 CHANGELOG                 |    4 ++++
 PKGBUILD                  |   35 ++++++++++++++---------------------
 openscad-boost-1.69.patch |   22 ----------------------
 3 files changed, 18 insertions(+), 43 deletions(-)

Modified: CHANGELOG
===================================================================
--- CHANGELOG	2019-05-15 01:14:03 UTC (rev 467245)
+++ CHANGELOG	2019-05-15 01:40:54 UTC (rev 467246)
@@ -1,3 +1,7 @@
+2019-05-14 Kyle Keen <keenerd at gmail.com>
+	* 2019.05-1
+	- New release!
+
 2018-02-07 Kyle Keen <keenerd at gmail.com>
 	* 2015.03.03-15
 	- Switch to Qt5

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-15 01:14:03 UTC (rev 467245)
+++ PKGBUILD	2019-05-15 01:40:54 UTC (rev 467246)
@@ -3,33 +3,29 @@
 # Contributor: Eric Anderson <ejona86 at gmail.com>
 # Contributor: Pierre DOUCET <pierre at equinoxefr.org>
 pkgname=openscad
-pkgver=2015.03.03
-_ver=2015.03-3  # hopefully -X is temporary
-pkgrel=21
+pkgver=2019.05
+pkgrel=1
 pkgdesc="The programmers solid 3D CAD modeller"
 url="http://openscad.org/"
 arch=('x86_64')
 license=('GPL2')
 changelog=CHANGELOG
-depends=('qt5-base' 'qscintilla-qt5' 'cgal' 'opencsg' 'boost-libs' 'shared-mime-info')
+depends=('qt5-base' 'qscintilla-qt5' 'cgal' 'opencsg' 'boost-libs' 'shared-mime-info' 'libzip' 'qt5-multimedia')
 makedepends=('eigen' 'boost' 'imagemagick')
 # full tests need imagemagick and an X11 or framebuffer session
-checkdepends=('cmake' 'xproto' 'libx11' 'python2')
-source=("http://files.openscad.org/openscad-$_ver.src.tar.gz"
-        "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch"
-        openscad-boost-1.69.patch::"https://github.com/openscad/openscad/commit/ce564617.patch")
-md5sums=('a498a218a247468eee140ccc44c73afa'
-         '9a2359c30582f7ce4df05f6879bf6635'
-         '90a87f7aa70a37f31512adcefcda86d8')
+# can't find lib3MF from libsavitar?
+checkdepends=('cmake' 'xproto' 'libx11' 'python')
+validpgpkeys=('E2EBDADD336FF516ADD51A78F3E12CCC22164A0F')
+source=("https://files.openscad.org/openscad-$pkgver.src.tar.gz"{,.asc})
+md5sums=('2b63e249d56e2eba62ed5b042e1d82bc'
+         'SKIP')
 
 prepare() {
-    cd "$srcdir/$pkgname-$_ver"
-    patch -p1 -i ../openscad-2015.03_p2_uic_tr_fix.patch
-    patch -p1 -i ../openscad-boost-1.69.patch # Fix build with boost 1.69
+    cd "$srcdir/$pkgname-$pkgver"
 }
 
 build() {
-    cd "$srcdir/$pkgname-$_ver"
+    cd "$srcdir/$pkgname-$pkgver"
     qmake-qt5 PREFIX="/usr"
     make
     convert +set date:create +set date:modify "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png"
@@ -38,15 +34,12 @@
 check() {
     # see doc/testing.txt about enabling
     # normally will display stuff, run image diffs
-    cd "$srcdir/$pkgname-$_ver/tests"
+    cd "$srcdir/$pkgname-$pkgver/tests"
     sed -i 's/exit 1/exit 0/' virtualfb.sh
     cmake .
     # pkgconfig weirdness
-    sed -i 's/-lmpfr/& -lX11/' CMakeFiles/openscad_nogui.dir/link.txt 
+    #sed -i 's/-lmpfr/& -lX11/' CMakeFiles/openscad_nogui.dir/link.txt 
     make
-    sed -i 's/ python$/&2/' *.py
-    sed -i 's|/usr/bin/python"|/usr/bin/python2"|g' CTestTestfile.cmake
-    sed -i 's|/usr/bin/python |/usr/bin/python2 |g' CTestCustom.cmake
     msg "Running headless tests..."
     ctest -R 'dumptest|csgtexttest|csgtermtest|openscad-nonascii|openscad-override'
     # echotest is buggy on i686, check again next release
@@ -53,7 +46,7 @@
 }
 
 package() {
-    cd "$srcdir/$pkgname-$_ver"
+    cd "$srcdir/$pkgname-$pkgver"
     make INSTALL_ROOT="$pkgdir" install
     # can't remove earlier, py files needed for tests
     rm "$pkgdir/usr/share/openscad/libraries/MCAD/"*.py

Deleted: openscad-boost-1.69.patch
===================================================================
--- openscad-boost-1.69.patch	2019-05-15 01:14:03 UTC (rev 467245)
+++ openscad-boost-1.69.patch	2019-05-15 01:40:54 UTC (rev 467246)
@@ -1,22 +0,0 @@
-From ce5646179848cb61f628c9f96a59ceec234c5b7b Mon Sep 17 00:00:00 2001
-From: Marius Kintel <marius at 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 a/src/CSGTreeEvaluator.cc b/src/CSGTreeEvaluator.cc
-index 245d7e07d9..51d3439348 100644
---- a/src/CSGTermEvaluator.cc
-+++ b/src/CSGTermEvaluator.cc
-@@ -176,7 +176,7 @@ shared_ptr<CSGNode> CSGTreeEvaluator::evaluateCSGNodeFromGeometry(
- 			auto 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);
- 				auto ps_tri = new PolySet(3, ps->convexValue());