From patchwork Thu Jan 21 00:37:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 26531 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 E69EF27BC15; Thu, 21 Jan 2021 00:38:18 +0000 (GMT) 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 5385A27BC16 for ; Thu, 21 Jan 2021 00:38:14 +0000 (GMT) Received: from localhost ([::1]:49522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2NzJ-0005OZ-Ek for patchwork@mira.cbaines.net; Wed, 20 Jan 2021 19:38:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2Nz8-0005OR-LY for guix-patches@gnu.org; Wed, 20 Jan 2021 19:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2Nz8-0006Nx-CG for guix-patches@gnu.org; Wed, 20 Jan 2021 19:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2Nz8-0006zS-8r for guix-patches@gnu.org; Wed, 20 Jan 2021 19:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46012] Upgrade Nheko Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Jan 2021 00:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46012 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 46012@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161118945726837 (code B ref -1); Thu, 21 Jan 2021 00:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jan 2021 00:37:37 +0000 Received: from localhost ([127.0.0.1]:56487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2Nya-0006yf-OA for submit@debbugs.gnu.org; Wed, 20 Jan 2021 19:37:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:43618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2NyY-0006yX-3W for submit@debbugs.gnu.org; Wed, 20 Jan 2021 19:37:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2NyX-0005Jz-SN for guix-patches@gnu.org; Wed, 20 Jan 2021 19:37:25 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:35815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2NyV-00065i-1S for guix-patches@gnu.org; Wed, 20 Jan 2021 19:37:25 -0500 Received: by mail-wm1-x32c.google.com with SMTP id e15so81789wme.0 for ; Wed, 20 Jan 2021 16:37:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=yRgIOlTHMk92z9eEEtZUccFIW/LS68eNx8frUrvGhT0=; b=D55b5F6T4a+DiVj0solGDBd4vUkVMMuZMP+lVZ+G/CLjMdSIQ5GvfhTo9WDgwwbe4A d/yvOOqGZrm/hq9PZUxZkpqlzcS+faHdoVSRgHKmnZrPuXmrAERhfP4JKWNLZkB0+IR7 W8Js3ZxD/7FfwCQMA7J1JqKAMcJFFkrWqzDkYP+ktD20D2qOHQ21nDtiBQpDXW09Pe2o PUMnODJNLVDd3cEQIwJ5bGJXSDNPOCynrclkCgvsywfMUgoW0Ot+zpyDBd9sCP0RcVRH RjBRFaIT5WiSq1ax7Pz652YO+RIFonc8eWwlNm4IJlLMvR/jIb5csppdPrsKv819Dc9w VsXQ== 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:date:message-id:mime-version; bh=yRgIOlTHMk92z9eEEtZUccFIW/LS68eNx8frUrvGhT0=; b=F3Y3gdLht13tKnrrt3XwVpzfwMDWKKWPR3ARWb+ytVDJxfkNF6tCOufrb67v9ci0xg 0ZlGhwLs7D8Tym4mkR36j+iA+MHvKQ92Oqci1d1gJMR3mqFPtiCyNHTfjfC7z8VyEHVV jIF78st2WdxMNYuOTwPPCdVGp0uzIdabGT1yKeAyoLvw76p7j5idlp2uezmeCK0SYUPE OVFQ9dbMDG78PHYs/hXR7+vmPqgRRTS2Qsl7lR5ayyJXIojqMrxTeXr5DW5VYHk+USig M4Eq9sC5SYvk+EB7l3/m0SMsGg6aWSmdABtqM4k6cXTPUKgi8VLj6CnObdP/tT9PP8Up rsiA== X-Gm-Message-State: AOAM5304LX4TP0lZ6LfP3otg2oGHCRGfWR0R1w/RtB+ejW66KBZ2so+T vmQDRy1Vc9DBY0iB/U76QDqFXL5Y3Dc= X-Google-Smtp-Source: ABdhPJw40p18i69rX7mVxcFL+kckF//4ZyfGtC0xjQcM8MKXtmdPE2wCCuYWiQoLuGVfXxqtKiEuqQ== X-Received: by 2002:a1c:1f86:: with SMTP id f128mr6531958wmf.174.1611189440878; Wed, 20 Jan 2021 16:37:20 -0800 (PST) Received: from guixSD (host-95-244-15-108.retail.telecomitalia.it. [95.244.15.108]) by smtp.gmail.com with ESMTPSA id l5sm6316031wrv.44.2021.01.20.16.37.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 16:37:19 -0800 (PST) From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Date: Thu, 21 Jan 2021 01:37:19 +0100 Message-ID: <875z3ryvk0.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=anothersms@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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 Hi guix! Today nheko 0.8.0 was released. This patch series upgrades it and its dependency, mtxclient. I alsotook some time to unbundle all its dependencies (adding cpp-httplib, blurhash, and single-applicaiton-qt5). About this last dependency (single-applicaiton-qt5), I'm unsure on how to name it. Also, devs are suggested to include its source directly, and by default builds a static library. The main SingleApplication class inherit from a Qt*Application class which is choosen at build time, so the library to be useful in the target program must be built with the correct flag (I'm using the one used by nheko by default). Nheko builds and run fine. It should support voice call now, but I cannot test it (I get `[error] WebRTC: failed to start device monitor', not sure if the problem is in my setup, in gstreamer or in my package). From 5308eda5d0210beb1edfb0cdf44530a13673af41 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 18:00:51 +0100 Subject: [PATCH 5/5] gnu: nheko: Update to 0.8.0. * gnu/packages/messaging.scm (nheko): Update to 0.8.0. --- gnu/packages/messaging.scm | 50 +++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0368780fa6..c5e0c828b0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2277,7 +2277,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.0") (source (origin (method git-fetch) @@ -2286,19 +2286,40 @@ 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 "00d6wx3lcgbks74jkdyifqxf8nlravqh88fyljd0sy7kzbah9msf")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party") + #t)))) (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") "")) + (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")))) #t)) (add-after 'unpack 'fix-determinism (lambda _ @@ -2308,7 +2329,10 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (build-system qt-build-system) (inputs `(("boost" ,boost) + ("blurhash" ,blurhash) + ("cpp-httplib" ,cpp-httplib) ("cmark" ,cmark) + ("gst-plugins-bad" ,gst-plugins-bad) ; sdp & webrtc for calls ("json-modern-cxx" ,json-modern-cxx) ("libolm" ,libolm) ("lmdb" ,lmdb) @@ -2317,6 +2341,7 @@ 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) @@ -2325,8 +2350,11 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("tweeny" ,tweeny) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools) + ("single-application" ,single-application-qt5))) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") (description "@code{Nheko} want to provide a native desktop app for the -- 2.29.2