From patchwork Wed Aug 28 21:27:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sprang X-Patchwork-Id: 15152 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E79CA17348; Wed, 28 Aug 2019 22:28:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 92D0F17345 for ; Wed, 28 Aug 2019 22:28:20 +0100 (BST) Received: from localhost ([::1]:43038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i35UI-0002jH-Tv for patchwork@mira.cbaines.net; Wed, 28 Aug 2019 17:28:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33128) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i35U6-0002hY-I6 for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i35U4-00038C-EV for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42518) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i35U4-000381-8V for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i35U2-000536-BE for guix-patches@gnu.org; Wed, 28 Aug 2019 17:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37169] [PATCH] gnu: Add lib3mf. Resent-From: Steve Sprang Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Aug 2019 21:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 37169-submit@debbugs.gnu.org id=B37169.156702765419370 (code B ref 37169); Wed, 28 Aug 2019 21:28:02 +0000 Received: (at 37169) by debbugs.gnu.org; 28 Aug 2019 21:27:34 +0000 Received: from localhost ([127.0.0.1]:51339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i35TU-00052F-Iw for submit@debbugs.gnu.org; Wed, 28 Aug 2019 17:27:33 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:37290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i35TS-000520-Op for 37169@debbugs.gnu.org; Wed, 28 Aug 2019 17:27:27 -0400 Received: by mail-lf1-f65.google.com with SMTP id w67so757337lff.4 for <37169@debbugs.gnu.org>; Wed, 28 Aug 2019 14:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=utbuC8+e3M1n0r+OOiMS9EAAIsJ4YVUYdKwJt/AgNLY=; b=fVEUnVE7zlJCoKrVqux4HDDIqwKT7561Z4bCAURAhrIqak+efUpg2k87LXPdpzqM2c RC2Y/+ZDet+MK7E1Xs1np2Nn+t7XiiuHoTt5dUBIu0BgRmYTWA/7ofQS7cupE6r/mUNE xw6AMayix96bCQU47BDrp8Qk4IRW/tl+GMfGtMDzLOzYcmp6xt6V1/HuF9eBw5IVH5ES GGpy1PtE17vX6afQ8dO0qQPNig20ktOSYCEi7oW6s9elvxrAT1vchyyHl4e2NH5NzXyC TAFZfVYLqpJBc7TPVx3HAdv2eF8p8lHBx2U1TsUiEwRT/1yVILXLF3qorEt18Kj6ZCX9 9x+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=utbuC8+e3M1n0r+OOiMS9EAAIsJ4YVUYdKwJt/AgNLY=; b=JvD1UoboHXLch6QikvISGSQdFW6eAJ4QnFQObsS2N0anqf7hih2kyFLOWj6KWbrjA8 gcmTQZLACmh9LgJkXA6J110nL89kMPCyBxhvn88b1SwfIAUTdpbZnl6JNoPSjlfZE80y ZDIDj22bzgGR0ti2Hd2rsqwdjhanFPzNEOKn+c7j6dEzAlebUg/Zp+YYLhd7J6M19HB2 3CsYTAt747AtZFWXA+Isz+eNxcSgTtAS9kA9daj35UDYta8hzvXngRpEakF8Z5dSeMpj jb9L3LzFfFpqDevIw03VIVb/c/WULiI8srHuhcB2bcVtlyAi8aAHs0QF6N22MO4MuUtL tzWA== X-Gm-Message-State: APjAAAVkqQp+6qgnpE/QzpzT4+KOkd6lRbt2vgos/UHuGNTDedCmb4jQ SGIXsBnJDuV8zc4XXebbzABMrmLbyO3onPQubDs= X-Google-Smtp-Source: APXvYqwAh0+QLxBhrVEEuy38XOdcWJNqArfFpYNwwkMo3LKfIxH6p6NkZQLbzSAds4JBwHuHW925bodhw54jiNZ6DlM= X-Received: by 2002:ac2:599b:: with SMTP id w27mr3974068lfn.75.1567027640692; Wed, 28 Aug 2019 14:27:20 -0700 (PDT) MIME-Version: 1.0 References: <87y2zdfdno.fsf@gnu.org> In-Reply-To: <87y2zdfdno.fsf@gnu.org> From: Steve Sprang Date: Wed, 28 Aug 2019 14:27:09 -0700 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 37169@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Wed, Aug 28, 2019 at 9:38 AM Ludovic Courtès wrote: > > + (add-after 'unpack 'unpack-googletest > > + (lambda* (#:key inputs #:allow-other-keys) > > + (copy-recursively (assoc-ref inputs "googletest-source") > > + "UnitTests/googletest") > > Would it work to simply pass ‘googletest’ as an input? > If not, this approach is fine IMO. Unfortunately, no, the build process expects to see the googletest source in a sub-module directory. Attached a new patch with the fixes you suggested. From a691020809334c94a33a9632c8a7fd75102fd8f2 Mon Sep 17 00:00:00 2001 From: Steve Sprang Date: Fri, 23 Aug 2019 15:23:00 -0700 Subject: [PATCH] gnu: Add lib3mf. * gnu/packages/engineering.scm (lib3mf): New variable. --- gnu/packages/engineering.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a1f222bed4..54bf5a7b69 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2019 Tim Stahel ;;; Copyright © 2019 Jovany Leandro G.C +;;; Copyright © 2019 Steve Sprang ;;; ;;; This file is part of GNU Guix. ;;; @@ -2109,3 +2110,38 @@ while keeping the user experience at mind. Cutter is created by reverse engineers for reverse engineers.") (license (list license:cc-by-sa3.0 ;the "Iconic" icon set license:gpl3+)))) ;everything else + +(define-public lib3mf + (package + (name "lib3mf") + (version "1.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd")))) + (build-system cmake-build-system) + (native-inputs + `(("googletest-source" ,(package-source googletest)))) + (inputs + `(("libuuid" ,util-linux))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "googletest-source") + "UnitTests/googletest") + #t))))) + (synopsis "Implementation of the 3D Manufacturing Format (3MF) file standard") + (description + "Lib3MF is a C++ implementation of the 3D Manufacturing Format (3MF) file +standard. It offers a way to integrate 3MF reading and writing capabilities, as +well as conversion and validation tools for input and output data. The +specification can be downloaded at @url{http://3mf.io/specification/}.") + (home-page "https://3mf.io/") + (license license:bsd-2))) -- 2.23.0