From patchwork Mon Dec 27 05:04:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 35677 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 758D727BBE9; Mon, 27 Dec 2021 05:09:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BCBF527BBEA for ; Mon, 27 Dec 2021 05:09:43 +0000 (GMT) Received: from localhost ([::1]:34026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1iGU-0006tl-RN for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 00:09:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1iD0-0004SO-CF for guix-patches@gnu.org; Mon, 27 Dec 2021 00:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1iCw-0001Bl-8d for guix-patches@gnu.org; Mon, 27 Dec 2021 00:06:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1iCv-0006LE-SH for guix-patches@gnu.org; Mon, 27 Dec 2021 00:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52802] Update nheko and (some of) its dependencies Resent-From: raingloom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 05:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52802 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52802@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164058153024331 (code B ref -1); Mon, 27 Dec 2021 05:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2021 05:05:30 +0000 Received: from localhost ([127.0.0.1]:42043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1iCP-0006KM-Ou for submit@debbugs.gnu.org; Mon, 27 Dec 2021 00:05:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:59990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1iCN-0006KF-OM for submit@debbugs.gnu.org; Mon, 27 Dec 2021 00:05:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1iCB-00043G-HT for guix-patches@gnu.org; Mon, 27 Dec 2021 00:05:22 -0500 Received: from mx1.riseup.net ([198.252.153.129]:52598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1iBx-0000xH-Ph for guix-patches@gnu.org; Mon, 27 Dec 2021 00:05:03 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4JMlwD1GqpzF43d for ; Sun, 26 Dec 2021 21:05:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1640581500; bh=KZ2cysGzrab2qoGoGgJr+fOsDiW0yqO6RdFTWlMQ80o=; h=Date:From:To:Subject:In-Reply-To:References:From; b=A6Krc7pEPxcdUM0+6BN0HntBQOoNUnEniKrVDDnfM/hC4f9DZONyOMp7VvA2L9yDi 5dfZc6oCJ0NgQulb5iMyIAFTDwEFVTOEHMSrvu69xLRMH9am9L6gmFzCrb04SIB4po RHb/LvfC+N1tFscboIDSQOaD/yi66P31qLp/pAOo= X-Riseup-User-ID: 087F95BE4BF3BFBB50DFE641189FB3849E0BA31A1CF75250FB5342CC3FB29DFE Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4JMlwC3Xvsz5vYk for ; Sun, 26 Dec 2021 21:04:59 -0800 (PST) Date: Mon, 27 Dec 2021 06:04:56 +0100 From: raingloom Message-ID: <20211227060456.09f772c1@riseup.net> In-Reply-To: <20211226112849.27140d58@riseup.net> References: <20211226112849.27140d58@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 On Sun, 26 Dec 2021 11:28:49 +0100 raingloom wrote: > This is very belated. > > As far as I know all dependency updates are necessary, especially the > qtkeychain one, due to a bug: > https://github.com/Nheko-Reborn/nheko/issues/715#issuecomment-914463594 Accidentally left a commented line in the mtxclient patch that is not needed. The problem turned out to be earlyoom killing gcc. Here is the same patch without that line. From fbfd57ff186ca2124516707c39bbde3ec338ed55 Mon Sep 17 00:00:00 2001 From: raingloom Date: Fri, 10 Dec 2021 02:39:56 +0100 Subject: [PATCH 3/6] gnu: mtxclient: Update to 0.6.1. * gnu/packages/messaging.scm (mtxclient): Update to 0.6.1. [inputs]: Add curl, coeurl and libevent. --- gnu/packages/messaging.scm | 60 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 68d95bd5fa..2f8d0b8d7d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -88,6 +88,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages kerberos) #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) #:use-module (gnu packages libreoffice) @@ -549,31 +550,31 @@ (define-public libotr (define-public libsignal-protocol-c (package - (name "libsignal-protocol-c") - (version "2.3.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/WhisperSystems/libsignal-protocol-c") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk")))) - (arguments - `(;; Required for proper linking and for tests to run. - #:configure-flags '("-DBUILD_SHARED_LIBS=on" "-DBUILD_TESTING=1"))) - (build-system cmake-build-system) - (inputs (list ;; Required for tests: - check openssl)) - (native-inputs (list pkg-config)) - (home-page "https://github.com/WhisperSystems/libsignal-protocol-c") - (synopsis "Implementation of a ratcheting forward secrecy protocol") - (description "libsignal-protocol-c is an implementation of a ratcheting + (name "libsignal-protocol-c") + (version "2.3.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WhisperSystems/libsignal-protocol-c") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk")))) + (arguments + `(;; Required for proper linking and for tests to run. + #:configure-flags '("-DBUILD_SHARED_LIBS=on" "-DBUILD_TESTING=1"))) + (build-system cmake-build-system) + (inputs (list ;; Required for tests: + check openssl)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/WhisperSystems/libsignal-protocol-c") + (synopsis "Implementation of a ratcheting forward secrecy protocol") + (description "libsignal-protocol-c is an implementation of a ratcheting forward secrecy protocol that works in synchronous and asynchronous messaging environments. It can be used with messaging software to provide end-to-end encryption.") - (license license:gpl3+))) + (license license:gpl3+))) (define-public axc (package @@ -1663,9 +1664,9 @@ (define-public utox (wrap-program (string-append (assoc-ref outputs "out") "/bin/utox") ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))))))))) + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas"))))))))) (inputs `(("dbus" ,dbus) ("filteraudio" ,filteraudio) @@ -2286,7 +2287,7 @@ (define-public libqmatrixclient (define-public mtxclient (package (name "mtxclient") - (version "0.5.1") + (version "0.6.1") (source (origin (method git-fetch) @@ -2295,7 +2296,7 @@ (define-public mtxclient (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1xznfx2bhw0ahwmkxm0rs05vz05ijk5k4190rj6qp3bvb9byiajh")))) + (base32 "1a3ki45rf1fm7y4b74li76aqd4qc4y5ga5r163s0cwcpj9mp8c45")))) (arguments `(#:configure-flags (list @@ -2306,13 +2307,16 @@ (define-public mtxclient (add-before 'configure 'disable-network-tests (lambda _ (substitute* "CMakeLists.txt" - (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)") + (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)") "# add_test")) #t))))) (build-system cmake-build-system) (inputs (list boost + coeurl + curl json-modern-cxx + libevent libolm libsodium openssl -- 2.34.0