From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eFDVNE2wZGCxBgAAgWs5BA (envelope-from ) for ; Wed, 31 Mar 2021 19:24:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QMKwLk2wZGATUQAAB5/wlQ (envelope-from ) for ; Wed, 31 Mar 2021 17:24:29 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 71A2F1B78B for ; Wed, 31 Mar 2021 19:24:29 +0200 (CEST) Received: from localhost ([::1]:46828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lReZw-0007uD-IA for larch@yhetil.org; Wed, 31 Mar 2021 13:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReZc-0007Ty-O0 for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lReZY-0006F0-Pc for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lReZY-0002xa-M0 for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH v2 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 17:24:04 +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: Jack Hill , Maxime Devos , Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161721139311227 (code B ref 47513); Wed, 31 Mar 2021 17:24:04 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 17:23:13 +0000 Received: from localhost ([127.0.0.1]:55416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYi-0002uu-Cy for submit@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:12 -0400 Received: from mail-qv1-f47.google.com ([209.85.219.47]:33664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYb-0002se-7k for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:06 -0400 Received: by mail-qv1-f47.google.com with SMTP id o19so10344331qvu.0 for <47513@debbugs.gnu.org>; Wed, 31 Mar 2021 10:23:05 -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=BhEM7qBBUF1YeD2q62lNQMoz3Pce5dXIsBOxiJoDXDZ3FJlRWr+1SVx4sLuMe1smBu uNKqCEobYQ7QzKjUMFZ+sPB5t5365YbonUAdSuhtF2UkNifJXcr7m6WnOGDhas2yNzml +ORw415qdQeug1IAt2iYKBFLy8WyWjUaR5JUn24w41Jm0O2quEVR9NQoQcLLw9bOZPTu cwpC1LdbftzyILHKbCitmzonfWXaiKIwsoGuw4FGS1KqNrCJzC0XTcGXXo0FbVewxkuJ pc6w9ezAXf+0mTDPgVTYVU5gb3SrqYcllh15R80Xs9ZMuImw1NNp9gUPqwkWrSW0v0QB FKLQ== 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=bfqGr5YY/1aMsoyL0uI526ugjgJisMiP5UI+IGuHkTxq18jFyKbA4kIlXKt97vn4c9 hTTdnWsQzui2PIyPX0QIgs3CAvDb9b+iQXJdkEB8TUaVdNci4h0a5ReqZJ76M6isXDtq A2W/hTRqEabvrzeCnyBzHAXreK+TDzrudbCAykTmuHfDdy73ee5mjdYWj9kMFNMND5ga GA/oQBcGVCRlWacmufTAi550z/Hunp29VG/+npJhOxRKJN0UwJqfRs+17OfyYcOxvlgd Vhp94uPnM6QUOWJu9lIxncsgCZ9GajHDoyUYF16KkNhJI6k579nMRyZurZjXZlv32SMg f7WA== X-Gm-Message-State: AOAM532WsZcDP7I3o1YoAbtuDc2C+HhQSlXr2yyHdW1E9agHVX1quzNH TCbrx3NymErZ9C6H8uTVBDOEJvn2631Z1Q== X-Google-Smtp-Source: ABdhPJyr0zxpWdXMiw8SgKLqIxGSF0DtTgZE69xN8sfQJ2tIS+ALXeGOSoYzN9K273AlTz+eQ22Igg== X-Received: by 2002:a0c:e1c7:: with SMTP id v7mr4171683qvl.30.1617211379540; Wed, 31 Mar 2021 10:22:59 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id c5sm1891349qkg.105.2021.03.31.10.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 10:22:59 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 13:22:26 -0400 Message-Id: <20210331172232.22483-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331172232.22483-1-maxim.cournoyer@gmail.com> References: <20210331172232.22483-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617211469; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Gxy/TNTiofw0sIAHkWHpYqRS/FPVo1T3Y/9x5vlGrCs=; b=HFoBAnYCrM7l3aYC0ZPkCREa4/Q1WJ17y9ato3Ae2IQtnXe+6jQ1FrL34hYFilQb8doCCM ckbkGDwxDuNhMFrtU2xLBWIYaqK/z38r5kARnoCAwYtJMnuV3k1X7jpu4PKuUx3+6dQPLo IUFEraA/WsHxkNQhIM8W7MqJYBmyNJrpWIxBplJgGsmiDNXyCw0LnvYNJyR7SvFeWB/XL8 l7ZKnkDl9AJxHBDN1FqFKNKMHiwqXeHwoS/30WvZWoLHFKDVlfYZjiTtWmzuM5U24Kl9mF Q6EGrOteTsOqHK93W8lE3IsHSpYn8Ca3givO+a5O6GNXvM0vJ855Ki9bF1723g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617211469; a=rsa-sha256; cv=none; b=mDwy0YqEfG0P9kuZ/9rwNiAo+/XQQYGjABmwnZ4p40U5o7q5GexmGudU63GYA3VKHaYb5P w+VJ6O9iLeZo70ypBaNC5mWUVnm5MTaXRvSpfoMPzBQ+kV7eJ/BbsJMAETgYGGgSk8OPMG w4bK3VYEmWPQKYqXS2ZR3zbQCR2g83em8ALACDTY1Pqp8ECw/YoP6CjyL0Eho2YN4Yc3ob 0/5jbjKJ3hqDo1FPZuwbeIvYeRgoKoMkk07KAnlPqlkjd9r0+NBI5CxqyFK8j3qMYv0sLp YwNmKavjVzLZrzWalrCJ5OBB+f7F+dPoGyLdQatNYC60u3o4nKgaXh+gGzBeTA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=BhEM7qBB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=BhEM7qBB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 71A2F1B78B X-Spam-Score: 0.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: luNeR2R9TSMT * 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) -- 2.31.1