From patchwork Sun Jan 9 22:45:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 36199 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 905B627BBE9; Sun, 9 Jan 2022 22:47:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E15B617A09 for ; Sun, 9 Jan 2022 22:47:13 +0000 (GMT) Received: from localhost ([::1]:39984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6gy1-0001ql-0C for patchwork@mira.cbaines.net; Sun, 09 Jan 2022 17:47:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6gxr-0001qa-4T for guix-patches@gnu.org; Sun, 09 Jan 2022 17:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6gxq-0001rU-S5 for guix-patches@gnu.org; Sun, 09 Jan 2022 17:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6gxq-0006ko-JT for guix-patches@gnu.org; Sun, 09 Jan 2022 17:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53149] Update Kicad to 6.0.0 Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 22:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 53149@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164176837125903 (code B ref -1); Sun, 09 Jan 2022 22:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2022 22:46:11 +0000 Received: from localhost ([127.0.0.1]:51510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6gx0-0006jj-P0 for submit@debbugs.gnu.org; Sun, 09 Jan 2022 17:46:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:41626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6gww-0006ja-Rf for submit@debbugs.gnu.org; Sun, 09 Jan 2022 17:46:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6gww-0001fe-K6 for guix-patches@gnu.org; Sun, 09 Jan 2022 17:46:06 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:58121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6gwr-0001oy-W3 for guix-patches@gnu.org; Sun, 09 Jan 2022 17:46:06 -0500 Date: Sun, 09 Jan 2022 22:45:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1641768351; bh=rJQOcQA6cb9ivOLE5KMlr2ioXq9H4w+XeXJmVlNw4cc=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=jQNDxk6gPrGBYpIf6hUm+1M/xKmtYsPmX0K/KryZGL/vQGe4XVnqtq6a8w0x7X7VG WTLcm2YymN6d1L5ElrkLkciE0yfJgaFz0bRJBbrqDfZIjCz1JxuS67lUinLyDV6oor 8674s7dxr7R7RlM2XVwz47JOUwa/y07L6LJ81B7hc+nxNoKajI32LOnYzu3K5BowT+ p/BPvCm1zGmHIZ3y9LNEPNLOIqASnNl6KhndwXoV7zk0eLQkwh3X2KiTChQqwpos6B D8E4UR7RTMaFKpWFVEGilNdPk7+127umEwLytxJbmRnpssiNEZVEDNxdlx9ndH/HCk cdLQZ5MUmVdag== Message-ID: <19pc1sQZe7q77dBcvmMFNJ3D1N3AZxoRrMmkEg03_fFRK_E67EDc8aCaJNmfvr1pAjyQ8uxVyJugXe3SZFFBD5367YWTYLnqvoSGCRVs9mw=@protonmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=phodina@protonmail.com; helo=mail-4322.protonmail.ch 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, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, this patch series updates Kicad to version 6.0.0. Guix lint shows newer version 6.99.0 but that's intended for development of the next major release. The list of changes are described here [1]. [1] https://www.kicad.org/blog/2021/12/KiCad-6.0.0-Release/ ---- Petr From 78751a56340b9cd3e267c67dbda920c0316a642d Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 9 Jan 2022 23:04:57 +0100 Subject: [PATCH 2/3] gnu: kicad: Update to 6.0.0. * gnu/packages/engineering.scm (kicad): Update to 6.0.0. [native-inputs]: Remove kicad-i18n. Use new syntax. [inputs]: Add bash-minimal, gtk+ and use opencascade-occt instead of opencascade-oce. Use new syntax. [arguments]: Remove phase install-translations. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index eec835f97c..d5a44cf648 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -64,6 +64,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -925,7 +926,7 @@ (define-public inspekt3d (define-public kicad (package (name "kicad") - (version "5.1.10") + (version "6.0.0") (source (origin (method git-fetch) @@ -933,7 +934,7 @@ (define-public kicad (url "https://gitlab.com/kicad/code/kicad.git") (commit version))) (sha256 - (base32 "10ix560bqy0lprnik1bprxw9ix4g8w2ipvyikx551ak9ryvgwjcc")) + (base32 "1jrfwyi4zs0rpcpsj01z6687a433nnr56cxbnz12jfg2yafpxk23")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -942,6 +943,8 @@ (define-public kicad #:build-type "Release" #:configure-flags (list "-DKICAD_SCRIPTING_PYTHON3=ON" + (string-append "-DOCC_INCLUDE_DIR=" (assoc-ref %build-inputs + "opencascade-occt") "/include/opencascade") "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") #:phases @@ -963,11 +966,6 @@ (define-public kicad (substitute* "common/lib_tree_model.cpp" (("#include " all) (string-append "#include \n" all))))) - (add-after 'install 'install-translations - (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "kicad-i18n") - (assoc-ref outputs "out")) - #t)) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -1003,27 +1001,28 @@ (define-public kicad (variable "KISYS3DMOD") ; 3D model path (files '("share/kicad/modules/packages3d"))))) (native-inputs - `(("boost" ,boost) - ("desktop-file-utils" ,desktop-file-utils) - ("gettext" ,gettext-minimal) - ("kicad-i18n" ,kicad-i18n) - ("pkg-config" ,pkg-config) - ("swig" ,swig) - ("zlib" ,zlib))) + (list boost + desktop-file-utils + gettext-minimal + pkg-config + swig + zlib)) (inputs - `(("cairo" ,cairo) - ("curl" ,curl) - ("glew" ,glew) - ("glm" ,glm) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("libngspice" ,libngspice) - ("libsm" ,libsm) - ("mesa" ,mesa) - ("opencascade-oce" ,opencascade-oce) - ("openssl" ,openssl) - ("python" ,python-wrapper) - ("wxwidgets" ,wxwidgets) - ("wxpython" ,python-wxpython))) + (list bash-minimal + cairo + curl + glew + glm + hicolor-icon-theme + libngspice + libsm + mesa + opencascade-occt + openssl + python-wrapper + gtk+ + wxwidgets + python-wxpython)) (home-page "https://www.kicad.org/") (synopsis "Electronics Design Automation Suite") (description "Kicad is a program for the formation of printed circuit -- 2.34.0