From patchwork Fri Oct 25 10:36:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 69461 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 4DF8D27BBEA; Fri, 25 Oct 2024 11:37:51 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 0F85B27BBE2 for ; Fri, 25 Oct 2024 11:37:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4HhK-0002u6-OD; Fri, 25 Oct 2024 06:37:38 -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 1t4HhC-0002ro-VW for guix-patches@gnu.org; Fri, 25 Oct 2024 06:37:31 -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 1t4HhC-0002NN-NC for guix-patches@gnu.org; Fri, 25 Oct 2024 06:37:30 -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:Date:References:In-Reply-To:From:To:Subject; bh=qRzUDGnMAjpc95gCE1AeS1sojrr9g6aa4sCyQie5toQ=; b=YttRF24gegtFAaYEqnAniyob5/MpKTmifyh8kur+JW7MAsufKQICAl5rahNMYdrWgmJytHMiv/cHA0EuMjW5argXaGI1cYQ1OvEwZvuwTdKfeCT79BeiY5mDetbHG1mvzk3khhTtdn3otuww3VxrtjHUooMnf+f31Y8815YccGmp7o/1JuUG2CHUqCPtjN9D+oJdoeEFaY4H6nOyqZkJrSgHdKZwAbkBsoxNiURnyojejc3h+6QD0ONF91Pg+/imSkYzK8KU0BQXkzb5hzxPSG3AYxUSRROU5r5kcpTt2oyybqB9Oba1Ht2TGBjlg+qAHMfk5g0wmeUOo5oo5LCSfQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4Hhi-0004iM-Gj for guix-patches@gnu.org; Fri, 25 Oct 2024 06:38:02 -0400 Subject: bug#73459: [PATCH] gnu: qview: Update to 6.1. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2024 10:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 73459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sergey Trofimov Cc: 73459-done@debbugs.gnu.org Mail-Followup-To: 73459@debbugs.gnu.org, ludo@gnu.org, sarg@sarg.org.ru Received: via spool by 73459-done@debbugs.gnu.org id=D73459.172985263718038 (code D ref 73459); Fri, 25 Oct 2024 10:38:02 +0000 Received: (at 73459-done) by debbugs.gnu.org; 25 Oct 2024 10:37:17 +0000 Received: from localhost ([127.0.0.1]:37475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Hgy-0004gq-Mx for submit@debbugs.gnu.org; Fri, 25 Oct 2024 06:37:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Hgw-0004gV-Bi for 73459-done@debbugs.gnu.org; Fri, 25 Oct 2024 06:37:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4HgJ-0002KD-Q7; Fri, 25 Oct 2024 06:36:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=qRzUDGnMAjpc95gCE1AeS1sojrr9g6aa4sCyQie5toQ=; b=UOJe0pb86YexiZlbYI8X t/zi+Ep3dJz3C8C+qUCP1HnOfiQnQIEtX1h2o5sUv/viP89gHHSIMzDJKX2RXjKHgtkdKuCbh0A+b BnY7elsWnqv1oBmO8Ea6V4a9EulvsoqG5RDG8mhkVnmVongAxo/Ddc2JXYj6/vL+tiKSiasZJa3Xl 7lISJc794gfotuw3SVeoMPYrUi2Lmb6lTcuOpvpYHDKQWGk7VIVO8/InLK9NMfmoKpGJonObSFUgm 08Oat2UP+9lJ6QOZXi9Oqh3+SBkvozGQuWQV8Z9CgR+fqpk+VsMiloM7HsGRaMH0sAZVTqZmd293M gcoiRsfG1kG9Fw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: (Sergey Trofimov's message of "Tue, 24 Sep 2024 22:21:46 +0200") References: Date: Fri, 25 Oct 2024 12:36:24 +0200 Message-ID: <871q0431w7.fsf@gnu.org> 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 Sergey Trofimov skribis: > * gnu/packages/image-viewers.scm (qview): Update to 6.1. > [inputs, native-inputs]: Use qt6. > [arguments]: Disable broken tests. Workaround lrelease being resolved > relative to qtbase instead of qttools. Hi! Applied it with the change below, which resorts to a literal regexp in ‘substitute*’, which is usually safer: --8<---------------cut here---------------start------------->8--- --8<---------------cut here---------------end--------------->8--- Thanks, Ludo’. diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 7fd8585ff1..cb4e903f39 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -721,7 +721,7 @@ (define-public qview (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "qmake" (string-append "PREFIX=" #$output)) (substitute* "Makefile" - (((string-append #$qtbase "/bin/lrelease")) + (("[[:graph:]]+/bin/lrelease") (search-input-file inputs "/bin/lrelease"))))) ;; Don't phone home or show "Checking for updates..." in the About ;; menu.