From patchwork Wed Jul 3 15:30:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pisemsky X-Patchwork-Id: 65899 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 3620427BBEB; Thu, 4 Jul 2024 05:41:39 +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=1.4 required=5.0 tests=BAYES_00,FROM_SUSPICIOUS_NTLD, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 B426A27BBE2 for ; Thu, 4 Jul 2024 05:41:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPEHJ-0003R4-Oj; Thu, 04 Jul 2024 00:41:05 -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 1sPEHG-0003Q5-7l for guix-patches@gnu.org; Thu, 04 Jul 2024 00:41:02 -0400 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 1sPEHF-0007ul-HY for guix-patches@gnu.org; Thu, 04 Jul 2024 00:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPEHH-0000SW-7o for guix-patches@gnu.org; Thu, 04 Jul 2024 00:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71931] [PATCH] gnu: pcb2gcode: Fix build. Resent-From: Evgeny Pisemsky Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jul 2024 04:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71931 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71931@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17200680301695 (code B ref -1); Thu, 04 Jul 2024 04:41:03 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2024 04:40:30 +0000 Received: from localhost ([127.0.0.1]:41197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPEGk-0000RB-0w for submit@debbugs.gnu.org; Thu, 04 Jul 2024 00:40:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:43810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP1w0-0004kn-0b for submit@debbugs.gnu.org; Wed, 03 Jul 2024 11:30:17 -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 1sP1vx-0008Jh-AW for guix-patches@gnu.org; Wed, 03 Jul 2024 11:30:13 -0400 Received: from roxy-shared.hosting.energy ([137.74.182.160] helo=roxy.hosting.energy) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP1vv-0007AA-49 for guix-patches@gnu.org; Wed, 03 Jul 2024 11:30:12 -0400 Received: from [185.211.158.231] (helo=laptop) by roxy.hosting.energy with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1sP1vv-000000004A1-0uzU for guix-patches@gnu.org; Wed, 03 Jul 2024 18:30:11 +0300 From: Evgeny Pisemsky Date: Wed, 03 Jul 2024 18:30:07 +0300 Message-ID: <87h6d6v6gw.fsf@pisemsky.site> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: ClamAV 0.101.4; Wed, 03 Jul 2024 18:30:11 +0300 Received-SPF: pass client-ip=137.74.182.160; envelope-from=mail@pisemsky.site; helo=roxy.hosting.energy X-Spam_score_int: 14 X-Spam_score: 1.4 X-Spam_bar: + X-Spam_report: (1.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_SBL_CSS=3.335, SPF_HELO_FAIL=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 04 Jul 2024 00:40:26 -0400 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 This patch is related to the following issue: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68036 Tried to send it there without success, maybe because of email change. Found two issues - unspecified version in pkgconfig of gerbv and some incompatibility with optional geos library. Related discussions: - https://github.com/gerbv/gerbv/issues/130 - https://github.com/pcb2gcode/pcb2gcode/issues/626 The attached patch fixes those problems and allows to build pcb2gcode. From 2f73c340abf3df2690b3778cbf0eb1de7a63ab33 Mon Sep 17 00:00:00 2001 Message-ID: <2f73c340abf3df2690b3778cbf0eb1de7a63ab33.1720013503.git.mail@pisemsky.site> From: Evgeny Pisemsky Date: Wed, 3 Jul 2024 15:15:25 +0300 Subject: [PATCH] gnu: pcb2gcode: Fix build. * gnu/packages/engineering.scm (pcb2gcode): Fix build. Change-Id: Id9a167c8859520f6e051c9b5efb4b960d50e4b7b --- gnu/packages/engineering.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 64335d89f7..0855f44d13 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -844,7 +844,15 @@ (define-public gerbv "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("CFLAGS=-fcommon"))) + (list + #:configure-flags '(list "CFLAGS=-fcommon") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'fix-pkg-config-version + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (string-append (assoc-ref outputs "out") + "/lib/pkgconfig/libgerbv.pc") + (("^Version:.*$") + (string-append "Version: " #$version "\n")))))))) (native-inputs (list autoconf automake desktop-file-utils @@ -3257,7 +3265,8 @@ (define-public pcb2gcode (build-system gnu-build-system) (inputs (list boost - geos + ;; TODO: Try to build with geos in the following revisions. + ;; geos gerbv glibmm gtkmm-2 base-commit: bab73e413b3421f4aa051e9438d147040a52e1be -- 2.45.2