From patchwork Mon Nov 4 11:24:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 15959 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 651361769D; Mon, 4 Nov 2019 11:25:36 +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,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 1A92317659 for ; Mon, 4 Nov 2019 11:25:36 +0000 (GMT) Received: from localhost ([::1]:59706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRaUJ-0007oq-L9 for patchwork@mira.cbaines.net; Mon, 04 Nov 2019 06:25:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60815) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRaTq-0007hd-0N for guix-patches@gnu.org; Mon, 04 Nov 2019 06:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRaTn-0007iy-Gg for guix-patches@gnu.org; Mon, 04 Nov 2019 06:25:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRaTn-0007ih-BM for guix-patches@gnu.org; Mon, 04 Nov 2019 06:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iRaTn-0005ny-5V for guix-patches@gnu.org; Mon, 04 Nov 2019 06:25:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38052] [PATCH 2/3] gnu: kicad: Update to 5.1.4. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2019 11:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 38052@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 38052-submit@debbugs.gnu.org id=B38052.157286668022244 (code B ref 38052); Mon, 04 Nov 2019 11:25:03 +0000 Received: (at 38052) by debbugs.gnu.org; 4 Nov 2019 11:24:40 +0000 Received: from localhost ([127.0.0.1]:35923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRaTQ-0005mf-2J for submit@debbugs.gnu.org; Mon, 04 Nov 2019 06:24:40 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:41092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRaTF-0005lu-OC for 38052@debbugs.gnu.org; Mon, 04 Nov 2019 06:24:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ben6neX4rrH5RVIae5TwLwmZUfwOQkRzu9098VZFUq8=; b=Ecb/14a+EYVewahhcKYN0KQP9k MKzaezV2Ji0xeapnon3mUnIG/o143KfzUM4hlBAna+gm+JvbaK7MisByOtONKnJhE8NCW6xtzoBO0 vFIxPz0LncvAX+eM3JAkIpdLZ35u9EeZ6h6aea2YeyxEFNSAKA1BjnTUEr30Ww5Qpr6I=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1iRaTC-001PWx-A2; Mon, 04 Nov 2019 16:54:26 +0530 From: Arun Isaac Date: Mon, 4 Nov 2019 16:54:16 +0530 Message-Id: <20191104112418.10030-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104112418.10030-1-arunisaac@systemreboot.net> References: <20191104112418.10030-1-arunisaac@systemreboot.net> MIME-Version: 1.0 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 * gnu/packages/engineering.scm (kicad): Update to 5.1.4. [arguments]: Remove unrecognized flags and flags that are redundant because they specify default values. Use python 3 and the "Phoenix" version of wxPython. Enable the GitHub plugin for pcbnew. Remove adjust-boost-include phase. [inputs]: Replace python-2 with python, wxwidgets-gtk2 with wxwidgets and python2-wxpython with python-wxpython. --- gnu/packages/engineering.scm | 41 +++++++++--------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d1626f0342..2c5ae53317 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -767,48 +767,27 @@ language.") (define-public kicad (package (name "kicad") - (version "5.0.2") + (version "5.1.4") (source (origin (method url-fetch) (file-name (string-append name "-" version ".tar.xz")) (uri (string-append - "https://launchpad.net/kicad/" (version-major+minor version) - "/" version "/+download/kicad-" version ".tar.xz")) + "https://launchpad.net/kicad/" (version-major version) + ".0/" version "/+download/kicad-" version ".tar.xz")) (sha256 - (base32 "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g")))) + (base32 "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t #:tests? #f ; no tests #:build-type "Release" #:configure-flags - (list "-DKICAD_STABLE_VERSION=ON" - "-DKICAD_REPO_NAME=stable" - "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_WXPYTHON=ON" - ;; Has to be set explicitly, as we don't have the wxPython - ;; headers in the wxwidgets store item, but in wxPython. - (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "wxpython") - "/include/wx-" - ,(version-major+minor - (package-version python2-wxpython))) - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" - "-DKICAD_SPICE=TRUE" - ;; TODO: Enable this when CA certs are working with curl. - "-DBUILD_GITHUB_PLUGIN=OFF") + (list "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") #:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-boost-include - (lambda _ - ;; The location of this header changed in Boost 1.66. - (substitute* "3d-viewer/3d_cache/3d_cache.cpp" - (("boost/uuid/sha1\\.hpp") - "boost/uuid/detail/sha1.hpp")) - #t)) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -845,9 +824,9 @@ language.") ("mesa" ,mesa) ("opencascade-oce" ,opencascade-oce) ("openssl" ,openssl) - ("python" ,python-2) - ("wxwidgets" ,wxwidgets-gtk2) - ("wxpython" ,python2-wxpython))) + ("python" ,python) + ("wxwidgets" ,wxwidgets) + ("wxpython" ,python-wxpython))) (home-page "http://kicad-pcb.org/") (synopsis "Electronics Design Automation Suite") (description "Kicad is a program for the formation of printed circuit