From patchwork Tue Apr 27 13:56:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 28939 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 47E2F27BC7C; Tue, 27 Apr 2021 14:57:17 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 ESMTPS id 1363227BC7D for ; Tue, 27 Apr 2021 14:57:10 +0100 (BST) Received: from localhost ([::1]:49126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbOD7-0005mq-B3 for patchwork@mira.cbaines.net; Tue, 27 Apr 2021 09:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbOD0-0005mh-GG for guix-patches@gnu.org; Tue, 27 Apr 2021 09:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lbOD0-0001L9-9E for guix-patches@gnu.org; Tue, 27 Apr 2021 09:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lbOD0-0007Qk-4L for guix-patches@gnu.org; Tue, 27 Apr 2021 09:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46012] Acknowledgement (Upgrade Nheko) Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Apr 2021 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46012 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46012@debbugs.gnu.org Received: via spool by 46012-submit@debbugs.gnu.org id=B46012.161953181328552 (code B ref 46012); Tue, 27 Apr 2021 13:57:02 +0000 Received: (at 46012) by debbugs.gnu.org; 27 Apr 2021 13:56:53 +0000 Received: from localhost ([127.0.0.1]:50407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbOCg-0007QO-H5 for submit@debbugs.gnu.org; Tue, 27 Apr 2021 09:56:53 -0400 Received: from mail-ed1-f46.google.com ([209.85.208.46]:47006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbOCd-0007QG-Ub for 46012@debbugs.gnu.org; Tue, 27 Apr 2021 09:56:41 -0400 Received: by mail-ed1-f46.google.com with SMTP id h10so70037375edt.13 for <46012@debbugs.gnu.org>; Tue, 27 Apr 2021 06:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:date:message-id:mime-version; bh=6tmf6mQxAEny3hS+rbcwWu5yvqCay3RtMhgzjja5IOU=; b=UqVVO1AhJ4SeNTmF7NEUzNyhXivwTe5LDLpuBkMW8QkUp/DsOwXsObORfoLADkCrEJ ceZHzOnRywtqK5N2yFLvTTRMaOP+aNN376lMcr9StPYD46ZPJhSp38VBAADV9EONICwz oLSJngKV63OGKgM29r8iA/wptL+O+/r7W36kj4Mo0jZivMqOI0FaybVeaU8yfAqd5nsu 1NZcu+p+IAfrC4Mnux/gGv3kQMyxhQIsjohUMiuuSJ8mz6Ey1gbcXvE+LQhOnVy+m0TY iG2ASroNBHrboGrrAaQze7lMh0I5yDIPQwUoa5iWXOjcYM/bDBup5qQqpgPGZBIeTxRw aRWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version; bh=6tmf6mQxAEny3hS+rbcwWu5yvqCay3RtMhgzjja5IOU=; b=qyJBhWZdmWiZBqh6lsFI+YhEamjBSVxQOe3F9PGtowRCCQ3l2OEIVK2NzqYylwYoaU IkMPjTMU8c4WsedK9ZEgfKEmyEsbAcf9OiRJX6lympWXC88JTgjZFBHV417dGiKg6Lca x3QvXBH5eHnd+YEFdzMQuCXdImSHNNkfR9vR9q+8nrwQqD1SehnMLeEMEVhuFspWFZM6 CrmMmImXlzkWq0X33/n/XcEDMXKjRc4rC8xDfKSxU/PvWDBG+mNjLiTeXTUcqLSduI+M t7LI5+Mx/V1QvcyH/UeYiCgsW2DrYROqLvwRXJOQKGXgdNucCXvKKQ0lecVWGp6zyh// RU1w== X-Gm-Message-State: AOAM532bUSu/f+1KaBUCdP+Mb6hyUPG3NCzrlhIXfCkjfa7HoM4SP6wV U4ShoIKEPBvbO7pMT2sx9MYgKtuncM0SAA== X-Google-Smtp-Source: ABdhPJwBBVD3rN/Xa7zT1RiG63sh6+RAeAsiLPC2qGbwnuUT0kdzvlGTCTkfxqyHTuv7WlNu3KCpXg== X-Received: by 2002:aa7:d7d6:: with SMTP id e22mr2598709eds.161.1619531794058; Tue, 27 Apr 2021 06:56:34 -0700 (PDT) Received: from guixSD (host-79-17-142-89.retail.telecomitalia.it. [79.17.142.89]) by smtp.gmail.com with ESMTPSA id u4sm19789ejf.11.2021.04.27.06.56.32 for <46012@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 06:56:33 -0700 (PDT) From: =?utf-8?q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87ft2mc7a4.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> References: <875z3ryvk0.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87ft2mc7a4.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 27 Apr 2021 15:56:32 +0200 Message-ID: <87k0onrfu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 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 Nicolò Balzarotti writes: > In the meanwhile a new version has been released, so here's the update > patch set. Discussion happened on bug#46013, v3, compared to v2, just > updates mtxclient to v 0.4.1 (with relative hash) and nheko to 0.8.1. A new version has been release. I updated the patchset accordingly. This (v4) updates mtxclient to 0.5.1, changes lmdbxx repo to the one used by nheko (nheko is the only package in guix using lmdbxx) and upgrades nheko to 0.8.2. I upgraded them all in the same commit as each upgrade breaks the other package. Thanks! From 03aed56b74489ff6f626257b6d653aeecc7c8e6a Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:54:55 +0100 Subject: [PATCH v4 4/4] gnu: nheko: Update to 0.8.2. * gnu/packages/messaging.scm (nheko): Update to 0.8.2. [source snippet]: Remove third_party folder. [arguments]: Remove -fpermissive flag, remove remove-Werror phase, add phase wrap-program and unbundle-dependencies. [inputs]: Add gst-plugins-base, gst-plugins-bad, libnice, qtkeychain, and unbundle blurhash, cpp-httplib and single-application, remove tweeny. [native-inputs]: Add doxygen, graphviz used to build documentation. [description]: Simplify by removing the long list, add new features. (mtxclient): Update to 0.5.1. [arguments]: Remove set-home phase. * gnu/packages/databases.scm (lmdbxx): Update to 1.0.0. [source]: Change repository to a fork required by nheko. [home-page]: Update accordingly. --- gnu/packages/databases.scm | 10 ++--- gnu/packages/messaging.scm | 91 ++++++++++++++++++++++---------------- 2 files changed, 57 insertions(+), 44 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f9e63f3722..88d5120f2e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Pierre Neidhardt -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Guy Fleury Iteriteka @@ -2437,16 +2437,16 @@ virtual address space — not physical RAM.") (define-public lmdbxx (package (name "lmdbxx") - (version "0.9.14.0") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/drycpp/lmdbxx") + (url "https://github.com/hoytech/lmdbxx") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6")))) + (base32 "12k5rz74d1l0skcks9apry1svkl96g9lf5dcgylgjmh7v1jm0b7c")))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) @@ -2455,7 +2455,7 @@ virtual address space — not physical RAM.") (delete 'configure)))) (build-system gnu-build-system) (inputs `(("lmdb" ,lmdb))) - (home-page "http://lmdbxx.sourceforge.net") + (home-page "https://github.com/hoytech/lmdbxx") (synopsis "C++11 wrapper for the LMDB embedded B+ tree database library") (description "@code{lmdbxx} is a comprehensive @code{C++} wrapper for the @code{LMDB} embedded database library, offering both an error-checked diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c356498fd2..b8bb172020 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019, 2020 Timotej Lazar -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Reza Alizadeh Majd @@ -2250,7 +2250,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.5.1") (source (origin (method git-fetch) @@ -2259,7 +2259,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1xznfx2bhw0ahwmkxm0rs05vz05ijk5k4190rj6qp3bvb9byiajh")))) (arguments `(#:configure-flags (list @@ -2272,12 +2272,6 @@ QMatrixClient project.") (substitute* "CMakeLists.txt" (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)") "# add_test")) - #t)) - (add-before 'configure 'set-home - (lambda _ - ;; Tries to create package registry file - ;; So, set HOME. - (setenv "HOME" "/tmp") #t))))) (build-system cmake-build-system) (inputs @@ -2300,7 +2294,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.7.2") + (version "0.8.2") (source (origin (method git-fetch) @@ -2309,30 +2303,60 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s")))) + (base32 "0362hkbprc6jqlgmvzwxyvify4b1ldjakyqdz55m25xsypbpv2f3")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party"))))) (arguments `(#:tests? #f ;no test target #:configure-flags - (list - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_CXX_FLAGS=-fpermissive") + '("-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_DOCS=ON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS= \"-DQAPPLICATION_CLASS=QApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recompile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=ON") #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-Werror - (lambda _ - (substitute* "CMakeLists.txt" - (("-Werror") "")) - #t)) + (add-after 'unpack 'unbundle-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (let ((single-app (assoc-ref inputs "single-application"))) + (substitute* "CMakeLists.txt" + ;; Remove include and source dirs,replace with the correct one + (("third_party/blurhash/blurhash.cpp") "") + (("third_party/cpp-httplib-0.5.12") + (string-append "\"" single-app "/include\"")) + (("add_subdirectory.*third_party/SingleApplication.*") "") + ;; Link using the correct static/shared libs + (("SingleApplication::SingleApplication") + (string-append + ;; Dynamic libraries + "httplib" "\n" "blurhash" "\n" + ;; Static library + single-app "/lib/libSingleApplication.a")))))) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t))))) + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1"))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/nheko") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))))))) (build-system qt-build-system) (inputs `(("boost" ,boost) + ("blurhash" ,blurhash) + ("cpp-httplib" ,cpp-httplib) ("cmark" ,cmark) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-bad" ,gst-plugins-bad) ; sdp & webrtc for voip + ("gst-plugins-good" ,gst-plugins-good) ; rtpmanager for voip ("json-modern-cxx" ,json-modern-cxx) + ("libnice" ,libnice) ; for voip ("libolm" ,libolm) ("lmdb" ,lmdb) ("lmdbxx" ,lmdbxx) @@ -2340,15 +2364,18 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) - ("tweeny" ,tweeny) + ("single-application" ,single-application-qt5) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") @@ -2356,22 +2383,8 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") Matrix protocol that feels more like a mainstream chat app and less like an IRC client. -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent unencrypted). -@item User registration. -@item Creating, joining & leaving rooms. -@item Sending & receiving invites. -@item Sending & receiving files and emoji. -@item Typing notifications. -@item Username auto-completion. -@item Message & mention notifications. -@item Redacting messages. -@item Read receipts. -@item Basic communities support. -@item Room switcher (@key{ctrl-K}). -@item Light, Dark & System themes. -@end itemize") +Many matrix features are supported, including user registration, rooms, typing +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) (define-public quaternion -- 2.31.1