From patchwork Wed Mar 31 05:23:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28212 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 9A3D727BC66; Wed, 31 Mar 2021 06:25:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1EFBE27BC65 for ; Wed, 31 Mar 2021 06:25:26 +0100 (BST) Received: from localhost ([::1]:43778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTM3-0000TO-Fq for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0000QR-M3 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0006OB-EP for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLj-00036z-BX for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 06/12] gnu: pjproject: Update to 2.11. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47513@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825011825 (code B ref 47513); Wed, 31 Mar 2021 05:25:03 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:10 +0000 Received: from localhost ([127.0.0.1]:53248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKs-00034Y-3n for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:10 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:44011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKj-00032S-Vf for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:02 -0400 Received: by mail-qk1-f177.google.com with SMTP id x14so18255040qki.10 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gxy/TNTiofw0sIAHkWHpYqRS/FPVo1T3Y/9x5vlGrCs=; b=kjEFJYe5f77xUKAbSsJnUsFuoaxS/zmRntH4cFPvUpyzyHARnSRExBF+xTkByKkQGG 7B5IGTJAyBWQJlE07gzclmlb3dvE01PIoBU5dguuPNdz8Z5BsTHjK4P5YouemhQx8l5L HyKvgg9ZAIFkPhO8I+SZwe4FfPz8Pn+874F8ybgrJYjoyqSe8XyC6y7S9v3P86i3sHvy Wms0/a+zsQ1y+Hk4ihtyJnw/xNRN3HOFXWEiIr0KGLn1v0u5fUh5N9h5fEBGQr+8Lol0 +861KoYvFpytKYqV5hf8XhhfBfIALDx300ujLVD7XfOvrDiUhWAocRYoB5qo4rov2SoB r/iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gxy/TNTiofw0sIAHkWHpYqRS/FPVo1T3Y/9x5vlGrCs=; b=NdcYgBmtGGqPApLfaWy4w/RA+MmBKA7iYLcGzGk9MlwTX34AAgmsL/srhPw62pK41l 2LTJbbBwrBITIABMGnjK3aN7JODzmFS+XdKif+ZrrzDSDcQZhVG6Tj2CjnuE4/N/jKcr b7LzSiZXtk2NBkkVckNli73shDxvcII4+0l9T/ALlvYlejeOgXRV9F2k3zkZZvoIG/HQ M/h+MyxjFLKG8HF0FFbz0UwdH6tccMfLQtCll8PfIy9eXpDC7YOoXCTPOJKEmMx+vbBa WkKikobWvzcslbGX5cLUJ2ifkRuSNF5aEeFZI30njmrEx+k/BK6Zfeeq8X/Tqt8q2ceR hYHg== X-Gm-Message-State: AOAM533kDq4TNMLnr7P2NGjyiFsXcKVBuVE9u8MtpkVP4GgCEU6Iuq42 rZA1PbTxpBNuP0JnX80J2sKSh46oNUM= X-Google-Smtp-Source: ABdhPJxb0+pEcWUzZDIiAazehlfR6I4v1/Yw1XPdcvfOEFptxHz4UHUVNgclyK9/ayNZR/mDxk1OOQ== X-Received: by 2002:a05:620a:16dc:: with SMTP id a28mr1589780qkn.442.1617168236489; Tue, 30 Mar 2021 22:23:56 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:56 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:42 -0400 Message-Id: <20210331052348.5164-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telephony.scm (pjproject): Update to 2.11. Remove trailing #t. [patches]: Delete field. The patches are preserved because pjproject-jami still needs them. --- gnu/packages/telephony.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5c8d247e68..af7148bf84 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 LibreMiami ;;; @@ -723,7 +723,7 @@ your calls and messages.") (define-public pjproject (package (name "pjproject") - (version "2.10") + (version "2.11") (source (origin (method git-fetch) @@ -733,12 +733,8 @@ your calls and messages.") (file-name (git-file-name name version)) (sha256 (base32 - "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + "1kn9g1x1vmh4130ghph8mldz5m89gsjs4vpdzlzm98m3808gk5an")) (modules '((guix build utils))) - ;; The patches upstream status can be tracked at: - ;; https://github.com/pjsip/pjproject/pull/2501. - (patches (search-patches "pjproject-correct-the-cflags-field.patch" - "pjproject-fix-pkg-config-ldflags.patch")) (snippet '(begin ;; Remove bundled libraries. @@ -746,8 +742,7 @@ your calls and messages.") (substitute* "aconfigure.ac" (("third_party/build/os-auto.mak") "")) (substitute* "Makefile" - (("third_party/build") "")) - #t)))) + (("third_party/build") "")))))) (build-system gnu-build-system) (outputs '("out" "debug" "static")) (arguments @@ -785,8 +780,7 @@ your calls and messages.") ;; Make all the files writable to prevent the following error: ;; "autom4te: cannot open aconfigure: Permission denied". (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-before 'build 'build-dep (lambda _ (invoke "make" "dep"))) ;; The check phases is moved after the install phase so to @@ -800,8 +794,7 @@ your calls and messages.") (with-directory-excursion out (for-each (lambda (f) (rename-file f (string-append s "/" (basename f)))) - (find-files "." "\\.a$"))) - #t))) + (find-files "." "\\.a$")))))) (add-after 'install 'check (assoc-ref %standard-phases 'check)) (add-before 'patch-source-shebangs 'autoconf @@ -844,8 +837,7 @@ your calls and messages.") ;; Disable the pjnath and pjsua tests, which require an actual ;; network and an actual sound card, respectively. (("pjnath-test pjmedia-test pjsip-test pjsua-test") - "pjmedia-test pjsip-test")) - #t))))) + "pjmedia-test pjsip-test"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake)