From patchwork Wed Dec 18 14:24:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 16555 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 AA96D1793C; Wed, 18 Dec 2019 14:25:11 +0000 (GMT) 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,HTML_MESSAGE, 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 5DDCA17939 for ; Wed, 18 Dec 2019 14:25:11 +0000 (GMT) Received: from localhost ([::1]:54990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihaGE-0007kv-QE for patchwork@mira.cbaines.net; Wed, 18 Dec 2019 09:25:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48321) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihaG7-0007kd-N2 for guix-patches@gnu.org; Wed, 18 Dec 2019 09:25:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihaG6-0002GU-Bc for guix-patches@gnu.org; Wed, 18 Dec 2019 09:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihaG6-0002Et-4e for guix-patches@gnu.org; Wed, 18 Dec 2019 09:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ihaG5-0002ZG-V2 for guix-patches@gnu.org; Wed, 18 Dec 2019 09:25:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38659] [PATCH] Fix FreeCAD dependencies. Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Dec 2019 14:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38659 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38659@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15766790629815 (code B ref -1); Wed, 18 Dec 2019 14:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2019 14:24:22 +0000 Received: from localhost ([127.0.0.1]:42782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ihaFS-0002YF-Bz for submit@debbugs.gnu.org; Wed, 18 Dec 2019 09:24:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:41584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ihaFP-0002Y6-C5 for submit@debbugs.gnu.org; Wed, 18 Dec 2019 09:24:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41290) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihaFN-0007ff-Iv for guix-patches@gnu.org; Wed, 18 Dec 2019 09:24:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihaFK-0006G9-TJ for guix-patches@gnu.org; Wed, 18 Dec 2019 09:24:16 -0500 Received: from mail-vs1-xe2f.google.com ([2607:f8b0:4864:20::e2f]:46426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihaFK-00067s-95 for guix-patches@gnu.org; Wed, 18 Dec 2019 09:24:14 -0500 Received: by mail-vs1-xe2f.google.com with SMTP id t12so1462374vso.13 for ; Wed, 18 Dec 2019 06:24:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=JykqJ02pqDeONRnu918ftrfJLJbeGSr5VqPWnKuUMJM=; b=LjTZungRLZ7frgPIVY5mqjwB8yIMxj7qHnz7hl5gpWIVMcQWbLhpKEWMWXK2QAV+oL Ag6TI2fH08GBp5tNaMoPq9jpndpHc4sZSxiHylLZJdWc2+/NXin17PMjshL6utN96J56 ZhoSTNxTckb7fHZQ02Sffe/AvrsZlQcFnqUVeFRROQz1Y0pQ+GWyie8aI5E2AWZWwS5G KtCBPSiPMmmBAbHEEUkrITOWpXIC/Aeyl7L0RPWTK4ZFu/kpX67egFf3lz+FMGjhX5vG UxDV74W48HDqkPBSBT9tCn+c9GNaN8XKh7ETLPeIsegN+B89Kp79lsS1rDAUzFovq6Th grug== 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=JykqJ02pqDeONRnu918ftrfJLJbeGSr5VqPWnKuUMJM=; b=ivMC4DMBfBcrEAYPZC4daEPHfeXt9caU7sX1qGCxn15r70HOd95/PCfdluQbAzV/TE NcYTOiI/eFAzqCaLpNYdy5XDq1TsFU/79Auk8R+KBXg3CnNH/O5q2wjhl3Md/+Vbf4vY xrJPEkISVZAS6czooFYu5csz6re3oBVoffbGmYMwPbbqPoPfTCGkS0OqzEgf03HFjxGg BV7QJV8gw1/9cmNEONIBY7v6y5ALrMMFF9lm6U58qav+NpoiuCK1KpASdgNNQClxVN+n +1vXWFcaSlt/cmA41EA+E853vzhEkXV+O0i12LAkmg+cjnAwDBCyutZN9nlbuIUC9Bnm /JSA== X-Gm-Message-State: APjAAAUBmAwq/dh+eKqUDtA434RYpqvGHTnqXwa53IIRpPGalvmK2TUi v3r/qqKGYPH7jzx6yDsbsX7J3LmyfPKanTx9Z6e0j9/X X-Google-Smtp-Source: APXvYqxlyR5oUY54KzjCidK5N1qpb/r8ppFw4N5BvRsjLpN6wNq+6jIpMe04Vj1k8ARxHuIpQEIcsXNSdq8tadG42ys= X-Received: by 2002:a67:e9cc:: with SMTP id q12mr1497365vso.189.1576679052739; Wed, 18 Dec 2019 06:24:12 -0800 (PST) MIME-Version: 1.0 From: John Soo Date: Wed, 18 Dec 2019 14:24:01 +0000 Message-ID: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi all, Since the addition of clang-toolchain, python-shiboken-2 and python-pyside-2 have had failing builds. This patchset updates them to use clang-toolchain. - John From 12a0469ca8c3f30426c709872562922cc3e0237b Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 18 Dec 2019 06:21:00 -0800 Subject: [PATCH 1/2] gnu: Fix python-shiboken-2. * gnu/packages/qt.scm (python-shiboken-2): Update inputs. --- gnu/packages/qt.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c0d652a407..747d5437e2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2107,8 +2107,7 @@ color-related widgets.") "0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5")))) (build-system cmake-build-system) (inputs - `(("llvm-6" ,llvm-6) - ("clang-6" ,clang-6) + `(("clang-toolchain" ,clang-toolchain-6) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("python-wrapper" ,python-wrapper) @@ -2124,7 +2123,7 @@ color-related widgets.") (lambda _ (chdir "sources/shiboken2") #t)) (add-before 'configure 'set-build-env (lambda* (#:key inputs #:allow-other-keys) - (let ((llvm (assoc-ref inputs "llvm-6"))) + (let ((llvm (assoc-ref inputs "clang-toolchain"))) (setenv "CLANG_INSTALL_DIR" llvm) #t)))))) (home-page "https://wiki.qt.io/Qt_for_Python") -- 2.24.0