From patchwork Fri Jan 3 19:04:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Evgeny Pisemsky X-Patchwork-Id: 36414 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 8A36F27BBE9; Fri, 3 Jan 2025 19:05:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,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 2783227BBE2 for ; Fri, 3 Jan 2025 19:05:25 +0000 (GMT) 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 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 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. 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 © 2021 Ivan Gankevich ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 Foo Chuan Wei -;;; Copyright © 2022 Evgeny Pisemsky +;;; Copyright © 2022, 2025 Evgeny Pisemsky ;;; Copyright © 2022 Olivier Dion ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 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=-fcommon"))) + (list + #:configure-flags #~(list "CFLAGS=-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 -- 2.47.1