From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 62822@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#62822] [PATCH] gnu: js8call: Improve package style.
Date: Thu, 13 Apr 2023 23:27:14 +0100 [thread overview]
Message-ID: <20230413222714.9232-1-sharlatanus@gmail.com> (raw)
* gnu/packages/radio.scm (js8call):
Use Gexp and shift order of components.
[tests]: Enable them.
[arguments]<phases>: 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 <styang@fastmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Ryan Tolboom <ryan@using.tech>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; 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/<build-name>.drv-<num> 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
--
2.39.2
next reply other threads:[~2023-04-13 22:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 22:27 Sharlatan Hellseher [this message]
2023-04-14 12:31 ` bug#62822: [PATCH] gnu: js8call: Improve package style Guillaume Le Vaillant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230413222714.9232-1-sharlatanus@gmail.com \
--to=sharlatanus@gmail.com \
--cc=62822@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).