unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 47513@debbugs.gnu.org
Cc: Jack Hill <jackhill@jackhill.us>,
	Maxime Devos <maximedevos@telenet.be>,
	Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#47513] [PATCH v2 06/12] gnu: pjproject: Update to 2.11.
Date: Wed, 31 Mar 2021 13:22:26 -0400	[thread overview]
Message-ID: <20210331172232.22483-6-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20210331172232.22483-1-maxim.cournoyer@gmail.com>

* 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 <brettg@gnu.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
 ;;;
@@ -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





  parent reply	other threads:[~2021-03-31 17:24 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-31  5:14 [bug#47513] [PATCH 00/12] Update jami and add jami-qt Maxim Cournoyer
2021-03-31  5:23 ` [bug#47513] [PATCH 01/12] gnu: asio: Update to 1.18.1 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 02/12] gnu: restbed: Update to 4.7 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 03/12] gnu: restinio: Update to 0.6.13 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 04/12] gnu: Add nettle-3.7 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 05/12] gnu: opendht: Update to 2.2.0rc4 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 06/12] gnu: pjproject: Update to 2.11 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 07/12] gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 08/12] ffmpeg-jami: Patch with the patches from Jami 20210326.1.cfba013 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 09/12] gnu: libring: Update to 20210326.1.cfba013 Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 10/12] gnu: libringclient: " Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 11/12] gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome Maxim Cournoyer
2021-03-31  6:08     ` Jack Hill
2021-03-31 15:21       ` Jack Hill
2021-03-31 15:23         ` Jack Hill
2021-03-31 17:26           ` Maxim Cournoyer
2021-03-31  5:23   ` [bug#47513] [PATCH 12/12] gnu: Add jami-qt Maxim Cournoyer
2021-03-31  6:49 ` [bug#47513] [PATCH 00/12] Update jami and add jami-qt Maxime Devos
2021-03-31 13:23 ` Maxime Devos
2021-03-31 16:57   ` Maxim Cournoyer
2021-03-31 17:23   ` Maxim Cournoyer
2021-03-31 17:22 ` [bug#47513] [PATCH v2 01/12] gnu: asio: Update to 1.18.1 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 02/12] gnu: restbed: Update to 4.7 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 03/12] gnu: restinio: Update to 0.6.13 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 04/12] gnu: Add nettle-3.7 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 05/12] gnu: opendht: Update to 2.2.0rc4 Maxim Cournoyer
2021-03-31 17:22   ` Maxim Cournoyer [this message]
2021-03-31 17:22   ` [bug#47513] [PATCH v2 07/12] gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 08/12] ffmpeg-jami: Patch with the patches from Jami 20210326.1.cfba013 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 09/12] gnu: libring: Update to 20210326.1.cfba013 Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 10/12] gnu: libringclient: " Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 11/12] gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome Maxim Cournoyer
2021-03-31 17:22   ` [bug#47513] [PATCH v2 12/12] gnu: Add jami-qt Maxim Cournoyer
2021-04-01 11:10 ` [bug#47513] [PATCH 00/12] Update jami and add jami-qt Maxime Devos
2021-04-02 11:52   ` bug#47513: " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210331172232.22483-6-maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=47513@debbugs.gnu.org \
    --cc=jackhill@jackhill.us \
    --cc=maximedevos@telenet.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).