From patchwork Mon Jun 14 04:12:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 163 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 375DB27BC81; Mon, 14 Jun 2021 05:13:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0262027BC78 for ; Mon, 14 Jun 2021 05:13:10 +0100 (BST) Received: from localhost ([::1]:51234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsdyG-0004l9-UV for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 00:13:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsdyA-0004jz-Qo for guix-patches@gnu.org; Mon, 14 Jun 2021 00:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsdyA-0004pG-Av for guix-patches@gnu.org; Mon, 14 Jun 2021 00:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsdyA-0004kd-5G for guix-patches@gnu.org; Mon, 14 Jun 2021 00:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49014] [PATCH 0/2] Add tlf Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 04:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49014@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162364395118222 (code B ref -1); Mon, 14 Jun 2021 04:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2021 04:12:31 +0000 Received: from localhost ([127.0.0.1]:44650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsdxf-0004jq-CJ for submit@debbugs.gnu.org; Mon, 14 Jun 2021 00:12:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:38150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsdxd-0004jh-Ad for submit@debbugs.gnu.org; Mon, 14 Jun 2021 00:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsdxd-0004Kt-53 for guix-patches@gnu.org; Mon, 14 Jun 2021 00:12:29 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:36568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsdxZ-0004P1-Kp for guix-patches@gnu.org; Mon, 14 Jun 2021 00:12:28 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lsdxY-0004Cp-Kh for guix-patches@gnu.org; Mon, 14 Jun 2021 00:12:24 -0400 Date: Mon, 14 Jun 2021 00:12:23 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Received-SPF: pass client-ip=104.248.1.95; envelope-from=jackhill@jackhill.us; helo=minsky.hcoop.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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" X-getmail-retrieved-from-mailbox: Patches This series adds a package for Tlf, an amateur (ham) radio logging program. Some things to note: Tlf depends on hamlib, which has `Requires.private: libusb-1.0` in its pkg-config file. Tlf fails to build if libusb is not present in its build environment. I saw two options for resolving this: 1) add libusb as an input for tlf or 2) propagate libusb from hamlib. I chose the latter, but I'm not sure if that's the right choice as hamlib also provides binaries, so folks might want to install it in their profiles in addition to using it as a library. The released version of Tlf doesn't work with our packaged version of hamlib because hamlib made a breaking change in the name of one of their macros. I added a patch from newer Tlf commits that works around this by adding some indirection. I tested that it builds reproducably on x86_64-linux, and that it builds emulated aarch64-linux and armhf-linux. I was happy to see, especially on armhf, that I didn't run into the problem that caused Debian to add a patch: https://salsa.debian.org/debian-hamradio-team/tlf/-/blob/8a0cbff093ac8846aa73ff012668b55628056ef4/debian/patches/979377-test-cabrillo Jack Hill (2): gnu: hamlib: Make libusb a propagated input. gnu: Add tlf. gnu/local.mk | 1 + .../patches/tlf-support-hamlib-4.2+.patch | 66 +++++++++++++++++++ gnu/packages/radio.scm | 64 +++++++++++++++++- 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/tlf-support-hamlib-4.2+.patch