From patchwork Wed Jan 8 06:11:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 36735 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 3EAFC27BBEC; Wed, 8 Jan 2025 06:12:37 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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=ham 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 27A3127BBE2 for ; Wed, 8 Jan 2025 06:12:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVPIX-000826-UK; Wed, 08 Jan 2025 01:12:09 -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 1tVPIT-00081B-BG for guix-patches@gnu.org; Wed, 08 Jan 2025 01:12:05 -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 1tVPIR-00061p-TS for guix-patches@gnu.org; Wed, 08 Jan 2025 01:12: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:References:In-Reply-To:Date:From:To:Subject; bh=jFvh+xhW4z5+0Rat1Tgaq36K5H+ucJf0HNvvQudy+u0=; b=dwEJ2ickKVUExb6F6RGdvQz4xReuYZmDh1GISBc6woUe7Ry4fOKf0XD29IBcZy0jiQt/rUG1G1ChCbJrs9BxQ65PyuAW6uwHb6Vp97E9L/uUQsZEm8xhI59nAImBs/7Hpv0kYPzwh+Ww5M3dkR9Rm/Cg0enhexWGyQRZ3XvrU9U58oColqEQOT/CgHMgJXdi6EMCbHA8kONr5WUTD0vUqJAh3meLWCeuLscpTG4RxrPEbZfM55+c1KDCXV5KZIWz0CWSwsAaXXjsVFfzuF3wm2a8czin1jcDZs/mPKX+g8BTh0D89DpDrqEyutgAEFrWpcGdXfzJt3qrS/mZeJIRVA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVPIR-0007sx-Oz for guix-patches@gnu.org; Wed, 08 Jan 2025 01:12:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74517] [PATCH v5 03/10] gnu: zbar: Disable static and qt build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2025 06:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74517 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74517@debbugs.gnu.org Cc: ludo@gnu.org, Nicolas Graves , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 74517-submit@debbugs.gnu.org id=B74517.173631672230295 (code B ref 74517); Wed, 08 Jan 2025 06:12:03 +0000 Received: (at 74517) by debbugs.gnu.org; 8 Jan 2025 06:12:02 +0000 Received: from localhost ([127.0.0.1]:45680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVPIP-0007sO-TB for submit@debbugs.gnu.org; Wed, 08 Jan 2025 01:12:02 -0500 Received: from 4.mo583.mail-out.ovh.net ([178.33.111.247]:37923) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVPIM-0007rk-F8 for 74517@debbugs.gnu.org; Wed, 08 Jan 2025 01:11:59 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.109.140.166]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4YScy46BKjz1RbF for <74517@debbugs.gnu.org>; Wed, 8 Jan 2025 06:11:56 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-q6vm2 (unknown [10.108.54.10]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 733531FE84; Wed, 8 Jan 2025 06:11:56 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-5b5ff79f4f-q6vm2 with ESMTPSA id +y+sDCwXfmfYbAEANBBP8Q (envelope-from ); Wed, 08 Jan 2025 06:11:56 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G00224052126-4fb5-44c2-a8eb-dde4f3891b21, 713CCD419979B998E55DC5D516F3B0C74482070C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 8 Jan 2025 07:11:36 +0100 Message-ID: <20250108061150.30882-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250108061150.30882-1-ngraves@ngraves.fr> References: <20250108061150.30882-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1669709566131626722 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefuddrudegfedgledtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrleejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejgeehudejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=jFvh+xhW4z5+0Rat1Tgaq36K5H+ucJf0HNvvQudy+u0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1736316717; v=1; b=GFeOmehY0dyBqjOo7KXGR9JpAtPk+KqwwrdgV4fjddIXQFYfwU9aYMhhJ1+xj8bE4CJiiP6z XC9XSHcre6tZQciSKwjJryWHnD0jg67eYdeCnnklKARWx7ZQ6SuYuibr46cdD6kxWZrcbRJOGqb zAWLG9QAZilu2qZC3Du7YQLmHqBMJlR8O5fxQyxJRmKmTWJrQWhdbJFMln9aw1ZVsrtMniWJPnC Wsba5vdDI3/+cmgMJrBO1wbS3y34g8NzXGuG5fyMNShT/L5r7UJgdMgD1LzBsRF4TJEN4mFkWar J2ogXtFCOcms7TOKokXrwe3DP6r7SejH60NlA9H59dPzQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * gnu/packages/aidc.scm (zbar): Disable static and qt build. [build-system]: Switch to glib-or-gtk-build-system. [arguments]<#:configure-flags>: Add --disable-static. [inputs]: Replace v4l-utils by v4l-utils-minimal. --- gnu/packages/aidc.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 0c1f26495b..dbbab0e22b 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2020 Leo Famulari +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,8 +29,10 @@ (define-module (gnu packages aidc) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages elf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -43,7 +46,8 @@ (define-module (gnu packages aidc) #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk)) (define-public zxing-cpp ;; Use the master branch as it includes unreleased build system improvements @@ -171,6 +175,7 @@ (define-public libdmtx C/C++ programs to use its capabilities without restrictions or overhead.") (license license:bsd-3))) +;; XXX: qt variant utils are broken: zbarcam-qt fails with segmentation fault. (define-public zbar (package (name "zbar") @@ -184,11 +189,12 @@ (define-public zbar (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0rf3i7lx0fqzxsngird6l4d4dnl612nr32rm8sib699qqx67px8n")))) - (build-system gnu-build-system) + (base32 "0rf3i7lx0fqzxsngird6l4d4dnl612nr32rm8sib699qqx67px8n")))) + (build-system glib-or-gtk-build-system) (arguments - '(#:configure-flags (list "--with-gtk=auto" + (list + #:configure-flags '(list "--disable-static" + "--with-gtk=auto" "--with-python=auto" (string-append "--with-dbusconfdir=" (assoc-ref %outputs "out") @@ -209,10 +215,10 @@ (define-public zbar libjpeg-turbo perl python - v4l-utils)) + v4l-utils-minimal)) (propagated-inputs ;; These are in 'requires' field of .pc files. - (list glib gtk+ qtbase-5)) + (list glib gtk+)) (synopsis "Bar code reader") (description "ZBar can read barcodes from various sources, such as video streams,