From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iP4uGPU0eGfdCgAA62LTzQ:P1 (envelope-from ) for ; Fri, 03 Jan 2025 19:05:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iP4uGPU0eGfdCgAA62LTzQ (envelope-from ) for ; Fri, 03 Jan 2025 20:05:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fUsePHLH; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735931125; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Su4BjzdkWLGydOWnx1QWsX/FIw48uN1Bz3JvaMZiVFc=; b=hRx6tHd9ocyfMeuYf/06BL5LHt8apxO4MeHBskiziYRvP2h+56BC9jSGp2CDCPb5ptYuCZ Y2MneSGCkOKoD1U/rJi+fl00MxRHXdJdW0oGMOoepJxwYfG7UECmWpuYvIGCb9sCRrslao +FHk/LZyCaYe0X7Yh5zz/WJEYzjpTg5jrXF3hXpv352+4F3QUo5ikMRKRblY1N54Azk5aY IYjxr2bnt/bT2cnP250CQqeLygpQnDZYUgf5bJNMPDN6o0AaLQ6IdBY9NBdHVTgNeSVcGI PEOCdK0H171IYvqejm5c7OMrjNA9/Bp7T1gE//ukVSz496Qaebo8cBsMBJCoig== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fUsePHLH; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735931125; a=rsa-sha256; cv=none; b=iohHQ+jo4vxdztOn6pEgoIec00oXvajpOfNdyiV8uNx7sqDwvixMSKyiEjB0+4HciNcKMI xdszReFYyhmaehIO8l2nG1joRSHYBN4YBLLNnI/EITLDvtheyKjKJfYTO0DQFbgKOO4Uiv ART8jrBIda13SmPqgBCrC9MRTpaxu2b2Kr1MV1mRPfMyW38oIe3LMwZ1Jsibf/9lQiQqAw zNiMf9fvyXJfa7v7Ul5kmwBqH0Z868at2gAlxE5Rq1LD7t2AvSIf7hMrKetLnifoAfgu5s 0t7qkL1e3gONvVyP+kznqVUPHfpNQQGYGCp+vgeUposplBF2WU9qEpJjZvoUcQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3D9BB7B57F for ; Fri, 03 Jan 2025 20:05:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTmyx-0003Li-Q1; Fri, 03 Jan 2025 14:05:16 -0500 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 1tTmyl-0003LF-Mn for guix-patches@gnu.org; Fri, 03 Jan 2025 14:05:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tTmyk-0004s0-R6 for guix-patches@gnu.org; Fri, 03 Jan 2025 14:05:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=Su4BjzdkWLGydOWnx1QWsX/FIw48uN1Bz3JvaMZiVFc=; b=fUsePHLH9Tl1ijl6nRqIN0g75RNueYZSeWmdO8UlqBrhGLjWHihTPlhSghGNA49LBcscOiPEiEzRFVk72GsXzVWLqV1N2TsE2zW1W+8t5msKxfVy7zTUQxG9ZhQOCgV/ywpd8EQE2RgZJSEGcerED5SdLWKQ53+AtQmLTzmnVbmwTZrCfHe8TOLSRtE8HclxYGAZ+vgUcj9hy0uQuHrXEdxvorD1uMgeHcN2YmrgB4TfLv2SVKs4gzuzE2TJIJYLS1PaUpkkBq8M2AWxuo/ivF6K0kxQczwzmMZkrO6/rDUApalyWHOvLnTSL2V4FDfRNBzzXMAob1sxACogQExoSw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTmyk-00028m-J5 for guix-patches@gnu.org; Fri, 03 Jan 2025 14:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#72541] [PATCH] gnu: gerbv: Fix missing version. References: <87sevdoqh8.fsf@pisemsky.site> In-Reply-To: <87sevdoqh8.fsf@pisemsky.site> Resent-From: Evgeny Pisemsky Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jan 2025 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72541 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72541@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 72541-submit@debbugs.gnu.org id=B72541.17359310868177 (code B ref 72541); Fri, 03 Jan 2025 19:05:02 +0000 Received: (at 72541) by debbugs.gnu.org; 3 Jan 2025 19:04:46 +0000 Received: from localhost ([127.0.0.1]:52092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTmyQ-00027b-SM for submit@debbugs.gnu.org; Fri, 03 Jan 2025 14:04:46 -0500 Received: from sofi-shared.hosting.energy ([2001:41d0:602:1f56::]:41910 helo=sofi.hosting.energy) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tTmyN-000275-Lk for 72541@debbugs.gnu.org; Fri, 03 Jan 2025 14:04:40 -0500 Received: from [212.233.84.7] (helo=laptop) by sofi.hosting.energy with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1tTmyG-00043L-HP; Fri, 03 Jan 2025 22:04:32 +0300 From: Evgeny Pisemsky Date: Fri, 03 Jan 2025 22:04:30 +0300 Message-ID: <874j2fhg75.fsf@pisemsky.site> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -8.26 X-Spam-Score: -8.26 X-Migadu-Queue-Id: 3D9BB7B57F X-TUID: TTQqBFMRjB+a --=-=-= Content-Type: text/plain I tried to contact upstream, but they don't accept pull requests: - https://github.com/gerbv/gerbv/issues/244 - https://github.com/gerbv/gerbv/pull/226#issuecomment-2566103734 So it can only be done here. I updated initial patch with suggested configure flags and commented why git is added to native inputs. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-gerbv-Fix-missing-version.patch Content-Transfer-Encoding: quoted-printable >From f85ab2e24f0da292f639c07f4d66430896b18d13 Mon Sep 17 00:00:00 2001 Message-ID: From: Evgeny Pisemsky Date: Fri, 3 Jan 2025 21:40:01 +0300 Subject: [PATCH] gnu: gerbv: Fix missing version. * gnu/packages/engineering.scm (gerbv): Fix missing version. [source]: Change indentation. [arguments]: Set correct configure flags, patch version generator shebang. Change-Id: I29a38fff03127d9ce2b5e04ca638dacfc3720125 --- gnu/packages/engineering.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a5a91e62e9..5b43f8787e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -27,7 +27,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021, 2022 Petr Hodina ;;; Copyright =C2=A9 2021 Foo Chuan Wei -;;; Copyright =C2=A9 2022 Evgeny Pisemsky +;;; Copyright =C2=A9 2022, 2025 Evgeny Pisemsky ;;; Copyright =C2=A9 2022 Olivier Dion ;;; Copyright =C2=A9 2022 Peter Polidoro ;;; Copyright =C2=A9 2022 Malte Frank Gerdes @@ -837,22 +837,32 @@ (define-public gerbv (package (name "gerbv") (version "2.10.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gerbv/gerbv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gerbv/gerbv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("CFLAGS=3D-fcommon"))) + (list + #:configure-flags #~(list "CFLAGS=3D-O2 -g -fcommon") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-version-generator + (lambda _ + (substitute* "utils/git-version-gen.sh" + (("/bin/bash") + (which "bash")))))))) (native-inputs (list autoconf automake desktop-file-utils gettext-minimal + ;; Version generator needs git to work properly: + ;; https://github.com/gerbv/gerbv/issues/244 + git `(,glib "bin") libtool pkg-config)) base-commit: ce3ffac5d366ebf20e0d95779f2fe1ea6dde0202 --=20 2.47.1 --=-=-=--