From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 06 06:07:31 2020 Received: (at submit) by debbugs.gnu.org; 6 Jan 2020 11:07:31 +0000 Received: from localhost ([127.0.0.1]:45179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioQEM-000765-TZ for submit@debbugs.gnu.org; Mon, 06 Jan 2020 06:07:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:40853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioQEL-00075x-8u for submit@debbugs.gnu.org; Mon, 06 Jan 2020 06:07:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53675) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioQEJ-0004Hy-Sv for guix-patches@gnu.org; Mon, 06 Jan 2020 06:07:29 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioQEI-0005ts-Q7 for guix-patches@gnu.org; Mon, 06 Jan 2020 06:07:27 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:48171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioQEI-0005tR-Fa for guix-patches@gnu.org; Mon, 06 Jan 2020 06:07:26 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-54-32.dynamic.chello.pl [89.64.54.32]) by poczta.interia.pl (INTERIA.PL) with ESMTPA; Mon, 6 Jan 2020 02:17:56 +0100 (CET) From: Jan Wielkiewicz To: guix-patches@gnu.org Subject: [PATCH 07/22] gnu: jami: Fix the procedure for applying patches. Use the procedure correctly in pjproject-jami. Date: Mon, 6 Jan 2020 02:11:37 +0100 Message-Id: <20200106011151.1902-7-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200106011151.1902-1-tona_kosmicznego_smiecia@interia.pl> References: <20200106011151.1902-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1578273476; bh=dYdSVXkCLavh33e2x2yzKkRYClNCbhoZZBQyq9XHp4Q=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Interia-Antivirus; b=RlcdlrHCssCxu/NYTM5U4kjxpV+6jxtU+eTQWb3GxKxOdJbtQGvxkyP6a8WpiA0LD IQHkANedwGqI+w0r1cKlSri/X6L984V5geGHPDjO8Acy+saUEAQUpXAoAK4IyxDjos /kXt8X54naegLo/SZMsJ6uZ5F9xGQkl+AfqiJCHU= X-EOM: H-lo10 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 217.74.65.239 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Jan Wielkiewicz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --- gnu/packages/jami.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index c6f38d4a8c..f257767a85 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -58,6 +58,22 @@ #:use-module (guix download) #:use-module (guix git-download)) =20 +(define-public jami-apply-dependency-patches + '(lambda* (#:key inputs dep-name patches) + (let ((savoir-faire-linux-patches-directory "Savoir-faire Linux pat= ches")) + (mkdir-p savoir-faire-linux-patches-directory) + (invoke "tar" "-xvf" (assoc-ref inputs "savoir-faire-linux-patche= s") + "-C" savoir-faire-linux-patches-directory + "--strip-components=3D5" + (string-append "ring-project/daemon/contrib/src/" + dep-name)) + (for-each + (lambda (file) + (invoke "patch" "--force" "-p1" "-i" + (string-append savoir-faire-linux-patches-directory "/" + file ".patch"))) + patches)))) + (define %jami-version "20191128.1.4c44bb7") =20 (define* (jami-source #:key without-daemon) @@ -115,6 +131,8 @@ ;; making a shared object; "CFLAGS=3D-fPIC" "CXXFLAGS=3D-fPIC") + #:modules ((guix build utils) + ,@(@@ (guix build-system gnu) %default-modules)) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -157,6 +175,31 @@ file ".patch"))) savoir-faire-linux-patches)) #t)) + (lambda* (#:key inputs #:allow-other-keys) + (let ((jami-apply-dependency-patches ,jami-apply-dependency-patc= hes)) + ;; Comes from + ;; "ring-project/daemon/contrib/src/pjproject/rules.mak". + ;; WARNING: These amount for huge changes in pjproject. + (jami-apply-dependency-patches #:inputs inputs + #:dep-name "pjproject" + #:patches + '("fix_turn_alloc_failure" + "rfc2466" + "ipv6" + "multiple_listeners" + "pj_ice_sess" + "fix_turn_fallback" + "fix_ioqueue_ipv6_sendto" + "add_dtls_transport" + "rfc6544" + "ice_config" + "sip_config" + "fix_first_packet_turn_tcp" + "fix_ebusy_turn" + "ignore_ipv6_on_transport_check" + "fix_turn_connection_failure" + "disable_local_resolution")) + #t)) ;; TODO: We could use substitute-keyword-arguments instead of ;; repeating the phases from pjproject, but somehow it does ;; not work. --=20 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 06 13:27:40 2020 Received: (at 38979-done) by debbugs.gnu.org; 6 Jan 2020 18:27:40 +0000 Received: from localhost ([127.0.0.1]:46703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioX6K-0002CX-43 for submit@debbugs.gnu.org; Mon, 06 Jan 2020 13:27:40 -0500 Received: from smtpo.poczta.interia.pl ([217.74.65.239]:35118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioX6J-0002C3-6b for 38979-done@debbugs.gnu.org; Mon, 06 Jan 2020 13:27:39 -0500 X-Interia-R: Interia X-Interia-R-IP: 89.64.54.32 X-Interia-R-Helo: Received: from localhost (89-64-54-32.dynamic.chello.pl [89.64.54.32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA for <38979-done@debbugs.gnu.org>; Mon, 6 Jan 2020 19:08:09 +0100 (CET) Date: Mon, 6 Jan 2020 19:08:09 +0100 From: Jan To: 38979-done@debbugs.gnu.org Subject: Closing the broken patch Message-ID: <20200106190809.0af34003@interia.pl> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1578334089; bh=ov2F4z35BsRP1shMBo4tqHBzpNxKta6mt06UxfAIxJk=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:Date:From:To:Subject: Message-ID:X-Mailer:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Interia-Antivirus; b=VqNtlINEawdJGnT+tdHqUKIJoTPJwFGZd7EuTsC7GQSMmmdA7WV/yHVfRw2RaWHSo AghyBOwZfbCVsXv9X1g7EtxGhfPyl2T/vcdINHpuLi4Qr4FK3oXMl6QXXiPMnt+9Wc qcCvERZxHbZNvyChro2ZCfZ86GUnEKIxLfCwC0jQ= X-EOM: H-lo10 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 38979-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) I broke the whole patch series, sorry, hope this solves everything. I got smtp error and thought patches didn't send. Jan Wielkiewicz From unknown Mon Sep 08 01:50:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 04 Feb 2020 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator