From patchwork Thu Apr 13 22:27:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 49148 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 46F7117534; Thu, 13 Apr 2023 23:28:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CCEC717529 for ; Thu, 13 Apr 2023 23:28:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pn5QC-000631-Kb; Thu, 13 Apr 2023 18:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pn5QB-00062r-GR for guix-patches@gnu.org; Thu, 13 Apr 2023 18:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pn5QB-000838-8Q for guix-patches@gnu.org; Thu, 13 Apr 2023 18:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pn5QA-0005Io-NH for guix-patches@gnu.org; Thu, 13 Apr 2023 18:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62822] [PATCH] gnu: js8call: Improve package style. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2023 22:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62822 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62822@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168142484520333 (code B ref -1); Thu, 13 Apr 2023 22:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2023 22:27:25 +0000 Received: from localhost ([127.0.0.1]:44990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn5PY-0005Hs-Dm for submit@debbugs.gnu.org; Thu, 13 Apr 2023 18:27:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:55996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pn5PW-0005Hk-Gq for submit@debbugs.gnu.org; Thu, 13 Apr 2023 18:27:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pn5PV-0005zh-VX for guix-patches@gnu.org; Thu, 13 Apr 2023 18:27:21 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pn5PU-0007z0-1y for guix-patches@gnu.org; Thu, 13 Apr 2023 18:27:21 -0400 Received: by mail-wr1-x42a.google.com with SMTP id j11so19311777wrd.2 for ; Thu, 13 Apr 2023 15:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681424838; x=1684016838; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CCSqlBTqI1MmXr7SAX7MzlEsix0007jcb+/Hn31YsL4=; b=lmddzwxPqkkMSEqb63KgtuZAmRnq+cf360h7SWNdq05aSS8e0yn2NaWusLF/vhfe+F Jumf3uKo+zsCgAM1mhseXCg4ves6JrTJ5r1TkkK36y7C8BT195xyeRVsSLA1CPKKpJgH a0ijuOuchvd88nQf57SDU84i5REvRgLq0KSkbjjFHp4YZB8CIDGheu/dXf5sa7RZWIsM jhAhqoyyESlDlB6Uhye9EdUazkSP10fRyEx8kieGwBlTnMt1rV0nTRpkqxyTPQyuo60X 9U/bmmx2PMQ6bLaQzvvUDgxGKTxEjJV0Hbk7EwXPheAD/WzTbDmcIxGYOn6kzghvpcFb 89EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681424838; x=1684016838; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CCSqlBTqI1MmXr7SAX7MzlEsix0007jcb+/Hn31YsL4=; b=cLzrLDgoVXehXdPjTKKQG1mZuICrnzbtR4XixHMUYdoPTAaQLxhPfjJclbmh2+Xu8l oh4ZYihfl9jsI5Yuwvsblf+pBXOAAcNBTBrr1wsgHctu/sKRJ5i+mbxM7C/hdIbWlsvG MAWaM71XZKn77RZOz45d72A8bNuBpsKbErG12j2rHkMqnoH75Zgqi3hPUVFvJhQkrM5E RnmitxkhS0ThuV2NsZYIRa2wGzgC7Q/XmspmzdgcYaGSQE7zY105asq5RbPT4ggVxJaP IZntugJxS4jqVnnefbpJ3NssCn0W22yBcrCdQkTU/FDytKvcDTD1d6BSLoxJ3J3jPND4 EpSg== X-Gm-Message-State: AAQBX9eJAfxu9tlgQtcsWOzjbYt8d20+wt8YRatRuXJjTJyCJwIGDr67 89hWxpNiGbN+OSlCRacyIpPO47nL0fk= X-Google-Smtp-Source: AKy350aestim20Ic19E0J7X3BbhUTkAhdisiZNUEA9O/RE8pvWNqS2CfK9ardM/Ls3IAVmqQMUim3g== X-Received: by 2002:a5d:654c:0:b0:2cf:2dcc:3421 with SMTP id z12-20020a5d654c000000b002cf2dcc3421mr2389590wrv.5.1681424837811; Thu, 13 Apr 2023 15:27:17 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id z13-20020a5d44cd000000b002e61e002943sm2125691wrr.116.2023.04.13.15.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 15:27:16 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 13 Apr 2023 23:27:14 +0100 Message-Id: <20230413222714.9232-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=sharlatanus@gmail.com; helo=mail-wr1-x42a.google.com 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_HELO_NONE=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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/radio.scm (js8call): Use Gexp and shift order of components. [tests]: Enable them. [arguments]: In fix-paths phase add more steps to modify test script. Replace check phase with in-project script. [native-inputs]: Remove labels. [inputs]: As above. --- gnu/packages/radio.scm | 83 +++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c589f95954..6f8b2ec9f7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2022 Sheng Yang ;;; Copyright © 2022 Greg Hogan ;;; Copyright © 2022 Ryan Tolboom +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1603,49 +1604,63 @@ (define-public js8call (base32 "149sjwc4zg6ckgq26af93p4fxappa4k9dh7rdy67g8ajfjad4cd8")) (modules '((guix build utils))) (snippet - '(begin - ;; Delete bundled boost to use the shared one. - (delete-file-recursively "boost") - #t)))) + #~(begin + ;; Delete bundled boost to use the shared one. + (delete-file-recursively "boost"))))) (build-system qt-build-system) - (native-inputs - (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) - (inputs - `(("boost" ,boost) - ("fftw" ,fftw) - ("fftwf" ,fftwf) - ("hamlib" ,wsjtx-hamlib) - ("libusb" ,libusb) - ("qtbase" ,qtbase-5) - ("qtmultimedia-5" ,qtmultimedia-5) - ("qtserialport" ,qtserialport))) (arguments - `(#:tests? #f ; No test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("DESTINATION /usr/share") - (string-append "DESTINATION " - (assoc-ref outputs "out") - "/share"))))) - (add-after 'unpack 'fix-hamlib - (lambda _ - (substitute* "CMake/Modules/Findhamlib.cmake" - (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)") - "set (__pc_path $ENV{PKG_CONFIG_PATH}) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + ;; XXX: How to get the /tmp/.drv- path? Use + ;; output path for after install check phase instead. + (substitute* "media/tests/test" + (("~/js8call-prefix/build/js8") + (string-append #$output "/bin/js8")) + (("/opt/js8call/bin/js8") + (string-append #$output "/bin/js8"))) + (substitute* "CMakeLists.txt" + (("DESTINATION /usr/share") + (string-append "DESTINATION " #$output "/share"))))) + (add-after 'unpack 'fix-hamlib + (lambda _ + (substitute* "CMake/Modules/Findhamlib.cmake" + (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)") + "set (__pc_path $ENV{PKG_CONFIG_PATH}) list (APPEND __pc_path \"${__hamlib_pc_path}\") set (ENV{PKG_CONFIG_PATH} \"${__pc_path}\")")) - (substitute* "HamlibTransceiver.hpp" - (("#ifdef JS8_USE_LEGACY_HAMLIB") - "#if 1"))))))) + (substitute* "HamlibTransceiver.hpp" + (("#ifdef JS8_USE_LEGACY_HAMLIB") + "#if 1")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../js8call/media/tests" + (invoke "./test")))))))) + (native-inputs + (list asciidoc + gfortran + pkg-config + qttools-5 + ruby-asciidoctor)) + (inputs + (list boost + fftw + fftwf + libusb + qtbase-5 + qtmultimedia-5 + qtserialport + wsjtx-hamlib)) + (home-page "http://js8call.com/") (synopsis "Weak-signal ham radio communication program") (description "JS8Call is a software using the JS8 digital mode (a derivative of the FT8 mode) providing weak signal keyboard to keyboard messaging to amateur radio operators.") - (home-page "http://js8call.com/") (license license:gpl3))) (define-public xnec2c