From patchwork Fri May 12 22:09:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Preston M. Firestone" X-Patchwork-Id: 49974 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 6F1F027BBF0; Fri, 12 May 2023 23:11:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 9CBAC27BBEE for ; Fri, 12 May 2023 23:11:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxayf-0005e8-EZ; Fri, 12 May 2023 18:11: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 1pxayd-0005dx-VG for guix-patches@gnu.org; Fri, 12 May 2023 18:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxayd-0002Te-N8 for guix-patches@gnu.org; Fri, 12 May 2023 18:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxayc-00015j-M6 for guix-patches@gnu.org; Fri, 12 May 2023 18:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63473] [PATCH] gnu: praat: Update to 6.3.10. Resent-From: "Preston M. Firestone" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2023 22:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63473@debbugs.gnu.org Cc: "Preston M. Firestone" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16839294334154 (code B ref -1); Fri, 12 May 2023 22:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2023 22:10:33 +0000 Received: from localhost ([127.0.0.1]:33853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxay8-00014v-KV for submit@debbugs.gnu.org; Fri, 12 May 2023 18:10:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:49728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxay6-00014m-7L for submit@debbugs.gnu.org; Fri, 12 May 2023 18:10:30 -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 1pxay6-0005Wz-0m for guix-patches@gnu.org; Fri, 12 May 2023 18:10:30 -0400 Received: from mail-qt1-x829.google.com ([2607:f8b0:4864:20::829]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxay4-0002RT-7m for guix-patches@gnu.org; Fri, 12 May 2023 18:10:29 -0400 Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-3ef112cac17so55753851cf.0 for ; Fri, 12 May 2023 15:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683929427; x=1686521427; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ciFY7nZoqoMOVtXmPpKn2VCFPO4xRZqvp42mHrQ0f7U=; b=VWLfrmUvyFo16e96Rbxqdx0valzLnq+1FlR2kX9ftvFrk6aZuML9UzQFqcH+1316YU hZjFp58h1KJlCH+a6f3clTL07IAIhDotA82bJHLPsQW9wRbZG6BengfLaIZE9zm4e5uC sNjI3ccFTSkwuiFF1MIs1spBVv0sBkT344G67XIBnbcsTS7LKSFMbCtCek1FamclWUQB uyBGpcGWaNE2q/05vPRP+/i36mIXyvGmXi12tijs9nWNi1QmdNApjvwMihw+x45CIBtO mq+em8Rm6MlRzkc620r/p1T821Q6teGe4lhTiHdsvlKYi7j/LqNZbA8qTlG0W+nNA0da Yveg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683929427; x=1686521427; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ciFY7nZoqoMOVtXmPpKn2VCFPO4xRZqvp42mHrQ0f7U=; b=XGKCN7jJBzNWu3BWrjLvEFGBd0HnrVY37pKFCgU0j6u7b2awZfP4GZQNC7pr+DqH8o gm7C4P/d0+rSX7XpxxwlYY91zfe2xL7ViglEQzt2nvTtdekt38pRalD3AmEbhFBgosQd NNov9TPpsxs3d4jtLYZ+ixReGWHMq2pySFfHCQPizPFIRgyNMNwAICkZKcNxz/tFa0Hu ruCgGAxt+dTKL2OV7hOP5WMRdZZM/yN+BgQhlFctLk+iLw3vwqbj91Vtz5asCndU0t0E sC2TbqrCVRdeioShXOwMpodreSdMOeP1CpLcN45wCYLia8p3307/53POQxk3e3V4l2lY dtEg== X-Gm-Message-State: AC+VfDwbyPBgPlSsxm1W/i871d050iN4SV7IaIghRN9fHkjMjk5A4f15 jKFTupD5x1yF+Kz15Q4kLt3IAkohh+g= X-Google-Smtp-Source: ACHHUZ4uzI6ZHiFUxwNuHD1yyP0TqU/iV5VC8qpEgtkuFPwJ6118/FGnZXJHe200nVvrhgUaFbe5kw== X-Received: by 2002:a05:622a:194:b0:3ef:231c:cee7 with SMTP id s20-20020a05622a019400b003ef231ccee7mr48543344qtw.7.1683929426802; Fri, 12 May 2023 15:10:26 -0700 (PDT) Received: from localhost.localdomain (c-73-208-162-67.hsd1.il.comcast.net. [73.208.162.67]) by smtp.gmail.com with ESMTPSA id cm17-20020a05622a251100b003f4ed0ca698sm1460802qtb.49.2023.05.12.15.10.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 15:10:26 -0700 (PDT) From: "Preston M. Firestone" Date: Fri, 12 May 2023 17:09:33 -0500 Message-Id: <60c20787457b3c531db6948f2b9773e79214b1f4.1683929239.git.firestone.preston@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::829; envelope-from=firestone.preston@gmail.com; helo=mail-qt1-x829.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/language.scm (praat): Update to 6.3.10. [arguments]: Use make-flags to set CC to gcc. Add tests and remove broken one. Remove final #t from all lambdas. [inputs]: Update to gtk+3 and reformat. --- gnu/packages/language.scm | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) base-commit: b4e5844700b2304bfde451322feb5797bf0c6179 prerequisite-patch-id: e1af5f52c721c7905ea34bdbbd20dfac5190126e prerequisite-patch-id: 14803245981fe2f3cdfb052d35c41dad2fec89d1 diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 36968ad11c..530842d2c8 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -850,37 +850,45 @@ (define-public link-grammar (define-public praat (package (name "praat") - (version "6.1.30") + (version "6.3.10") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/praat/praat") - (commit (string-append "v" version)))) + (url "https://github.com/praat/praat") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1pjfifyv3wjn68l3i2dr83xm75nf2kxvfxrk9qqbmwz58p183jw4")))) + "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test target + '(#:make-flags + ;; For some reason this variable doesn't properly percolate down to the + ;; recursive subcalls of make despite being defined in makefile.defs, + ;; which is sourced by all the other makefiles. Setting it as a flag + ;; guarantees that the right compiler is called every time. + '("-E" "CC = gcc") #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-problem-tests + (lambda _ + ;; FIXME: Why doesn't this test pass? + (delete-file "test/sys/graphicsText.praat"))) (replace 'configure (lambda _ - (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs") - #t)) + (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs"))) + (replace 'check + (lambda _ + ;; Run only the tests that don't require a GUI. + (invoke "./praat" "--run" "test/runAllTests_batch.praat"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) (mkdir-p bin) - (copy-file "praat" (string-append bin "/praat"))) - #t))))) + (copy-file "praat" (string-append bin "/praat")))))))) (inputs - `(("alsa-lib" ,alsa-lib) - ("gtk" ,gtk+-2) - ("jack" ,jack-1) - ("publesaudio" ,pulseaudio))) + (list alsa-lib gtk+ jack-1 pulseaudio)) (native-inputs (list pkg-config)) (home-page "https://www.fon.hum.uva.nl/praat/")