From patchwork Wed Jun 18 11:54:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43111 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 378AE27BC4B; Wed, 18 Jun 2025 12:57:05 +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=-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 53E4127BC49 for ; Wed, 18 Jun 2025 12:57:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRrOh-0006AO-HH; Wed, 18 Jun 2025 07:56:07 -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 1uRrOg-00069x-EU for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:06 -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 1uRrOg-0003kc-38 for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:06 -0400 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=UI3EjchTRLXdUhM6Av1wo8uy3tvPMwdCDep6TM1ahZ0=; b=F6XpTWiFZRCZGpy7S4VtNq7kLv8L/8gaOPgg99lErvOMQTMjslK+3FBTKo8F1/m5Ad8cGIrxFHRbjZgK3bfxj4ATP7Fgn2O7mrEnOqDID9YIvbQ0b0Ag70/t+dY934NS//MKXRzwHBmhwwXVhUCMlxu1YutrxtjcGabHlx3VbjI2WcjcPFANu/Th2nwjW42ii5NzDfSVjLt19nCaQzsQX9k0WV5Jaxid7G1gT1p0mRdODTC/4PObOgREuLhnYwY3sRFY2M9DNzM2Mc2LOIQ9phbk1+sVZcS7XzgDu29LkqPDGWVrSVd9oRvpjztmkSfSpXzzdDtSu757crUHB1Jd2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRrOf-0006Yr-TV for guix-patches@gnu.org; Wed, 18 Jun 2025 07:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 6/8] gnu: zxing-cpp: Update to 2.3.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.175024775425116 (code B ref 78790); Wed, 18 Jun 2025 11:56:05 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:54 +0000 Received: from localhost ([127.0.0.1]:48135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOT-0006Wx-PE for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:54 -0400 Received: from layka.disroot.org ([178.21.23.139]:46528) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO6-0006Td-R1 for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:34 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DC02C2611E; Wed, 18 Jun 2025 13:55:29 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ljobkhZCsgY7; Wed, 18 Jun 2025 13:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247728; bh=9FfSpS+UpLy2Mc1E/2UogwD5O3PinTjXc8WrXinlH4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DQYMJeHJDIIsQVSSyvmqQZxnjjuBlqaSYUwrtHAxujXyB0JkTsBy1C4z1tHdU7MB4 nWRqjaHjxcI7wxvVyniLHhfqVY6Zru+4w91USC/jjsEU/byku2Z89Q6BHByxqdAvzN HTJoPsy0r1IE7jwS+PeY0bzz5D9W+28W2erBlEmmEodLf1/hp4MntzZMmDatcVj+Ub X+mN0zABuWGCwAIgaUGRPmEXMHkNjNU09DYRsrPLVZZHFkAWD1dHSZm2chz3VDpZXA W88n1rw4XS+5JmOl5mgz3T3CRLVaeNA+Zyne6VkpXPdG7gE7ORlExO+XlRfF5vaEbw knFWX1J4S1Pcg== Date: Wed, 18 Jun 2025 14:54:38 +0300 Message-ID: <20250618115507.4993-6-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> 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: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo 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 (zxing-cpp): Update to 2.3.0. [version]: Do not use git-version. [source]: Update URL. [native-inputs]: Add pkg-config. [inputs]: Add libpng, zint and zlib. [arguments] <#:configure-flags>: Add -DZXING_READERS=ON, -DZXING_WRITERS=BOTH, -DZXING_DEPENDENCIES=LOCAL, -DZXING_EXAMPLES=OFF, -DZXING_USE_BUNDLED_ZINT=OFF and -DZXING_UNIT_TESTS=ON. <#:phases> (install-headers): New phase. (zxing-cpp-1.2a): New variable. (zxing-cpp-1.2) [source]: Update URL. * gnu/packages/linphone.scm (liblinphone)[inputs]: Replace zxing-cpp with zxing-cpp-1.2a. * gnu/packages/messaging.scm (kaidan)[inputs]: Likewise. Change-Id: Ib03af79feef03f9c9e1a5b97d39b7d6c18d3ff1d --- gnu/packages/aidc.scm | 53 +++++++++++++++++++++++++++++++------- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index c48e800b77..bd55ce74ff 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -32,6 +32,7 @@ (define-module (gnu packages aidc) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages gettext) @@ -83,29 +84,63 @@ (define-public zint (license (list license:bsd-3 license:gpl3+)))) (define-public zxing-cpp + (package + (name "zxing-cpp") + (version "2.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zxing-cpp/zxing-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hdr73fllnsp3zpmrhw6cjla39lihwg1khgvddsf4v57a0lmiy3f")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DZXING_READERS=ON" + "-DZXING_WRITERS=BOTH" + "-DZXING_DEPENDENCIES=LOCAL" + "-DZXING_EXAMPLES=OFF" ;requires stb.pc + "-DZXING_USE_BUNDLED_ZINT=OFF" + "-DZXING_UNIT_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-headers + (lambda* (#:key source #:allow-other-keys) + (invoke "sh" "-c" + (string-append "cp " source "/core/src/*.h " + #$output "/include/ZXing/"))))))) + (native-inputs (list fmt-8 googletest pkg-config)) + (inputs (list libpng zint zlib)) + (synopsis "C++ port of ZXing") + (description "ZXing-CPP is a barcode scanning library.") + (home-page "https://github.com/zxing-cpp/zxing-cpp") + (license license:asl2.0))) + +;;; This older variant is kept for kaidan, liblinphone and yosys-clang. +(define-public zxing-cpp-1.2a ;; Use the master branch as it includes unreleased build system improvements ;; allowing to use system libraries (instead of attempting to fetch them ;; from the Internet). (let ((revision "0") (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) - (package + (package/inherit zxing-cpp (name "zxing-cpp") (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) - (build-system cmake-build-system) - (native-inputs (list fmt-8 googletest)) - (synopsis "C++ port of ZXing") - (description "ZXing-CPP is a barcode scanning library.") - (home-page "https://github.com/nu-book/zxing-cpp") - (license license:asl2.0)))) + (arguments '(#:configure-flags '())) + (native-inputs (list fmt-8 googletest))))) ;;; This older variant is kept for gst-plugins-bad (see: ;;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1684). @@ -116,7 +151,7 @@ (define-public zxing-cpp-1.2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 239c18c595..24cd6bbcc8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -802,7 +802,7 @@ (define-public liblinphone sqlite xsd zlib - zxing-cpp)) + zxing-cpp-1.2a)) (synopsis "Belledonne Communications Softphone Library") (description "Liblinphone is a high-level SIP library integrating all calling and instant messaging features into an unified diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c2928c0042..bddc4786cd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1515,7 +1515,7 @@ (define-public kaidan qqc2-desktop-style qxmpp sonnet - zxing-cpp)) + zxing-cpp-1.2a)) (home-page "https://www.kaidan.im/") (synopsis "Qt-based XMPP/Jabber Client") (description "Kaidan is a chat client. It uses the open communication