From patchwork Fri Jul 10 18:32:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 23164 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 7276B27BBE1; Fri, 10 Jul 2020 19:33:49 +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_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 ESMTP id ADADE27BBE3 for ; Fri, 10 Jul 2020 19:33:45 +0100 (BST) Received: from localhost ([::1]:53514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtxqD-0005WX-A1 for patchwork@mira.cbaines.net; Fri, 10 Jul 2020 14:33:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtxpZ-0004o2-Qs for guix-patches@gnu.org; Fri, 10 Jul 2020 14:33:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtxpZ-0006NT-FR for guix-patches@gnu.org; Fri, 10 Jul 2020 14:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jtxpZ-0001qQ-D0 for guix-patches@gnu.org; Fri, 10 Jul 2020 14:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42229] [[PATCH V2] 09/10] gnu: opendht: Fix libring compilation. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Jul 2020 18:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42229 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42229@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 42229-submit@debbugs.gnu.org id=B42229.15944059777011 (code B ref 42229); Fri, 10 Jul 2020 18:33:05 +0000 Received: (at 42229) by debbugs.gnu.org; 10 Jul 2020 18:32:57 +0000 Received: from localhost ([127.0.0.1]:43409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jtxpN-0001os-58 for submit@debbugs.gnu.org; Fri, 10 Jul 2020 14:32:57 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.155]:41483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jtxp9-0001mj-U8 for 42229@debbugs.gnu.org; Fri, 10 Jul 2020 14:32:44 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.25 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-25.dynamic.chello.pl [89.64.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Fri, 10 Jul 2020 20:32:33 +0200 (CEST) From: Jan Wielkiewicz Date: Fri, 10 Jul 2020 20:32:19 +0200 Message-Id: <20200710183220.19829-9-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200710183220.19829-1-tona_kosmicznego_smiecia@interia.pl> References: <20200710183220.19829-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=1594405954; bh=J+tAZCXrQ4ibOQCYDzHPUjiSSerJE2O7yxZEttKWeQ8=; 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=cT5ftPDG517gcuT4bPI7wVc5/MOH6bdxL3Po09jkkbz5gxlRNt1mmtSttNWt/6wd0 4aiACpfmQl1dtaH55G0qGFR8zBy3wLNUBzqljmigqgmJ47pozGYHq0oqljLnPmlRge sdjy+d0azflXnfyTQ0RRPnzzWlAEUYpxf6JA/p2E= 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 The 2.1.4 release of opendht contains a bug, which breaks libring compilation. This commit fixes this. * gnu/packages/patches/opendht-fix-jami.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/networking.scm (opendht)[source]: Apply the patch. --- gnu/local.mk | 1 + gnu/packages/networking.scm | 1 + gnu/packages/patches/opendht-fix-jami.patch | 33 +++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/opendht-fix-jami.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5c3b391960..fcd6de8e0e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1340,6 +1340,7 @@ dist_patch_DATA = \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ + %D%/packages/patches/opendht-fix-jami.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e6a9e69adf..44f81c94d1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2918,6 +2918,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (url "https://github.com/savoirfairelinux/opendht.git") (commit version))) (file-name (git-file-name name version)) + (patches (search-patches "opendht-fix-jami.patch")) (sha256 (base32 "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) diff --git a/gnu/packages/patches/opendht-fix-jami.patch b/gnu/packages/patches/opendht-fix-jami.patch new file mode 100644 index 0000000000..9718a84a41 --- /dev/null +++ b/gnu/packages/patches/opendht-fix-jami.patch @@ -0,0 +1,33 @@ +From e2b39dd3a0742853e00f9c3e8c46c911da20bed7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adrien=20B=C3=A9raud?= +Date: Tue, 30 Jun 2020 10:42:49 -0400 +Subject: [PATCH 1/4] http/request: make terminate public + +--- + include/opendht/http.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/include/opendht/http.h b/include/opendht/http.h +index cc8d5f9..46b722c 100644 +--- a/include/opendht/http.h ++++ b/include/opendht/http.h +@@ -294,6 +294,7 @@ public: + * User action to cancel the Request and call the completion callbacks. + */ + void cancel(); ++ void terminate(const asio::error_code& ec); + + private: + using OnCompleteCb = std::function; +@@ -320,8 +321,6 @@ private: + + void connect(std::vector&& endpoints, HandlerCb cb = {}); + +- void terminate(const asio::error_code& ec); +- + void post(); + + void handle_request(const asio::error_code& ec); +-- +2.27.0 +