From patchwork Wed Apr 17 04:25:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Vilata i Balaguer X-Patchwork-Id: 3304 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 E41E716E9A; Wed, 17 Apr 2019 14:26:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,RDNS_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from lists.gnu.org (unknown [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A863416E9A for ; Wed, 17 Apr 2019 14:26:20 +0100 (BST) Received: from localhost ([127.0.0.1]:52480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGkZT-0007AI-1D for patchwork@mira.cbaines.net; Wed, 17 Apr 2019 09:25:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGcVL-0008Ns-8A for guix-patches@gnu.org; Wed, 17 Apr 2019 00:49:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGcVK-0006nQ-6w for guix-patches@gnu.org; Wed, 17 Apr 2019 00:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGcVK-0006nD-0X for guix-patches@gnu.org; Wed, 17 Apr 2019 00:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hGcVJ-0003u0-Qq for guix-patches@gnu.org; Wed, 17 Apr 2019 00:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35304] [PATCH] gnu: gnunet: Update to 0.11.3 Resent-From: Ivan Vilata-i-Balaguer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2019 04:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35304 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35304@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155547649914937 (code B ref -1); Wed, 17 Apr 2019 04:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2019 04:48:19 +0000 Received: from localhost ([127.0.0.1]:39082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hGcUd-0003sp-Di for submit@debbugs.gnu.org; Wed, 17 Apr 2019 00:48:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hGcUa-0003sY-OH for submit@debbugs.gnu.org; Wed, 17 Apr 2019 00:48:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:44953) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hGcUV-0006OP-GE for submit@debbugs.gnu.org; Wed, 17 Apr 2019 00:48:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGcUT-00080v-QX for guix-patches@gnu.org; Wed, 17 Apr 2019 00:48:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGcUS-0006Mi-G8 for guix-patches@gnu.org; Wed, 17 Apr 2019 00:48:09 -0400 Received: from lev.selidor.net ([2600:3c03:e001:1100::1]:42920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGcUS-0005hy-9u for guix-patches@gnu.org; Wed, 17 Apr 2019 00:48:08 -0400 Received: from sax.terramar.selidor.net (unknown [IPv6:2600:3c03:e001:114e:e92c:2eaf:e1cc:554a]) by lev.selidor.net (Postfix) with ESMTP id 8C470D1AA for ; Wed, 17 Apr 2019 04:36:12 +0000 (UTC) Received: by sax.terramar.selidor.net (Postfix, from userid 1000) id EF5949A3713; Wed, 17 Apr 2019 00:36:10 -0400 (EDT) Resent-From: Ivan Vilata i Balaguer Resent-Date: Wed, 17 Apr 2019 00:36:10 -0400 Resent-Message-ID: <20190417043610.GA18274@sax.terramar.selidor.net> Resent-To: guix-patches@gnu.org From: Ivan Vilata-i-Balaguer Date: Wed, 17 Apr 2019 00:25:58 -0400 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Message-ID: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Wed, 17 Apr 2019 09:25:49 -0400 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 Some dependencies of `gnunet` missing from Guix are listed but commented out. The dependency on Python 2 is removed since (according to GNUnet's changelog), the last program using it (`gnunet-qr`) was rewritten in C. `gnunet-gtk` also modified since its version no longer matches that of `gnunet` (plus added additional dependency). --- gnu/packages/gnunet.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 09fad6a268..1409d0a8a5 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -26,6 +26,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages file) #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) @@ -34,6 +35,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) @@ -55,6 +57,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xiph) @@ -231,7 +234,7 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package (name "gnunet") - (version "0.10.1") + (version "0.11.3") (source (origin (method url-fetch) @@ -239,7 +242,7 @@ supports HTTP, HTTPS and GnuTLS.") ".tar.gz")) (sha256 (base32 - "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n")))) + "0dvsv2w91sbwf62kjfw2c4w5xihhz2ykllgzwxbysvdf6a9dn194")))) (build-system gnu-build-system) (inputs `(("glpk" ,glpk) @@ -247,16 +250,21 @@ supports HTTP, HTTPS and GnuTLS.") ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("gnutls" ,gnutls/dane) + ; ("libgabe" ,libgabe) ("libextractor" ,libextractor) ("libgcrypt" ,libgcrypt) ("libidn" ,libidn) ("libmicrohttpd" ,libmicrohttpd) ; hostlist, pt, contrib, and more ("libltdl" ,libltdl) + ; ("libpbc" ,libpbc) ("libunistring" ,libunistring) ; fs and more + ; ("libzbar" ,libzbar) + ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) ; transport, certificate creation, contribs ("opus" ,opus) ; gnunet-conversation ("pulseaudio" ,pulseaudio) ; conversation ("sqlite" ,sqlite) ; sqlite bindings, *store + ("which" ,which) ("zlib" ,zlib) ("perl" ,perl) ; doxygen and more ("jansson" ,jansson) ; identity, taler (external), gnunet-json, gns @@ -264,14 +272,11 @@ supports HTTP, HTTPS and GnuTLS.") ("gmp" ,gmp) ; util ("bluez" ,bluez) ; gnunet-transport ("glib" ,glib) - ("libogg" ,libogg) ; gnunet-conversation - ("python-2" ,python-2))) ; tests, gnunet-qr + ("libogg" ,libogg))) ; gnunet-conversation (native-inputs `(("pkg-config" ,pkg-config))) (arguments - '(#:configure-flags - (list (string-append "--with-nssdir=" %output "/lib")) - #:parallel-tests? #f + '(#:parallel-tests? #f ;; test_gnunet_service_arm fails; reported upstream #:tests? #f #:phases @@ -332,14 +337,14 @@ services.") (define-public gnunet-gtk (package (inherit gnunet) (name "gnunet-gtk") - (version (package-version gnunet)) + (version "0.11.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-" version ".tar.gz")) (sha256 (base32 - "1p38k1s6a2fmcfc9a7cf1zrdycm9h06kqdyand4s3k500nj6mb4g")))) + "1vr9iyji25r87ym1jw033l9xyqfj4971anamfvz810rl65jjhb6z")))) (arguments `(#:configure-flags (list "--with-libunique" @@ -353,7 +358,8 @@ services.") ("libextractor" ,libextractor) ("glade3" ,glade3) ("qrencode" ,qrencode) - ("libunique" ,libunique))) + ("libunique" ,libunique) + ("gnutls" ,gnutls))) (native-inputs `(("pkg-config" ,pkg-config) ("libglade" ,libglade)))