[arch-commits] Commit in openscad/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Sun Feb 10 17:48:16 UTC 2019
Date: Sunday, February 10, 2019 @ 17:48:14
Author: arojas
Revision: 431627
archrelease: copy trunk to community-staging-x86_64
Added:
openscad/repos/community-staging-x86_64/
openscad/repos/community-staging-x86_64/CHANGELOG
(from rev 431626, openscad/trunk/CHANGELOG)
openscad/repos/community-staging-x86_64/PKGBUILD
(from rev 431626, openscad/trunk/PKGBUILD)
openscad/repos/community-staging-x86_64/openscad-boost-1.69.patch
(from rev 431626, openscad/trunk/openscad-boost-1.69.patch)
---------------------------+
CHANGELOG | 151 ++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 63 ++++++++++++++++++
openscad-boost-1.69.patch | 22 ++++++
3 files changed, 236 insertions(+)
Copied: openscad/repos/community-staging-x86_64/CHANGELOG (from rev 431626, openscad/trunk/CHANGELOG)
===================================================================
--- community-staging-x86_64/CHANGELOG (rev 0)
+++ community-staging-x86_64/CHANGELOG 2019-02-10 17:48:14 UTC (rev 431627)
@@ -0,0 +1,151 @@
+2018-02-07 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-15
+ - Switch to Qt5
+
+2017-12-27 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-14
+ - Rebuild for boost 1.66.0
+
+2017-09-10 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-13
+ - Rebuild for boost 1.65.1
+
+2017-08-03 felixonmars <felixonmars at gmail.com>
+ * 2015.03.03-12
+ - Rebuild for GLEW 2.1.0 rebuild
+
+2017-05-30 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-11
+ - Rebuild for cgal 4.10
+
+2017-05-22 Antonio Rojas <arojas at archlinux.org>
+ * 2015.03.03-10
+ - Rebuild for boost 1.64
+
+2017-02-25 Antonio Rojas <arojas at archlinux.org>
+ * 2015.03.03-9
+ - Rebuild for qscintilla 2.10
+
+2017-01-02 Antonio Rojas <arojas at archlinux.org>
+ * 2015.03.03-8
+ - Rebuild for boost 1.63
+
+2016-10-08 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-7
+ - Rebuild for boost 1.62
+
+2016-09-20 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-6
+ - Rebuild for cgal 4.9
+
+2016-08-24 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-5
+ - Rebuild for boost 1.61
+
+2016-08-01 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-4
+ - Rebuild for glew
+
+2016-05-12 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-3
+ - Rebuild for boost-1.60.0-5
+
+2016-04-28 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-2
+ - Rebuild for install hooks
+
+2015-04-18 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.03-1
+ - Update to latest release
+ - Rebuild for cgal-4.8
+
+2015-11-16 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.02-1
+ - Bugfix release
+
+2015-10-19 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.01-5
+ - No changes
+ - Rebuild for cgal-4.7
+
+2015-10-02 foutrelis
+ * 2015.03.01-4
+ - No changes
+
+2015-04-29 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.01-3
+ - No changes
+ - Rebuild for qscintilla-2.9-1
+
+2015-04-22 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.01-2
+ - No changes
+ - Rebuild for boost-1.58.0-1
+
+2015-04-22 Kyle Keen <keenerd at gmail.com>
+ * 2015.03.01-1
+ - Bugfix release
+
+2015-04-11 Kyle Keen <keenerd at gmail.com>
+ * 2015.03-2
+ - No changes
+ - Rebuild for cgal-4.6-1
+
+2015-03-10 Kyle Keen <keenerd at gmail.com>
+ * 2015.03-1
+ - New release
+ - Now uses qscintilla for the editor
+
+2014-11-04 Kyle Keen <keenerd at gmail.com>
+ * 2014.03-5
+ - No changes
+ - Rebuild for boost-1.57.0-1
+
+2014-08-18 Kyle Keen <keenerd at gmail.com>
+ * 2014.03-4
+ - No changes
+ - Rebuild for boost-1.56.0-1
+
+2014-08-18 Kyle Keen <keenerd at gmail.com>
+ * 2014.03-3
+ - No changes
+ - Rebuild for glew-1.11.0-1
+
+2014-08-12 Kyle Keen <keenerd at gmail.com>
+ * 2014.03-2
+ - No changes
+ - Rebuild for boost-1.56.0-1
+
+2014-03-09 Kyle Keen <keenerd at gmail.com>
+
+ * 2014.03-1
+ - New release
+ - MIME associations
+
+2014-02-10 Kyle Keen <keenerd at gmail.com>
+
+ * 2013.06-3
+ - Moved package to [community]
+ - Explicit boost depends
+ - Use official resources
+
+2014-02-07 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+ * 2013.06-2
+ - Update makedepends since eigen3 has now become eigen in [extra]
+
+2013-06-19 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+ * 2013.06-1 :
+ - Updated to version 2013.06
+
+2013-03-01 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+ * 2013.01-2 :
+ Dependency qt replaced with qt4
+
+2013-01-23 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+ * 2013.01-1 :
+ New upstream release.
+ Dependency eigen2 repaced by eigen3
Copied: openscad/repos/community-staging-x86_64/PKGBUILD (from rev 431626, openscad/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2019-02-10 17:48:14 UTC (rev 431627)
@@ -0,0 +1,63 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com>
+# 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=20
+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')
+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')
+
+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
+}
+
+build() {
+ cd "$srcdir/$pkgname-$_ver"
+ qmake-qt5 PREFIX="/usr"
+ make
+ convert +set date:create +set date:modify "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png"
+}
+
+check() {
+ # see doc/testing.txt about enabling
+ # normally will display stuff, run image diffs
+ cd "$srcdir/$pkgname-$_ver/tests"
+ sed -i 's/exit 1/exit 0/' virtualfb.sh
+ cmake .
+ # pkgconfig weirdness
+ 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
+}
+
+package() {
+ cd "$srcdir/$pkgname-$_ver"
+ make INSTALL_ROOT="$pkgdir" install
+ # can't remove earlier, py files needed for tests
+ rm "$pkgdir/usr/share/openscad/libraries/MCAD/"*.py
+ install -Dm644 "icons/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "icons/$pkgname-128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+ install -Dm644 "icons/$pkgname.xml" "$pkgdir/usr/share/mime/packages/$pkgname.xml"
+}
Copied: openscad/repos/community-staging-x86_64/openscad-boost-1.69.patch (from rev 431626, openscad/trunk/openscad-boost-1.69.patch)
===================================================================
--- community-staging-x86_64/openscad-boost-1.69.patch (rev 0)
+++ community-staging-x86_64/openscad-boost-1.69.patch 2019-02-10 17:48:14 UTC (rev 431627)
@@ -0,0 +1,22 @@
+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());
More information about the arch-commits
mailing list