From patchwork Sun Apr 16 11:34:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 49192 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 602251778D; Sun, 16 Apr 2023 12:35:23 +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,T_PDS_PRO_TLD,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 31DB517785 for ; Sun, 16 Apr 2023 12:35:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1po0et-0000Fi-HC; Sun, 16 Apr 2023 07:35:03 -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 1po0es-0000FO-H9 for guix-patches@gnu.org; Sun, 16 Apr 2023 07:35:02 -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 1po0es-0006wl-6D for guix-patches@gnu.org; Sun, 16 Apr 2023 07:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1po0es-0004jS-17 for guix-patches@gnu.org; Sun, 16 Apr 2023 07:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62883] [PATCH] gnu: wfview: Update to 1.62. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Apr 2023 11:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62883 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62883@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168164489618174 (code B ref -1); Sun, 16 Apr 2023 11:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Apr 2023 11:34:56 +0000 Received: from localhost ([127.0.0.1]:50693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1po0em-0004j4-8y for submit@debbugs.gnu.org; Sun, 16 Apr 2023 07:34:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:50156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1po0ek-0004iw-D0 for submit@debbugs.gnu.org; Sun, 16 Apr 2023 07:34:54 -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 1po0ek-0000En-6g for guix-patches@gnu.org; Sun, 16 Apr 2023 07:34:54 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1po0ei-0006vn-DE for guix-patches@gnu.org; Sun, 16 Apr 2023 07:34:53 -0400 Received: by mail-wm1-x333.google.com with SMTP id o29-20020a05600c511d00b003f1739de43cso3826wms.4 for ; Sun, 16 Apr 2023 04:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681644889; x=1684236889; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=78MjSWvT/bzr+RyxDUZci7dmLkerJZHHLi0PRwopzoM=; b=fVkfS5KxoVDB/2XEA5aRBN1jSIbEfH+hqBsOE46ZMhmADpXs1G2PaltqdsRGHhhldx 16vTgzerLlZQBNhNXi+Ig2qZG8mWtXK/8OY7P7Or8kdS7ptYttgfCLXp75lsMnWV/7fA 5MazB7zo9C9h8D6tjU8KNr+mmmLnSTTafzJB44HL5IPQEVUUXbJYNjpUKNfTSNRlgy5I BLQ0ZxzUodXiD6VKv+0bvZowsQizZARHm1+lkTabbKB2yHhBoDixTv9h1ZNdpIMH9HOV ukadPAKbAi7zkjMf++AS6mSEy1z82CI7FKJRYVHObZ+GrD/4fXEBF6+IfDrif51xPblc hufg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681644889; x=1684236889; 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=78MjSWvT/bzr+RyxDUZci7dmLkerJZHHLi0PRwopzoM=; b=XL43itBTYg3DJ+VXZNXVj1D5+7cqUUnUk9GlxXrFu9nr0Kj9BecRtj8QBZcKFtHulE zvCTGpq6UAdb0dGaW94jAcolnKhA3ztKnNWhAUUAI8ai6BYX7MqnpOFlCkzwPHQWYlmy 3k/kAObI/wkrDjtNEmMeOByBci/8Am+pq33nyQ8TtbkYJdDn5wXPgNG0Su14GzMxPPZ7 kALpzoWHscIDEM+7mhrAnAiQrN0xPMn3gHdgHh3kgWuBJlNCkjr7l806VkqPB/HvOR8h jwcAeWr+BoySdm8ysgiVbpNuGWIhuAF3Fe2S8GleclgvLLUO+GT1fRSpLaq4/z0XebEP NRCA== X-Gm-Message-State: AAQBX9eeSXaTmONpGr84dWzIBb/++OWY5tZCvlAoSkybXPww/KUKiRxP U0Dx3CSD2cE4KoWwJ6htZCQ6LFH0VvU= X-Google-Smtp-Source: AKy350aUxaHJlj6mqW2gSAfQGYg/QWy8hlhrvM0qUfLkwqOyhMPclwmlf4XXe2vGa6T0/T/CMjj6vg== X-Received: by 2002:a7b:ca59:0:b0:3ef:5a4f:430 with SMTP id m25-20020a7bca59000000b003ef5a4f0430mr8999263wml.11.1681644889198; Sun, 16 Apr 2023 04:34:49 -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 i15-20020a5d630f000000b002f27dd92643sm7771108wru.99.2023.04.16.04.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 04:34:48 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 16 Apr 2023 12:34:45 +0100 Message-Id: <20230416113445.19615-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::333; envelope-from=sharlatanus@gmail.com; helo=mail-wm1-x333.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, T_PDS_PRO_TLD=0.01, T_SCC_BODY_TEXT_LINE=-0.01 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 (wfview): Update to 1.62. Use Gexp, shift order of components. [inputs]: Add hidapi, qtgamepad. --- gnu/packages/radio.scm | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 8192aefb0f..02509ea146 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2591,7 +2591,7 @@ (define-public inspectrum (define-public wfview (package (name "wfview") - (version "1.50") + (version "1.62") (source (origin (method git-fetch) @@ -2600,37 +2600,46 @@ (define-public wfview (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1djgn1z4hibzci53mrvskz47jfq6hk8lhhqckpa93pvsi9kadl4k")))) + (base32 "0rrj6h5k8plq4m6fd2yxargfhqcwkxv6bdp4rmgh6bs4prl4wvwd")))) (build-system qt-build-system) + (arguments + (list + #:tests? #f ; No test suite. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "wfview.pro" + (("\\.\\./wfview/") + "../")) + (substitute* '("wfmain.cpp") + (("/usr/share") + (string-append #$output "/share"))))) + (replace 'configure + (lambda _ + (mkdir-p "build") + (chdir "build") + (invoke "qmake" + (string-append "PREFIX=" #$output) + "../wfview.pro")))))) + ;; XXX: During the build it complains on missing git and hostname commands + ;; but it successfully finishes the build. (inputs (list eigen + hidapi opus portaudio pulseaudio qcustomplot + ;; TODO: Needs to be renamed to qtgamepad-5 when version 6 is + ;; packed. + qtgamepad qtbase-5 qtmultimedia-5 + ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is + ;; packed. qtserialport rtaudio)) - (arguments - `(#:tests? #f ; No test suite. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "wfview.pro" - (("\\.\\./wfview/") - "../")) - (substitute* '("wfmain.cpp") - (("/usr/share") - (string-append (assoc-ref outputs "out") "/share"))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p "build") - (chdir "build") - (invoke "qmake" - (string-append "PREFIX=" (assoc-ref outputs "out")) - "../wfview.pro")))))) (home-page "https://wfview.org/") (synopsis "Software to control Icom radios") (description