From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:38182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7ycZ-0008JF-O4 for guix-patches@gnu.org; Wed, 11 Sep 2019 05:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7ycY-0006iv-7k for guix-patches@gnu.org; Wed, 11 Sep 2019 05:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7ycY-0006ij-2c for guix-patches@gnu.org; Wed, 11 Sep 2019 05:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i7ycX-0005V6-T6 for guix-patches@gnu.org; Wed, 11 Sep 2019 05:09:01 -0400 Subject: bug#37372: [PATCH] gnu: Add openscad. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Wed, 11 Sep 2019 12:08:08 +0300 From: Efraim Flashner Message-ID: <20190911090808.GL977@E5400> References: <20190911075757.GK977@E5400> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tDYGg60iReQ7u8wj" Content-Disposition: inline In-Reply-To: <20190911075757.GK977@E5400> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Steve Sprang Cc: 37372-done@debbugs.gnu.org --tDYGg60iReQ7u8wj Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patch pushed, with a minor comment or two below. On Wed, Sep 11, 2019 at 10:57:57AM +0300, Efraim Flashner wrote: > On Tue, Sep 10, 2019 at 04:47:00PM -0700, Steve Sprang wrote: > > There is a lint complaint that the "source [is] not archived on > > Software Heritage". I'm not sure if that's something that I need to > > remedy or not. >=20 > I've been seeing it a bunch too lately. I know it was added more > explicitly as a check although I'm not sure if they're false positives > or if it's really missing. Either way, it's not something to worry about > at this point. >=20 > > From 20cbcd57a23a4acac83257817df0baeb3232695d Mon Sep 17 00:00:00 2001 > > From: Steve Sprang > > Date: Tue, 10 Sep 2019 16:22:57 -0700 > > Subject: [PATCH] gnu: Add openscad. > >=20 > > * gnu/packages/engineering.scm (openscad): New variable. > > --- > > gnu/packages/engineering.scm | 69 ++++++++++++++++++++++++++++++++++++ > > 1 file changed, 69 insertions(+) > >=20 > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > > index 7f5409c835..9852aaf667 100644 > > --- a/gnu/packages/engineering.scm > > +++ b/gnu/packages/engineering.scm > > @@ -65,6 +65,7 @@ > > #:use-module (gnu packages glib) > > #:use-module (gnu packages gnome) > > #:use-module (gnu packages gperf) > > + #:use-module (gnu packages graphics) > > #:use-module (gnu packages groff) > > #:use-module (gnu packages gtk) > > #:use-module (gnu packages guile) > > @@ -89,6 +90,7 @@ > > #:use-module (gnu packages tex) > > #:use-module (gnu packages version-control) > > #:use-module (gnu packages wxwidgets) > > + #:use-module (gnu packages xml) > > #:use-module (gnu packages xorg)) > > =20 > > (define-public librecad > > @@ -2145,3 +2147,70 @@ well as conversion and validation tools for inpu= t and output data. The > > specification can be downloaded at @url{http://3mf.io/specification/}.= ") > > (home-page "https://3mf.io/") > > (license license:bsd-2))) > > + > > +(define-public openscad > > + (package > > + (name "openscad") > > + (version "2019.05") > > + (source > > + (origin > > + (method url-fetch) > > + (uri (string-append "https://files.openscad.org/openscad-" vers= ion > > + ".src.tar.gz")) > > + (sha256 > > + (base32 > > + "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")))) > > + (build-system cmake-build-system) > > + (inputs > > + `(("boost" ,boost) > > + ("cgal" ,cgal) > > + ("double-conversion" ,double-conversion) > > + ("eigen" ,eigen) > > + ("fontconfig" ,fontconfig) > > + ("glew" ,glew) > > + ("gmp" ,gmp) > > + ("harfbuzz" ,harfbuzz) > > + ("lib3mf" ,lib3mf) > > + ("libxml2" ,libxml2) > > + ("libzip" ,libzip) > > + ("mpfr" ,mpfr) > > + ("opencsg" ,opencsg) > > + ("qscintilla" ,qscintilla) > > + ("qtbase" ,qtbase) > > + ("qtmultimedia" ,qtmultimedia))) > > + (native-inputs > > + `(("bison" ,bison) > > + ("flex" ,flex) > > + ("gnu-gettext" ,gnu-gettext) >=20 > This should be gnu-gettext-minimial Seems I made a typo, ("gettext" ,gettext-minimal) >=20 > > + ("pkg-config" ,pkg-config) > > + ("which" ,which) > > + ;; the following are only needed for tests > > + ("imagemagick" ,imagemagick) > > + ("ps" ,procps) > > + ("python" ,python) > > + ("xvfb" ,xorg-server))) > > + (arguments > > + `(#:phases > > + (modify-phases %standard-phases > > + (replace 'configure > > + (lambda* (#:key outputs #:allow-other-keys) > > + (invoke "qmake" > > + (string-append "PREFIX=3D" (assoc-ref outputs "ou= t"))) > > + #t)) > > + (replace 'check > > + (lambda _ > > + (with-directory-excursion "tests" > > + (invoke "cmake" ".") > > + (invoke "make") >=20 > I know it wouldn't get rid of all the changes to the 'check phase, but > is there a make-flag that would have it also build the tests? something > like "-DENABLE_TESTS=3DON"? I looked at this a bit myself and didn't see anything >=20 > > + (invoke "ctest")) > > + ;; strip python test files since lib dir ends up in out/s= hare > > + (for-each delete-file > > + (find-files "libraries/MCAD" ".*\\.py")) > > + #t))))) > > + (synopsis "Script-based 3D modeling application") > > + (description > > + "OpenSCAD is a 3D Computer-aided Design (CAD) application. Unlik= e an > > +interactive modeler, OpenSCAD generates 3D models from a script, givin= g you > > +full programmatic control over your models.") > > + (home-page "https://www.openscad.org/") > > + (license license:gpl2+))) > > --=20 > > 2.23.0 > >=20 >=20 >=20 > --=20 > Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7= =9D =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 > GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 > Confidentiality cannot be guaranteed on emails sent or received unencrypt= ed --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --tDYGg60iReQ7u8wj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl14uXgACgkQQarn3Mo9 g1EiTw//ct1m3FP1IdN7iqOqM7a8E5abcHabr3rsYt1cAWE7bfk43I/TZcyNVU0G CqbLoiaHX/+rTsnCry0qAKRu14ivqiDlh+OPPEXk8ggYJ7uy14zabBQ/Lur/wOqh nMQ/n7LS92jQqvWXZ5AhIAy1fNT/2nllCTWJlR1ByI/nS8ceMcnlvT8ziFddSURI htuNO904oFky0KnHDEB5eLqkLjW35jQx9JCw65lxV7o5NMxjN9kZCyLLojuhFQtz KzusVR1u0v3/5/OEAVTfk41I9jmgj8syxOVUC2JcCDPxyK7aU306Cw3qWNFIhcJ+ PwFbZYuIr92T5Ndm43Ij67LbhgtvGhOHQ+F5jjUGSgVF9YR/nLoryfz9lUYOw2j6 0a8vPUrNusPFc7yWmAWxqa3gc6+6zDvR74SttU7hcLRLO5rPObB8WI/i1uVY0K+w h6pQmpvnaXNFM35uvAVW07stMtaD8yV2hnHiCQWXSgpzj7CmS7QtdLjlOzXMWV2r 9Cg3fJs+Pz+sUTkDz1rfdMKrm1/nwXC9rYm97BKnCu75O4M2hir9AuGXM+44Ss0+ fIjZLt/84dpIaXvrgee8NfQ/tgJO7QfRncRIJdWde/LY5156SR9EhjcGQ8pLWCBh +/2q98icth8VZTLGSbs5F9PRIjO/SDrkpxw6oKEn3iTNT/NutIM= =WAcv -----END PGP SIGNATURE----- --tDYGg60iReQ7u8wj--