From patchwork Fri Jun 5 18:10:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sprang X-Patchwork-Id: 22560 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 ABA3627BBE3; Fri, 5 Jun 2020 19:12:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5BFDC27BBE1 for ; Fri, 5 Jun 2020 19:12:40 +0100 (BST) Received: from localhost ([::1]:41114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhGpb-00062B-DB for patchwork@mira.cbaines.net; Fri, 05 Jun 2020 14:12:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhGp0-0005g3-EH for guix-patches@gnu.org; Fri, 05 Jun 2020 14:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhGp0-0002fv-5J for guix-patches@gnu.org; Fri, 05 Jun 2020 14:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhGp0-0004Zw-0k for guix-patches@gnu.org; Fri, 05 Jun 2020 14:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41725] [PATCH] gnu: openscad: Add patch to fix build. Resent-From: Steve Sprang Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jun 2020 18:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41725@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159138066917530 (code B ref -1); Fri, 05 Jun 2020 18:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2020 18:11:09 +0000 Received: from localhost ([127.0.0.1]:49894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhGo3-0004Yb-Bt for submit@debbugs.gnu.org; Fri, 05 Jun 2020 14:11:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:38890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhGnz-0004Xx-90 for submit@debbugs.gnu.org; Fri, 05 Jun 2020 14:11:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhGny-0003x7-Sf for guix-patches@gnu.org; Fri, 05 Jun 2020 14:10:59 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]:37962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhGnt-0002UH-Ue for guix-patches@gnu.org; Fri, 05 Jun 2020 14:10:58 -0400 Received: by mail-lj1-x231.google.com with SMTP id 9so3226547ljv.5 for ; Fri, 05 Jun 2020 11:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Mhlp4wliG3ZTODZ5kXItuXCjBDNeCvj0wroNAng5hNc=; b=SmsktclRnx5FEXGm+B48Ea+Jyxd2RzfpEyF04Ae6btVnFSJgJZHZ1RDX6Hi5yjC1hE 9lRfbawhdcxEFXHo1cbdk15luH1xMdvIp3FRC7ZHO4CJd0rZ3h7bWH3xRyef0uSYMMLn 7bwksYP2+kHEhPylZh0cGhukBpq6ae9UhtYmLewgC4CSO7weoUKszL9tCzKMD8JtfooR evNVjC5DLIdL+rkXJnLMF2uN/LxmUj12kTGMztja0ILd+jSKhS0gqFh2srOMmSCnjzQz +HzgvQYk63oj8kosLYsvfKzUBM37oSxdr6QZKmUpuQi9zscy1sh9KEO7/lLFNPZ6GlKB 5H6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Mhlp4wliG3ZTODZ5kXItuXCjBDNeCvj0wroNAng5hNc=; b=FSQT6t01D88+JdofXBW/Ua5PfrsH+g5aJy9XvoYQIepZI8qEMTgT+j9PG0F6dDweIr jy4Jn6l95Gsq4XWKgsS0R/gG4FPaJ9ls8aWKn/vI5rpOzKxR9WP3kdtdWm7Wz4ieG9Qx Mo26bSU0V7mJP1ttSrWJiQ+pLEjqcrDzxt7GWlTZdiGvCC1tHfK3WQyDDJ2LWqoV9uph gUeXde6LbKjRZasv03l0RE/jDOR5SuBzMuXnp0ryS3gL9YPP1VHXGLKAAsjomFP4FfW+ +lb/T4KWWunkTGEssCeF6t4EW5K+TGqdczPqU7GjksujBIkiEaLFT06p6bEZaWtrkJBf CC4A== X-Gm-Message-State: AOAM530TYiaJbHDU/nVZATBNkZpOb9M2v+Jt0xfXKv+LaTkbUuoUzvJp nO3QZ7ly/KCa4g+XhENmW/hNtQwLrqfxlOTbfTcMsQ== X-Google-Smtp-Source: ABdhPJy1teoOcplIoecY6XJWsI8WCXiHgBUGYMbjSAer5jH1/sDxqknIxITCm7lTd42dJNByMHTNZLCp2Rd+gxQxTQw= X-Received: by 2002:a2e:a58a:: with SMTP id m10mr5191146ljp.346.1591380651155; Fri, 05 Jun 2020 11:10:51 -0700 (PDT) MIME-Version: 1.0 From: Steve Sprang Date: Fri, 5 Jun 2020 11:10:40 -0700 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=steve.sprang@gmail.com; helo=mail-lj1-x231.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 870b1541e78ad172fa39ac76e968837bc33624fe Mon Sep 17 00:00:00 2001 From: Steve Sprang Date: Fri, 5 Jun 2020 11:05:06 -0700 Subject: [PATCH] gnu: openscad: Add patch to fix build. * gnu/packages/engineering.scm (openscad): Use it. * gnu/packages/patches/openscad-parser-boost-1.72.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/engineering.scm | 5 +++- .../patches/openscad-parser-boost-1.72.patch | 26 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openscad-parser-boost-1.72.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01ec893310..05b9c5b8d4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1328,6 +1328,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ + %D%/packages/patches/openscad-parser-boost-1.72.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2102f8d295..fab3ee0261 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2263,7 +2263,10 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") ".src.tar.gz")) (sha256 (base32 - "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")))) + "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")) + (patches + (search-patches + "openscad-parser-boost-1.72.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) diff --git a/gnu/packages/patches/openscad-parser-boost-1.72.patch b/gnu/packages/patches/openscad-parser-boost-1.72.patch new file mode 100644 index 0000000000..35311e6173 --- /dev/null +++ b/gnu/packages/patches/openscad-parser-boost-1.72.patch @@ -0,0 +1,26 @@ +https://github.com/openscad/openscad/commit/b6c170cc5d.patch + +From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Fri, 25 Oct 2019 15:10:26 +0000 +Subject: [PATCH] Add missing header bootlegged by Boost < 1.72 + +src/parser.y:76:6: error: no template named 'stack' in namespace 'std' +std::stack scope_stack; +~~~~~^ +--- + src/parser.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser.y b/src/parser.y +index 7f4fd56ca7..4c77c989ea 100644 +--- a/src/parser.y ++++ b/src/parser.y +@@ -46,6 +46,7 @@ + #include "printutils.h" + #include "memory.h" + #include ++#include + #include + #include "boost-utils.h" + #include "feature.h" -- 2.26.2