From unknown Sun Jun 22 08:09:41 2025 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 Content-Type: multipart/mixed; boundary="=-=-=" 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-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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). Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.9 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain 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). --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-cpp-httplib.patch Content-Transfer-Encoding: quoted-printable >From 38be202dce880dd77a5ce774c0c8877bed84975e Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 10:08:20 +0100 Subject: [PATCH 1/5] gnu: Add cpp-httplib. * gnu/packages/cpp.scm (cpp-httplib): New variable. --- gnu/packages/cpp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 45d3faeafb..2a03ec58c5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -16,6 +16,7 @@ ;;; Copyright =C2=A9 2020 Alexandros Theodotou ;;; Copyright =C2=A9 2020 Greg Hogan ;;; Copyright =C2=A9 2020 Brett Gilio +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages maths) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -475,6 +477,44 @@ tools: @end itemize\n") (license license:bsd-3))) =20 +(define-public cpp-httplib + (package + (name "cpp-httplib") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "1l9n58ml7sygy723ws0z6brdbx4spc6fya6vgim11hpiy5b7zdkx")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=3DON" + "-DHTTPLIB_COMPILE=3DON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key source #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (copy-file (string-append source "/test") "test") + (chmod "test" #o744) + (invoke "make")))))) + (native-inputs + `(("python" ,python) ; required to build shared lib + ;; required for tests + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ header-only HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file header-only cross +platform blocking HTTP/HTTPS library, easy to setup. Just include the +@file{httplib.h} file in your code!") + (license license:expat))) + (define-public cpplint (package (name "cpplint") --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-Add-blurhash.patch Content-Transfer-Encoding: quoted-printable >From 8fb37dd519fcc7038e54cdc858310983e29770f1 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: [PATCH 2/5] gnu: Add blurhash. * gnu/packages/image.scm (blurhash): New variable. --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 935333dee2..d633b2aeab 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -28,6 +28,7 @@ ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020 Vinicius Monego +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -1996,6 +1998,30 @@ SNG is implemented by a compiler/decompiler called s= ng that losslessly translates between SNG and PNG.") (license license:zlib))) =20 +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as define= d in ;; lodepng.cpp. --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-mtxclient-Update-to-0.4.0.patch Content-Transfer-Encoding: quoted-printable >From 170fd188f809dd5f1f613a7bbfcf336efc191bd0 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:59:24 +0100 Subject: [PATCH 3/5] gnu: mtxclient: Update to 0.4.0. * gnu/packages/messaging.scm (mtxclient): Update to 0.4.0. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c585326124..0368780fa6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Reza Alizadeh Majd @@ -2227,7 +2227,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) @@ -2236,7 +2236,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1x820rcfz5r203dc8a0rzavcjjx10fsv1dicqg65m6kxx1w95j5r")))) (arguments `(#:configure-flags (list --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0004-gnu-Add-single-application-qt5.patch Content-Transfer-Encoding: quoted-printable >From e04e1025240dbe2abb990d7dcc39189a39179d69 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 19:23:17 +0100 Subject: [PATCH 4/5] gnu: Add single-application-qt5. * gnu/packages/qt.scm (single-application-qt5): New variable. --- gnu/packages/qt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..205d99c017 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2020 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1947,6 +1948,61 @@ using the Chromium browser project. The Chromium so= urce code has Google service and binaries removed, and adds modular support for using system libraries.= ") (license license:lgpl2.1+))) =20 +(define-public single-application-qt5 + ;; Change in function signature, nheko requires at least this commit + (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) + (package + (name "single-application-qt5") + (version (string-append "3.2.0-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/itay-grudev/SingleApplication") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + ;; Projects can decide how to build this library. You might need= to + ;; override this flag (QApplication, QGuiApplication or + ;; QCoreApplication). + #:configure-flags '("-DQAPPLICATION_CLASS=3DQApplication") + #:phases + (modify-phases %standard-phases + ;; No install target, install things manually + (replace 'install + (lambda* (#:key inputs outputs source #:allow-other-keys) + (let* ((qt (assoc-ref inputs "qtbase")) + (qt-version ,(version-major (package-version qt))) + (out (assoc-ref outputs "out"))) + (install-file + "libSingleApplication.a" (string-append out "/lib")) + (for-each + (lambda (file) + (install-file + (string-append source "/" file) + (string-append out "/include"))) + '("SingleApplication" + "singleapplication.h" "singleapplication_p.h")) + #t)))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://github.com/itay-grudev/SingleApplication") + (synopsis "Replacement of QtSingleApplication for Qt5 and Qt6") + (description + "SingleApplication is a replacement of the QtSingleApplication for = Qt5 and Qt6. + +nKeeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primar= y) +instances and can send data to the primary instance from secondary +instances.") + (license license:expat)))) + (define-public python-sip (package (name "python-sip") --=20 2.29.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-nheko-Update-to-0.8.0.patch >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 --=-=-=-- From unknown Sun Jun 22 08:09:41 2025 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: Wed, 27 Jan 2021 23:04:01 +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: To: 46012@debbugs.gnu.org Received: via spool by 46012-submit@debbugs.gnu.org id=B46012.161178859831649 (code B ref 46012); Wed, 27 Jan 2021 23:04:01 +0000 Received: (at 46012) by debbugs.gnu.org; 27 Jan 2021 23:03:18 +0000 Received: from localhost ([127.0.0.1]:46412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4tqA-0008EG-Gf for submit@debbugs.gnu.org; Wed, 27 Jan 2021 18:03:18 -0500 Received: from mail-wr1-f50.google.com ([209.85.221.50]:35125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4tq8-0008E2-2h for 46012@debbugs.gnu.org; Wed, 27 Jan 2021 18:03:09 -0500 Received: by mail-wr1-f50.google.com with SMTP id l12so3611402wry.2 for <46012@debbugs.gnu.org>; Wed, 27 Jan 2021 15:03:08 -0800 (PST) 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=gGl8kyNsslxdpc4vKBqGPr/PdxKv7hy0cgeYmgBgi8o=; b=fh2tZ2juJqhU7gg2Y5myXBK4MsBlEwPADbwYSQqg7hrFzz68sFkOj9U+7E+aYUPhMK 3IfgkMwaExVkSaP42d0VDDT6NoBL3SHJ1XrXpvx7Xub3VHh+Hskco5KyP0WWMjulWOGL uI/Gm7oUoCSQlS69WkLfpxucfBtK+y4xLfBwhmkJhLOo4vXzyuLa/QWv/st6yvepDCeD k6FM9o/5uvdec1dkTYrCWwoJ1eBgg0xLrMX5NBO4qeTdDSb8l4ushVvE4YdW7hk2pEHD iqxUqeelYDBOkqYTOZZv3QBdLe1gM1IZm/VouMPJz+um04EQ5BkNA0fuBzKDHqIKrfUq f7KQ== 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=gGl8kyNsslxdpc4vKBqGPr/PdxKv7hy0cgeYmgBgi8o=; b=ASHdlyc7sunEElqYRY2+aJd53Zy4XQtp4okWdwi3TR7qoNWVMamoHntn4QccajupT1 IckUSy3vAGzZT2dQKSegVjBLeXvWL5uwPGuDJE79nCcVNNpE2yhbIwH0rRj9fC8qyG0x bGCT8262k7IZIocGUIrPFtZARRBX71XfYP9VuAj4hrxRZT3MRxwDELZyfuaHRIlh5So4 LEnJrSFa1XfDcdzn9WUt66Rsppnpe20e7jOSPYM1K4dQqCuG5zONl6/l9cjrYsASCNJd 98XIV95r2+UTi+VoQeGTmJUh2uEtioyW/TZSETf2gV9XlOPxLXtvwBgzI2cwa1au+q2b iq3g== X-Gm-Message-State: AOAM531aM530ccqENRM2u8F2gY7zAdEon1KxA/X82x8QrNznAwaFe8EX hOKA3NWe97jVyAvve/J0Uq5XMSPI0h4= X-Google-Smtp-Source: ABdhPJyz858HHcpnLT/Xp7iyak6SsQtWuGA1+jyhBqZaSWI+eOP8hHe7HUh2lbh/7gHLcKcOILZ/oQ== X-Received: by 2002:a5d:6351:: with SMTP id b17mr13238662wrw.410.1611788582427; Wed, 27 Jan 2021 15:03:02 -0800 (PST) Received: from guixSD (host-87-4-165-57.retail.telecomitalia.it. [87.4.165.57]) by smtp.gmail.com with ESMTPSA id h18sm4697286wru.65.2021.01.27.15.03.00 for <46012@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:03:01 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: References: <875z3ryvk0.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Thu, 28 Jan 2021 00:02:59 +0100 Message-ID: <87ft2mc7a4.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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 [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.50 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.50 listed in list.dnswl.org] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v3-0001-gnu-Add-cpp-httplib.patch Content-Transfer-Encoding: quoted-printable >From 06f9fa6103ce202299bb51bea8ff2b1e46a39644 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:44:04 +0100 Subject: [PATCH v3 1/4] gnu: Add cpp-httplib. * gnu/packages/cpp.scm (cpp-httplib): New variable. --- gnu/packages/cpp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 73a3ceb2df..a1bef2332f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -16,6 +16,7 @@ ;;; Copyright =C2=A9 2020 Alexandros Theodotou ;;; Copyright =C2=A9 2020, 2021 Greg Hogan ;;; Copyright =C2=A9 2020 Brett Gilio +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages maths) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -475,6 +477,44 @@ tools: @end itemize\n") (license license:bsd-3))) =20 +(define-public cpp-httplib + (package + (name "cpp-httplib") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "1l9n58ml7sygy723ws0z6brdbx4spc6fya6vgim11hpiy5b7zdkx")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=3DON" + "-DHTTPLIB_COMPILE=3DON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key source #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (copy-file (string-append source "/test") "test") + (chmod "test" #o744) + (invoke "make")))))) + (native-inputs + `(("python" ,python) ; required to build shared lib + ;; required for tests + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ header-only HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file header-only cross +platform blocking HTTP/HTTPS library, easy to setup. Just include the +@file{httplib.h} file in your code!") + (license license:expat))) + (define-public cpplint (package (name "cpplint") --=20 2.30.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v3-0002-gnu-Add-blurhash.patch Content-Transfer-Encoding: quoted-printable >From a465b378ec920f990b72e80df31a42a6083c3f23 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: [PATCH v3 2/4] gnu: Add blurhash. * gnu/packages/image.scm (blurhash): New variable. --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 935333dee2..d633b2aeab 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -28,6 +28,7 @@ ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020 Vinicius Monego +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -1996,6 +1998,30 @@ SNG is implemented by a compiler/decompiler called s= ng that losslessly translates between SNG and PNG.") (license license:zlib))) =20 +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as define= d in ;; lodepng.cpp. --=20 2.30.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v3-0004-gnu-nheko-Update-to-0.8.1.patch Content-Transfer-Encoding: quoted-printable >From ff300d202fd083f2ad7a67c736dcb29f6588e2f6 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:54:55 +0100 Subject: [PATCH v3 4/4] gnu: nheko: Update to 0.8.1. * gnu/packages/messaging.scm (nheko): Update to 0.8.1. [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. [native-inputs]: Add doxygen, graphviz used to build documentation. [description]: Simplify by removing the long list, add new features. (mtxclient): Update to 0.4.1. [arguments]: Remove set-home phase. --- gnu/packages/messaging.scm | 90 +++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1820a146d1..806d939738 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Reza Alizadeh Majd @@ -2227,7 +2227,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.4.1") (source (origin (method git-fetch) @@ -2236,7 +2236,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n")))) (arguments `(#:configure-flags (list @@ -2249,12 +2249,6 @@ QMatrixClient project.") (substitute* "CMakeLists.txt" (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encrypt= ion|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 @@ -2277,7 +2271,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.1") (source (origin (method git-fetch) @@ -2286,30 +2280,64 @@ for the Matrix protocol. It is built on to of @cod= e{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s")))) + (base32 "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party") + #t)))) (arguments `(#:tests? #f ;no test target #:configure-flags - (list - "-DCMAKE_BUILD_TYPE=3DRelease" - "-DCMAKE_CXX_FLAGS=3D-fpermissive") + '("-DCMAKE_BUILD_TYPE=3DRelease" + "-DBUILD_DOCS=3DON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS=3D \"-DQAPPLICATION_CLASS=3DQApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recom= pile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=3DON") #: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 correc= t 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 _ ;; Make Qt deterministic. (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t))))) + #t)) + (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))) + #t)))))) (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) @@ -2317,15 +2345,19 @@ for the Matrix protocol. It is built on to of @cod= e{Boost.Asio}.") ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) + ("single-application" ,single-application-qt5) ("tweeny" ,tweeny) ("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") @@ -2333,22 +2365,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 a= n IRC client. =20 -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent u= nencrypted). -@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, ty= ping +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) =20 (define-public quaternion --=20 2.30.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v3-0004-gnu-nheko-Update-to-0.8.1.patch Content-Transfer-Encoding: quoted-printable >From ff300d202fd083f2ad7a67c736dcb29f6588e2f6 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:54:55 +0100 Subject: [PATCH v3 4/4] gnu: nheko: Update to 0.8.1. * gnu/packages/messaging.scm (nheko): Update to 0.8.1. [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. [native-inputs]: Add doxygen, graphviz used to build documentation. [description]: Simplify by removing the long list, add new features. (mtxclient): Update to 0.4.1. [arguments]: Remove set-home phase. --- gnu/packages/messaging.scm | 90 +++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1820a146d1..806d939738 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Reza Alizadeh Majd @@ -2227,7 +2227,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.4.1") (source (origin (method git-fetch) @@ -2236,7 +2236,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n")))) (arguments `(#:configure-flags (list @@ -2249,12 +2249,6 @@ QMatrixClient project.") (substitute* "CMakeLists.txt" (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encrypt= ion|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 @@ -2277,7 +2271,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.1") (source (origin (method git-fetch) @@ -2286,30 +2280,64 @@ for the Matrix protocol. It is built on to of @cod= e{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s")))) + (base32 "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party") + #t)))) (arguments `(#:tests? #f ;no test target #:configure-flags - (list - "-DCMAKE_BUILD_TYPE=3DRelease" - "-DCMAKE_CXX_FLAGS=3D-fpermissive") + '("-DCMAKE_BUILD_TYPE=3DRelease" + "-DBUILD_DOCS=3DON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS=3D \"-DQAPPLICATION_CLASS=3DQApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recom= pile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=3DON") #: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 correc= t 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 _ ;; Make Qt deterministic. (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t))))) + #t)) + (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))) + #t)))))) (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) @@ -2317,15 +2345,19 @@ for the Matrix protocol. It is built on to of @cod= e{Boost.Asio}.") ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) + ("single-application" ,single-application-qt5) ("tweeny" ,tweeny) ("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") @@ -2333,22 +2365,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 a= n IRC client. =20 -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent u= nencrypted). -@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, ty= ping +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) =20 (define-public quaternion --=20 2.30.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 27 09:13:46 2021 Received: (at control) by debbugs.gnu.org; 27 Apr 2021 13:13:46 +0000 Received: from localhost ([127.0.0.1]:48281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbNX7-0003ab-SR for submit@debbugs.gnu.org; Tue, 27 Apr 2021 09:13:46 -0400 Received: from tobias.gr ([80.241.217.52]:59240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbNX3-0003aN-Kn for control@debbugs.gnu.org; Tue, 27 Apr 2021 09:13:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=gwn3IXjwK6z/di1bcrDRvgD2RQY7EDxQDRwiFQHA1YM=; h=date:to:from; b=bYs VzhXe2JiRtiJ1NuhlAtmom2NKJ+eKG7T3SyB+1jcou0s9JEII3ovZtnuSWvR/M6FnzsNBS yGFCgVBozos47eTXc///kVQvIm43cSeQ72nvjUzqH0UxkV4LiyFSx/aetStefnwOm7+slU J4jbtxW+LxYHGxrvKfyVgCPrPQ2gmM/YAz+3hl3x89CVZ4/wX7SzelgFTZLsOpZZSeY+mN /KZlgFXd0374SupNHWnkupPOejI4GQ05EXkPFTJ5rtYtGBud5YCrrmC8iYj5Fe24upCyuR CJuVRoHklmsxiD2bIh686mGK2zh4maX6XAu9qbpPxQQVOErlUtvHjID7txw== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id cf767657 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for ; Tue, 27 Apr 2021 13:13:47 +0000 (UTC) From: Tobias Geerinckx-Rice To: control@debbugs.gnu.org BIMI-Selector: v=BIMI1; s=default; Date: Tue, 27 Apr 2021 15:13:39 +0200 Message-ID: <877dknswe4.fsf@nckx> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) merge 47273 46012 48057 From unknown Sun Jun 22 08:09:41 2025 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 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: =?UTF-8?Q?Nicol=C3=B2?= 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 [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.46 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.46 listed in list.dnswl.org] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 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! --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v4-0001-gnu-Add-cpp-httplib.patch Content-Transfer-Encoding: quoted-printable >From 438b0f93f2f962be12f7b0f0ce6e3f6f81fa8a03 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:44:04 +0100 Subject: [PATCH v4 1/4] gnu: Add cpp-httplib. * gnu/packages/cpp.scm (cpp-httplib): New variable. --- gnu/packages/cpp.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 58345e7c33..77af6a05f9 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2020 Brett Gilio ;;; Copyright =C2=A9 2020 Milkey Mouse ;;; Copyright =C2=A9 2021 Raghav Gururajan - +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +65,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -555,6 +556,44 @@ tools: @end itemize\n") (license license:bsd-3))) =20 +(define-public cpp-httplib + (package + (name "cpp-httplib") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "1l9n58ml7sygy723ws0z6brdbx4spc6fya6vgim11hpiy5b7zdkx")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=3DON" + "-DHTTPLIB_COMPILE=3DON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key source #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (copy-file (string-append source "/test") "test") + (chmod "test" #o744) + (invoke "make")))))) + (native-inputs + `(("python" ,python) ; required to build shared lib + ;; required for tests + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ header-only HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file header-only cross +platform blocking HTTP/HTTPS library, easy to setup. Just include the +@file{httplib.h} file in your code!") + (license license:expat))) + (define-public cpplint (package (name "cpplint") --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v4-0002-gnu-Add-blurhash.patch Content-Transfer-Encoding: quoted-printable >From 38ee912b3664a23b68015e011340a773cd0a4073 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: [PATCH v4 2/4] gnu: Add blurhash. * gnu/packages/image.scm (blurhash): New variable. --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d0c12016ca..a12d067ed7 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020, 2021 Vinicius Monego ;;; Copyright =C2=A9 2021 Sharlatan Hellseher +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -2035,6 +2037,30 @@ SNG is implemented by a compiler/decompiler called s= ng that losslessly translates between SNG and PNG.") (license license:zlib))) =20 +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as define= d in ;; lodepng.cpp. --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v4-0003-gnu-Add-single-application-qt5.patch Content-Transfer-Encoding: quoted-printable >From a843f4b89ceaa1bf9d269ff3037f948bb0edbd47 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 19:23:17 +0100 Subject: [PATCH v4 3/4] gnu: Add single-application-qt5. * gnu/packages/qt.scm (single-application-qt5): New variable. --- gnu/packages/qt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b206deaeba..c9eef185c9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -21,6 +21,7 @@ ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Brendan Tildesley +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1806,6 +1807,61 @@ using the Chromium browser project. The Chromium so= urce code has Google service and binaries removed, and adds modular support for using system libraries.= ") (license license:lgpl2.1+))) =20 +(define-public single-application-qt5 + ;; Change in function signature, nheko requires at least this commit + (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) + (package + (name "single-application-qt5") + (version (string-append "3.2.0-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/itay-grudev/SingleApplication") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + ;; Projects can decide how to build this library. You might need= to + ;; override this flag (QApplication, QGuiApplication or + ;; QCoreApplication). + #:configure-flags '("-DQAPPLICATION_CLASS=3DQApplication") + #:phases + (modify-phases %standard-phases + ;; No install target, install things manually + (replace 'install + (lambda* (#:key inputs outputs source #:allow-other-keys) + (let* ((qt (assoc-ref inputs "qtbase")) + (qt-version ,(version-major (package-version qt))) + (out (assoc-ref outputs "out"))) + (install-file + "libSingleApplication.a" (string-append out "/lib")) + (for-each + (lambda (file) + (install-file + (string-append source "/" file) + (string-append out "/include"))) + '("SingleApplication" + "singleapplication.h" "singleapplication_p.h")) + #t)))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://github.com/itay-grudev/SingleApplication") + (synopsis "Replacement of QtSingleApplication for Qt5 and Qt6") + (description + "SingleApplication is a replacement of the QtSingleApplication for = Qt5 and Qt6. + +nKeeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primar= y) +instances and can send data to the primary instance from secondary +instances.") + (license license:expat)))) + (define-public python-sip (package (name "python-sip") --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v4-0004-gnu-nheko-Update-to-0.8.2.patch Content-Transfer-Encoding: quoted-printable >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 =C2=A9 2019 Pierre Langlois ;;; Copyright =C2=A9 2019, 2021 Guillaume Le Vaillant ;;; Copyright =C2=A9 2020 Pierre Neidhardt -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Tanguy Le Carrour ;;; Copyright =C2=A9 2020 Lars-Dominik Braun ;;; Copyright =C2=A9 2020 Guy Fleury Iteriteka @@ -2437,16 +2437,16 @@ virtual address space =E2=80=94 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=3D" (assoc-ref %outputs "out"))) @@ -2455,7 +2455,7 @@ virtual address space =E2=80=94 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 librar= y") (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 =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 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|Encrypt= ion|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 @cod= e{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=3DRelease" - "-DCMAKE_CXX_FLAGS=3D-fpermissive") + '("-DCMAKE_BUILD_TYPE=3DRelease" + "-DBUILD_DOCS=3DON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS=3D \"-DQAPPLICATION_CLASS=3DQApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recom= pile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=3DON") #: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 correc= t 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 @cod= e{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 a= n IRC client. =20 -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent u= nencrypted). -@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, ty= ping +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) =20 (define-public quaternion --=20 2.31.1 --=-=-=-- From unknown Sun Jun 22 08:09:41 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#46012] Acknowledgement (Upgrade Nheko) Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Apr 2021 18:10:01 +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: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti , 46012@debbugs.gnu.org Received: via spool by 46012-submit@debbugs.gnu.org id=B46012.161954696114373 (code B ref 46012); Tue, 27 Apr 2021 18:10:01 +0000 Received: (at 46012) by debbugs.gnu.org; 27 Apr 2021 18:09:21 +0000 Received: from localhost ([127.0.0.1]:50864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbS9B-0003jl-EK for submit@debbugs.gnu.org; Tue, 27 Apr 2021 14:09:21 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:60852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbS97-0003jZ-W1 for 46012@debbugs.gnu.org; Tue, 27 Apr 2021 14:09:20 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id xu9G240040mfAB406u9G06; Tue, 27 Apr 2021 20:09:16 +0200 Message-ID: <0d873a1e5f8db448e279d558d9f6845e161cccb7.camel@telenet.be> From: Maxime Devos Date: Tue, 27 Apr 2021 20:09:08 +0200 In-Reply-To: <87k0onrfu7.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> <87k0onrfu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-//tY9B7+5SsLG3GHBbQD" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1619546956; bh=5cEn7f6uh0VVSybazQlbayqqGEcZYJBBNpuyEwvtJjQ=; h=Subject:From:To:Date:In-Reply-To:References; b=GlZyzdJ78e+eu6e0tGheFyBrEC8Qzo6BHA36zDOEe9xGVJhqngqAWCvyxGOTD3ooY iUgAmYPGRJq4OXF8MtRpC7kfu92moXKQ4bUb4e+DYydS6FBDzYVsebQSiv1TajnZ70 fjxl2dnq3A6NNe4r+OJjpF/8Gnpxw9ROW6LPhOZE9641vEuCfLBWdLVQB84a30etqv V6vZTubOHN04z63Ijd7m2J5fepb2CM7ZXwUMUCZrBZ7PruegEg9iNtK/VTdWYkjm5B owrUC82y9LciFOVO4XDsrjNufB3BSxbOz3PT7qEQyr4N20mZFlPzwjfgICHvTKYNXO a22wE2kwHYMAw== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-//tY9B7+5SsLG3GHBbQD Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti schreef op di 27-04-2021 om 15:56 [+0200]: > + (synopsis "C++ header-only HTTP/HTTPS server and client library") > + (description "cpp-httplib is a C++11 single-file header-only cross > +platform blocking HTTP/HTTPS library, easy to setup. Just include the > +@file{httplib.h} file in your code!") This is a little misleading, as shared libraries are build, as BUILD_SHARED= _LIBS is enabled. Maybe "cpp-http is a single-file header-only library" --> "cpp-http can be used as a single-file header-only=20 library"? About =E2=80=98header-only=E2=80=99: this is true, but ultimately irrelevan= t to the user (=3D C++ developer on a Guix System or using Guix on top of a foreign distr= o). But there's also a desirable thing called =E2=80=98portability=E2=80=99, th= e user might be searching for a single-header web server software to distribute to other people (not on Guix) in source form ... I'm conflicted if "single-file header" should be included in the descriptio= n. If you decide to remove it, I suggest you add a comment like ;; this package is not graftable, as everything is implemented in a singl= e ;; header to prevent trouble in a (admittedly somewhat far-fetched, no insult intende= d to its developers) future where cpp-httplib becomes a very popular dependen= cy in Guix. > + #:phases > + (modify-phases %standard-phases > + (replace 'check > + (lambda* (#:key source #:allow-other-keys) > + ;; openssl genrsa wants to write a file in the git checkout > + (copy-file (string-append source "/test") "test") > + (chmod "test" #o744) > + (invoke "make")))))) Tests most likely should not be run when cross-compiling. I'm not 100% sur= e, but you might need to do something like > + (lambda* (#:key tests? source #:allow-other-keys) > + ;; openssl genrsa wants to write a file in the git checkout > + (when tests? > + (copy-file (string-append source "/test") "test") > + (chmod "test" #o744) > + (invoke "make"))))))) Search for example for "when tests?" in gnu/packages/python-xyz.scm. > + ("zlib" ,zlib))) In I see a few lines #ifdef CPPHTTPLIB_ZLIB_SUPPORT #include #endif so it seems zlib should be in (inputs ...) instead. I also saw these lines: #ifdef CPPHTTPLIB_BROTLI_SUPPORT #include #include #endif Would it be useful to include brotli? #ifdef CPPHTTPLIB_OPENSSL_SUPPORT #include #include ... Likewise, for openssl? Greetings, Maxime. --=-//tY9B7+5SsLG3GHBbQD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYIhTRBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vk4AQDTpwkB30S1On0jKIQEbcdCWT4u eEqjY2juhlzJibCa6QEApqJrVdZepIHcGbb3A/KgU69qUJh7XDBl1KSHAqDUOg8= =uVKs -----END PGP SIGNATURE----- --=-//tY9B7+5SsLG3GHBbQD-- From unknown Sun Jun 22 08:09:41 2025 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 21:01: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: Maxime Devos , 46012@debbugs.gnu.org Received: via spool by 46012-submit@debbugs.gnu.org id=B46012.161955724630371 (code B ref 46012); Tue, 27 Apr 2021 21:01:02 +0000 Received: (at 46012) by debbugs.gnu.org; 27 Apr 2021 21:00:46 +0000 Received: from localhost ([127.0.0.1]:51042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbUou-0007tb-6K for submit@debbugs.gnu.org; Tue, 27 Apr 2021 17:00:46 -0400 Received: from mail-ed1-f52.google.com ([209.85.208.52]:36533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbUoo-0007tL-GI for 46012@debbugs.gnu.org; Tue, 27 Apr 2021 17:00:35 -0400 Received: by mail-ed1-f52.google.com with SMTP id q6so12339854edr.3 for <46012@debbugs.gnu.org>; Tue, 27 Apr 2021 14:00:30 -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=enFdPwJEcvtKSzBLVN98l3rZpeN8NsqYlPMhYJQG68s=; b=fUJ7L27IYqguURZylo52QqRaj2CHl/W9tiqDIQFhmetdCGdQVFN+XIDC3PkOpMNgfK 5mBR6/T8XMKpKpyVEKSWkmYN8yxzwNwlTZFHHYeiTatWnYLOHpue0MzmVRCUrHK74k1a ZlvBUSq/0VdNU/OargYj4J1Ah/68nJoW740M3rb5WFuas04TKb4zh7haxQGOJYQ4zxgt xQgiHSc0SYf0dpZGCS5v7hzjLNP2TgcDyXmuwt1ntm/cOm75SY0RADM6LkQjKr9XQpV1 IZtfJF2PE+GbXK9nU89Dmop3MdaUffaZbPfQ0sSkBukbOtEAXcBvnVyzD4Vfq04lGziG cFIg== 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=enFdPwJEcvtKSzBLVN98l3rZpeN8NsqYlPMhYJQG68s=; b=qhzaaBfcZzC4y/nz4LAb038n3JHH5aCXUBG30Yo2k+v8ODARdKRXaipPmgKG5OiBho kx5Q199tt3cPB+T8wEDnADX+945ASBoah0f+NYK/twOBv00wN4o6nyp+POibdFQ8K6w4 uTZoHXeanaxfh+ivWGFakSfcx1OknZnavibx6vxm1BUWW4DWEYbQmSiPdT3+dfDdGWg2 m7UeHlaWPAQEz+/L5Ht9dAmgoJSBtbQqnEIVnA+Brr3cVPxcRe9hO/BI/RqhPJTohW9U kuM6Wzv5q11iqqEYNnsm/0tqpvOy8dp+vQ8bNwIHjDAbVmYcpaW1lRkfkrDoSXPyzxr/ Fzaw== X-Gm-Message-State: AOAM530b2zc6W57yoERpc+xm9+eo8kqCCx91LF2xpm6k3dqno/WUsYx2 vR67xsfGuSWaBt9Xl/SHzGDJZLpCkJw= X-Google-Smtp-Source: ABdhPJxvebZTuNUiwPtGJeUQYTpptfF1spj/LqYaT5Lge0iI1zPGbkw56xLI3sxYqd2T9SZU4UNpYQ== X-Received: by 2002:aa7:dc54:: with SMTP id g20mr6660564edu.266.1619557224498; Tue, 27 Apr 2021 14:00:24 -0700 (PDT) Received: from guixSD (host-79-17-142-89.retail.telecomitalia.it. [79.17.142.89]) by smtp.gmail.com with ESMTPSA id v14sm1533055eds.34.2021.04.27.14.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 14:00:23 -0700 (PDT) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <0d873a1e5f8db448e279d558d9f6845e161cccb7.camel@telenet.be> 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> <87k0onrfu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <0d873a1e5f8db448e279d558d9f6845e161cccb7.camel@telenet.be> Date: Tue, 27 Apr 2021 23:00:22 +0200 Message-ID: <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Maxime, many thanks for the review! Maxime Devos writes: > =?UTF-8?Q?Nicol=C3=B2?= Balzarotti schreef op di 27-04-2021 om 15:56 [+0200]: >> + (synopsis "C++ header-only HTTP/HTTPS server and client library") >> + (description "cpp-httplib is a C++11 single-file header-only [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.52 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.52 listed in wl.mailspike.net] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Maxime, many thanks for the review! Maxime Devos writes: > Nicol=C3=B2 Balzarotti schreef op di 27-04-2021 om 15:56 [+0200]: >> + (synopsis "C++ header-only HTTP/HTTPS server and client library") >> + (description "cpp-httplib is a C++11 single-file header-only cross >> +platform blocking HTTP/HTTPS library, easy to setup. Just include the >> +@file{httplib.h} file in your code!") > > This is a little misleading, as shared libraries are build, as BUILD_SHAR= ED_LIBS > is enabled. Maybe "cpp-http is a single-file header-only library" --> > "cpp-http can be used as a single-file header-only=20 > library"? > I removed it from the synopsis, and reworded the description to: 1. make it sound less like marketing, and keeping the single-header thing as a bonu= s. > About =E2=80=98header-only=E2=80=99: this is true, but ultimately irrelev= ant to the user > (=3D C++ developer on a Guix System or using Guix on top of a foreign dis= tro). > But there's also a desirable thing called =E2=80=98portability=E2=80=99, = the user might be > searching for a single-header web server software to distribute to other > people (not on Guix) in source form ... > > I'm conflicted if "single-file header" should be included in the descript= ion. > If you decide to remove it, I suggest you add a comment like > > ;; this package is not graftable, as everything is implemented in a sin= gle > ;; header > > to prevent trouble in a (admittedly somewhat far-fetched, no insult inten= ded > to its developers) future where cpp-httplib becomes a very popular depend= ency > in Guix. > I don't know enought about grafts, so I trust you on that. I did not know where to put the comment, so I added it at the very top. I also noticed that this was updated since last time, so I updated it to 0.8.8 (latest tagged version). >> + #:phases >> + (modify-phases %standard-phases >> + (replace 'check >> + (lambda* (#:key source #:allow-other-keys) >> + ;; openssl genrsa wants to write a file in the git checkout >> + (copy-file (string-append source "/test") "test") >> + (chmod "test" #o744) >> + (invoke "make")))))) > > Tests most likely should not be run when cross-compiling. > I'm not 100% sure, but you might need to do something like > >> + (lambda* (#:key tests? source #:allow-other-keys) >> + ;; openssl genrsa wants to write a file in the git checkout >> + (when tests? >> + (copy-file > (string-append source "/test") "test") >> + (chmod "test" #o744) >> + (invoke "make"))))))) > Didn't think about that, I wrapped it in a `when tests?` (and added `tests?` as argument to the lambda) as you suggested. I also changed it a bit making it more clear. There are now tests requiring network access, so I disabled them. > >> + ("zlib" ,zlib))) > > In I see > a few lines > > #ifdef CPPHTTPLIB_ZLIB_SUPPORT > #include > #endif > > so it seems zlib should be in (inputs ...) instead. > > I also saw these lines: > > #ifdef CPPHTTPLIB_BROTLI_SUPPORT > #include > #include > #endif > > Would it be useful to include brotli? > > #ifdef CPPHTTPLIB_OPENSSL_SUPPORT > #include > #include > ... > > Likewise, for openssl? Sure, added brotli and moved openssl to inputs. I also aadded the "HTTPLIB_REQUIRE_" flags just to be sure they are used int the build. They shouldn't be needed as HTTPLIB_USE_*_IF_AVAILABLE defaults to ON, but if they change default we are covered. Regarding why openssl and zlib were in native-inputs, this is (probably) how it went: I built it without openssl, tests failed to run because the command openssl was required to generate a certificate, so I added it to native-inputs. Then probably I added zlib not noticing I placed it under native-inputs, at least that's how I think it went. nheko still builds and run, so here the v5 of the series. > > Greetings, > Maxime. Thanks, Nicol=C3=B2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v5-0001-gnu-Add-cpp-httplib.patch Content-Transfer-Encoding: quoted-printable >From 5ea66aa57f81976d39c60f59357ddf6027fadabb Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:44:04 +0100 Subject: [PATCH v5 1/4] gnu: Add cpp-httplib. * gnu/packages/cpp.scm (cpp-httplib): New variable. --- gnu/packages/cpp.scm | 63 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 58345e7c33..307e5c3028 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2020 Brett Gilio ;;; Copyright =C2=A9 2020 Milkey Mouse ;;; Copyright =C2=A9 2021 Raghav Gururajan - +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +65,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -555,6 +556,66 @@ tools: @end itemize\n") (license license:bsd-3))) =20 +(define-public cpp-httplib + ;; this package is not graftable, as everything is implemented in a sing= le + ;; header + (package + (name "cpp-httplib") + (version "0.8.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "0c0gyfbvm34bgrqy9fhfxw1f8nb9zhf063j7xq91k892flb7qm1c")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=3DON" + "-DHTTPLIB_COMPILE=3DON" + "-DHTTPLIB_REQUIRE_BROTLI=3DON" + "-DHTTPLIB_REQUIRE_OPENSSL=3DON" + "-DHTTPLIB_REQUIRE_ZLIB=3DON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-network-tests + (lambda _ + (for-each + (lambda (test) + (substitute* "test/test.cc" + (((string-append "\\(" test)) + (string-append "(DISABLED_" test)))) + ;; There are tests requiring network access, disable them + '("AbsoluteRedirectTest" "BaseAuthTest" "CancelTest" + "ChunkedEncodingTest" "ChunkedEncodingTest" + "DecodeWithChunkedEncoding" "DefaultHeadersTest" + "DigestAuthTest" "HttpsToHttpRedirectTest" + "RangeTest" "RedirectTest" "RelativeRedirectTest" + "SSLClientTest" "SendAPI" "TooManyRedirectTest" "UrlWithSp= ace" + "YahooRedirectTest" "YahooRedirectTest")))) + (replace 'check + (lambda* (#:key source tests? #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (when tests? + (with-directory-excursion "../source/test" + (invoke "make")))))))) + (native-inputs + ;; required to build shared lib + `(("python" ,python))) + (inputs + `(("brotli" ,brotli) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file cross platform blocki= ng +HTTP/HTTPS library, easy to setup. It can also be used as a single-header +library.") + (license license:expat))) + (define-public cpplint (package (name "cpplint") --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v5-0002-gnu-Add-blurhash.patch Content-Transfer-Encoding: quoted-printable >From f2982d9f3a8f6fcf66950ed78259125f3750ca08 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: [PATCH v5 2/4] gnu: Add blurhash. * gnu/packages/image.scm (blurhash): New variable. --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d0c12016ca..a12d067ed7 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020, 2021 Vinicius Monego ;;; Copyright =C2=A9 2021 Sharlatan Hellseher +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -2035,6 +2037,30 @@ SNG is implemented by a compiler/decompiler called s= ng that losslessly translates between SNG and PNG.") (license license:zlib))) =20 +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as define= d in ;; lodepng.cpp. --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v5-0003-gnu-Add-single-application-qt5.patch Content-Transfer-Encoding: quoted-printable >From a709f28a8dacd890a46eb848bbf6b42efaa6a447 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 19:23:17 +0100 Subject: [PATCH v5 3/4] gnu: Add single-application-qt5. * gnu/packages/qt.scm (single-application-qt5): New variable. --- gnu/packages/qt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b206deaeba..c9eef185c9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -21,6 +21,7 @@ ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Brendan Tildesley +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1806,6 +1807,61 @@ using the Chromium browser project. The Chromium so= urce code has Google service and binaries removed, and adds modular support for using system libraries.= ") (license license:lgpl2.1+))) =20 +(define-public single-application-qt5 + ;; Change in function signature, nheko requires at least this commit + (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) + (package + (name "single-application-qt5") + (version (string-append "3.2.0-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/itay-grudev/SingleApplication") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + ;; Projects can decide how to build this library. You might need= to + ;; override this flag (QApplication, QGuiApplication or + ;; QCoreApplication). + #:configure-flags '("-DQAPPLICATION_CLASS=3DQApplication") + #:phases + (modify-phases %standard-phases + ;; No install target, install things manually + (replace 'install + (lambda* (#:key inputs outputs source #:allow-other-keys) + (let* ((qt (assoc-ref inputs "qtbase")) + (qt-version ,(version-major (package-version qt))) + (out (assoc-ref outputs "out"))) + (install-file + "libSingleApplication.a" (string-append out "/lib")) + (for-each + (lambda (file) + (install-file + (string-append source "/" file) + (string-append out "/include"))) + '("SingleApplication" + "singleapplication.h" "singleapplication_p.h")) + #t)))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://github.com/itay-grudev/SingleApplication") + (synopsis "Replacement of QtSingleApplication for Qt5 and Qt6") + (description + "SingleApplication is a replacement of the QtSingleApplication for = Qt5 and Qt6. + +nKeeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primar= y) +instances and can send data to the primary instance from secondary +instances.") + (license license:expat)))) + (define-public python-sip (package (name "python-sip") --=20 2.31.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v5-0004-gnu-nheko-Update-to-0.8.2.patch Content-Transfer-Encoding: quoted-printable >From 2564b19691b0721407ee48f90de18353796278d0 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 23:54:55 +0100 Subject: [PATCH v5 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 =C2=A9 2019 Pierre Langlois ;;; Copyright =C2=A9 2019, 2021 Guillaume Le Vaillant ;;; Copyright =C2=A9 2020 Pierre Neidhardt -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Tanguy Le Carrour ;;; Copyright =C2=A9 2020 Lars-Dominik Braun ;;; Copyright =C2=A9 2020 Guy Fleury Iteriteka @@ -2437,16 +2437,16 @@ virtual address space =E2=80=94 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=3D" (assoc-ref %outputs "out"))) @@ -2455,7 +2455,7 @@ virtual address space =E2=80=94 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 librar= y") (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 =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 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|Encrypt= ion|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 @cod= e{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=3DRelease" - "-DCMAKE_CXX_FLAGS=3D-fpermissive") + '("-DCMAKE_BUILD_TYPE=3DRelease" + "-DBUILD_DOCS=3DON" + ;; Fix required because we are using a static SingleApplication + "-DCMAKE_CXX_FLAGS=3D \"-DQAPPLICATION_CLASS=3DQApplication\" " + ;; Compile Qml will make Nheko faster, but you will need to recom= pile + ;; it, when you update Qt. That's fine for us. + "-DCOMPILE_QML=3DON") #: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 correc= t 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 @cod= e{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 a= n IRC client. =20 -There is support for: -@itemize -@item E2E encryption (text messages only: attachments are currently sent u= nencrypted). -@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, ty= ping +notification, emojis, E2E encryption, and voip calls.") (license license:gpl3+))) =20 (define-public quaternion --=20 2.31.1 --=-=-=-- From unknown Sun Jun 22 08:09:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Subject: bug#46012: closed (Re: bug#46012: Upgrade Nheko) Message-ID: References: <87y28dzamc.fsf_-_@gnu.org> <875z3ryvk0.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> X-Gnu-PR-Message: they-closed 46012 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 46012@debbugs.gnu.org Date: Fri, 03 Sep 2021 20:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1630699682-29932-1" This is a multi-part message in MIME format... ------------=_1630699682-29932-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #46012: Upgrade Nheko which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 46012@debbugs.gnu.org. --=20 46012: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D46012 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1630699682-29932-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 46012-done) by debbugs.gnu.org; 3 Sep 2021 20:07:33 +0000 Received: from localhost ([127.0.0.1]:45927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMFTJ-0007m8-Cn for submit@debbugs.gnu.org; Fri, 03 Sep 2021 16:07:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMFTH-0007lu-46 for 46012-done@debbugs.gnu.org; Fri, 03 Sep 2021 16:07:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57326) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMFTB-0006mD-CG; Fri, 03 Sep 2021 16:07:25 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48854 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMFTB-0002fC-43; Fri, 03 Sep 2021 16:07:25 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: =?utf-8?Q?Nicol=C3=B2?= Balzarotti Subject: Re: bug#46012: Upgrade Nheko 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> <87k0onrfu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <0d873a1e5f8db448e279d558d9f6845e161cccb7.camel@telenet.be> <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Fri, 03 Sep 2021 22:07:23 +0200 In-Reply-To: <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> (=?utf-8?Q?=22Nicol=C3=B2?= Balzarotti"'s message of "Tue, 27 Apr 2021 23:00:22 +0200") Message-ID: <87y28dzamc.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 46012-done Cc: 46012-done@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Hi Nicol=C3=B2, Nicol=C3=B2 Balzarotti skribis: >>>From 5ea66aa57f81976d39c60f59357ddf6027fadabb Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 27 Jan 2021 23:44:04 +0100 > Subject: [PATCH v5 1/4] gnu: Add cpp-httplib. > > * gnu/packages/cpp.scm (cpp-httplib): New variable. [...] >>>From f2982d9f3a8f6fcf66950ed78259125f3750ca08 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 20 Jan 2021 17:56:04 +0100 > Subject: [PATCH v5 2/4] gnu: Add blurhash. > > * gnu/packages/image.scm (blurhash): New variable. [...] >>>From a709f28a8dacd890a46eb848bbf6b42efaa6a447 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 20 Jan 2021 19:23:17 +0100 > Subject: [PATCH v5 3/4] gnu: Add single-application-qt5. >=20 > * gnu/packages/qt.scm (single-application-qt5): New variable. [...] >>>From 2564b19691b0721407ee48f90de18353796278d0 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 27 Jan 2021 23:54:55 +0100 > Subject: [PATCH v5 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 ph= ase > 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. I=E2=80=99m really sorry that it took 7 months (!), but I=E2=80=99ve now ap= plied this series. I had to tweak =E2=80=98single-application-qt5=E2=80=99 to adjust = it to the qtbase -> qtbase-5 rename, but that=E2=80=99s about it. Thank you, and thanks Maxime for the review=E2=80=94much appreciated, as al= ways! Ludo=E2=80=99. ------------=_1630699682-29932-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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?= To: guix-patches@gnu.org Subject: Upgrade Nheko 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 Content-Type: multipart/mixed; boundary="=-=-=" 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-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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). Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.9 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain 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). --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-cpp-httplib.patch Content-Transfer-Encoding: quoted-printable >From 38be202dce880dd77a5ce774c0c8877bed84975e Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 10:08:20 +0100 Subject: [PATCH 1/5] gnu: Add cpp-httplib. * gnu/packages/cpp.scm (cpp-httplib): New variable. --- gnu/packages/cpp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 45d3faeafb..2a03ec58c5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -16,6 +16,7 @@ ;;; Copyright =C2=A9 2020 Alexandros Theodotou ;;; Copyright =C2=A9 2020 Greg Hogan ;;; Copyright =C2=A9 2020 Brett Gilio +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages maths) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -475,6 +477,44 @@ tools: @end itemize\n") (license license:bsd-3))) =20 +(define-public cpp-httplib + (package + (name "cpp-httplib") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yhirose/cpp-httplib") + (commit (string-append "v" version)))) + (sha256 + (base32 "1l9n58ml7sygy723ws0z6brdbx4spc6fya6vgim11hpiy5b7zdkx")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DBUILD_SHARED_LIBS=3DON" + "-DHTTPLIB_COMPILE=3DON") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key source #:allow-other-keys) + ;; openssl genrsa wants to write a file in the git checkout + (copy-file (string-append source "/test") "test") + (chmod "test" #o744) + (invoke "make")))))) + (native-inputs + `(("python" ,python) ; required to build shared lib + ;; required for tests + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://github.com/yhirose/cpp-httplib") + (synopsis "C++ header-only HTTP/HTTPS server and client library") + (description "cpp-httplib is a C++11 single-file header-only cross +platform blocking HTTP/HTTPS library, easy to setup. Just include the +@file{httplib.h} file in your code!") + (license license:expat))) + (define-public cpplint (package (name "cpplint") --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-Add-blurhash.patch Content-Transfer-Encoding: quoted-printable >From 8fb37dd519fcc7038e54cdc858310983e29770f1 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:56:04 +0100 Subject: [PATCH 2/5] gnu: Add blurhash. * gnu/packages/image.scm (blurhash): New variable. --- gnu/packages/image.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 935333dee2..d633b2aeab 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -28,6 +28,7 @@ ;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020 Vinicius Monego +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gimp) #:use-module (gnu packages gl) @@ -1996,6 +1998,30 @@ SNG is implemented by a compiler/decompiler called s= ng that losslessly translates between SNG and PNG.") (license license:zlib))) =20 +(define-public blurhash + (package + (name "blurhash") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/blurhash") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jy2iigarskwfhskyladbb6l92x1fb3i3vz4bvcks0za4w5hfxk5")))) + (build-system meson-build-system) + (native-inputs + `(("cmake" ,cmake) + ("doctest" ,doctest) + ("gcc" ,gcc-8))) + (home-page "https://github.com/Nheko-Reborn/blurhash") + (synopsis "C++ blurhash encoder/decoder") + (description "Simple encoder and decoder for blurhashes. Contains a +command line program as well as a shared library.") + (license license:boost1.0))) + (define-public lodepng ;; There are no tags in the repository, so we take the version as define= d in ;; lodepng.cpp. --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-mtxclient-Update-to-0.4.0.patch Content-Transfer-Encoding: quoted-printable >From 170fd188f809dd5f1f613a7bbfcf336efc191bd0 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 17:59:24 +0100 Subject: [PATCH 3/5] gnu: mtxclient: Update to 0.4.0. * gnu/packages/messaging.scm (mtxclient): Update to 0.4.0. --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c585326124..0368780fa6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2019 Tanguy Le Carrour ;;; Copyright =C2=A9 2019, 2020 Brett Gilio ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar -;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti +;;; Copyright =C2=A9 2020, 2021 Nicol=C3=B2 Balzarotti ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Reza Alizadeh Majd @@ -2227,7 +2227,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) @@ -2236,7 +2236,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x")))) + (base32 "1x820rcfz5r203dc8a0rzavcjjx10fsv1dicqg65m6kxx1w95j5r")))) (arguments `(#:configure-flags (list --=20 2.29.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0004-gnu-Add-single-application-qt5.patch Content-Transfer-Encoding: quoted-printable >From e04e1025240dbe2abb990d7dcc39189a39179d69 Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 20 Jan 2021 19:23:17 +0100 Subject: [PATCH 4/5] gnu: Add single-application-qt5. * gnu/packages/qt.scm (single-application-qt5): New variable. --- gnu/packages/qt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..205d99c017 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2020 Jonathan Brielmaier ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2020 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1947,6 +1948,61 @@ using the Chromium browser project. The Chromium so= urce code has Google service and binaries removed, and adds modular support for using system libraries.= ") (license license:lgpl2.1+))) =20 +(define-public single-application-qt5 + ;; Change in function signature, nheko requires at least this commit + (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) + (package + (name "single-application-qt5") + (version (string-append "3.2.0-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/itay-grudev/SingleApplication") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + ;; Projects can decide how to build this library. You might need= to + ;; override this flag (QApplication, QGuiApplication or + ;; QCoreApplication). + #:configure-flags '("-DQAPPLICATION_CLASS=3DQApplication") + #:phases + (modify-phases %standard-phases + ;; No install target, install things manually + (replace 'install + (lambda* (#:key inputs outputs source #:allow-other-keys) + (let* ((qt (assoc-ref inputs "qtbase")) + (qt-version ,(version-major (package-version qt))) + (out (assoc-ref outputs "out"))) + (install-file + "libSingleApplication.a" (string-append out "/lib")) + (for-each + (lambda (file) + (install-file + (string-append source "/" file) + (string-append out "/include"))) + '("SingleApplication" + "singleapplication.h" "singleapplication_p.h")) + #t)))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://github.com/itay-grudev/SingleApplication") + (synopsis "Replacement of QtSingleApplication for Qt5 and Qt6") + (description + "SingleApplication is a replacement of the QtSingleApplication for = Qt5 and Qt6. + +nKeeps the Primary Instance of your Application and kills each subsequent +instances. It can (if enabled) spawn secondary (non-related to the primar= y) +instances and can send data to the primary instance from secondary +instances.") + (license license:expat)))) + (define-public python-sip (package (name "python-sip") --=20 2.29.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-nheko-Update-to-0.8.0.patch >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 --=-=-=-- ------------=_1630699682-29932-1-- From unknown Sun Jun 22 08:09:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: "K I" Subject: bug#47273: closed (Re: bug#46012: Upgrade Nheko) Message-ID: References: <87y28dzamc.fsf_-_@gnu.org> X-Gnu-PR-Message: they-closed 47273 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 47273@debbugs.gnu.org Date: Fri, 03 Sep 2021 20:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1630699682-29932-3" This is a multi-part message in MIME format... ------------=_1630699682-29932-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #46012: mtxclient -> 0.4.1 Nheko -> 0.8.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 47273@debbugs.gnu.org. --=20 46012: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D46012 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1630699682-29932-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 46012-done) by debbugs.gnu.org; 3 Sep 2021 20:07:33 +0000 Received: from localhost ([127.0.0.1]:45927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMFTJ-0007m8-Cn for submit@debbugs.gnu.org; Fri, 03 Sep 2021 16:07:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMFTH-0007lu-46 for 46012-done@debbugs.gnu.org; Fri, 03 Sep 2021 16:07:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57326) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMFTB-0006mD-CG; Fri, 03 Sep 2021 16:07:25 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48854 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMFTB-0002fC-43; Fri, 03 Sep 2021 16:07:25 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: =?utf-8?Q?Nicol=C3=B2?= Balzarotti Subject: Re: bug#46012: Upgrade Nheko 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> <87k0onrfu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <0d873a1e5f8db448e279d558d9f6845e161cccb7.camel@telenet.be> <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Fri, 03 Sep 2021 22:07:23 +0200 In-Reply-To: <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> (=?utf-8?Q?=22Nicol=C3=B2?= Balzarotti"'s message of "Tue, 27 Apr 2021 23:00:22 +0200") Message-ID: <87y28dzamc.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 46012-done Cc: 46012-done@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Hi Nicol=C3=B2, Nicol=C3=B2 Balzarotti skribis: >>>From 5ea66aa57f81976d39c60f59357ddf6027fadabb Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 27 Jan 2021 23:44:04 +0100 > Subject: [PATCH v5 1/4] gnu: Add cpp-httplib. > > * gnu/packages/cpp.scm (cpp-httplib): New variable. [...] >>>From f2982d9f3a8f6fcf66950ed78259125f3750ca08 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 20 Jan 2021 17:56:04 +0100 > Subject: [PATCH v5 2/4] gnu: Add blurhash. > > * gnu/packages/image.scm (blurhash): New variable. [...] >>>From a709f28a8dacd890a46eb848bbf6b42efaa6a447 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 20 Jan 2021 19:23:17 +0100 > Subject: [PATCH v5 3/4] gnu: Add single-application-qt5. >=20 > * gnu/packages/qt.scm (single-application-qt5): New variable. [...] >>>From 2564b19691b0721407ee48f90de18353796278d0 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 27 Jan 2021 23:54:55 +0100 > Subject: [PATCH v5 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 ph= ase > 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. I=E2=80=99m really sorry that it took 7 months (!), but I=E2=80=99ve now ap= plied this series. I had to tweak =E2=80=98single-application-qt5=E2=80=99 to adjust = it to the qtbase -> qtbase-5 rename, but that=E2=80=99s about it. Thank you, and thanks Maxime for the review=E2=80=94much appreciated, as al= ways! Ludo=E2=80=99. ------------=_1630699682-29932-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Mar 2021 01:22:56 +0000 Received: from localhost ([127.0.0.1]:51234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNQKN-0007Jc-IN for submit@debbugs.gnu.org; Fri, 19 Mar 2021 21:22:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:55440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNQKJ-0007JQ-5F for submit@debbugs.gnu.org; Fri, 19 Mar 2021 21:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNQKI-0008Rt-Eo for guix-patches@gnu.org; Fri, 19 Mar 2021 21:22:50 -0400 Received: from aibo.runbox.com ([91.220.196.211]:42998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNQKE-0003Q1-Ui for guix-patches@gnu.org; Fri, 19 Mar 2021 21:22:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Message-Id:Date:Subject:To:From:MIME-Version: Content-Transfer-Encoding:Content-Type; bh=BSlSg7S0Uo5wjaJeWJ9oJnI20pnRBbIz+39tXs30j2E=; b=mFfRC9Hi/pQw2V79zQWvvJURRX L7i5lYmQcSbBpkGmgsAlQZ+rqgzT/EuVgdlSJHYrl0jQLhLw5y0jBgfVeqoV8LoXO/aDEt0RAxKlX QVf4H/cYD9j5NKFFznzDeSWrjgDF6hj5tl61WAmtSz2J0/3QHRhqlUrU/BdgTi7nwiWMcJYHYtZw1 B6QRvzJ1ynTm0A42BAZQcpp2IjLnC5j6soIl35v0lNfuGKpatUlWZDBgb09uPXCLJVYq2WhzTen8B Z5TKzrH3y43fRDWDZlFqLYNPOyvPZlx4b/EHNPOYupmsQCc8kG5qkzR/IuDwGlFuSS5pJOIdpgWnb B5q7VQrg==; Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1lNQKB-0000jW-6L for guix-patches@gnu.org; Sat, 20 Mar 2021 02:22:43 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1lNQKB-00070N-5Q for guix-patches@gnu.org; Sat, 20 Mar 2021 02:22:43 +0100 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received: from [Authenticated alias (952555)] by runbox.com with http (RMM6); for ; Sat, 20 Mar 2021 01:22:43 GMT From: "K I" To: "guix-patches" Subject: mtxclient -> 0.4.1 Nheko -> 0.8.1 Date: Fri, 19 Mar 2021 19:22:43 -0600 (MDT) X-RMM-Aliasid: 952555 X-Mailer: RMM6 Message-Id: Received-SPF: pass client-ip=91.220.196.211; envelope-from=gitlabcanada@runbox.com; helo=aibo.runbox.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello, I do not know my way around git so I am offering this code to someone if th= ey want to add it to guix proper. There were only slight changes needed. Both packages built and ran for me. (define-public mtxclient (package (name "mtxclient") (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Nheko-Reborn/mtxclient") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n")))) (arguments `(#:configure-flags (list ;; Disable example binaries (not installed) "-DBUILD_LIB_EXAMPLES=3DOFF") #:phases (modify-phases %standard-phases (add-before 'configure 'disable-network-tests (lambda _ (substitute* "CMakeLists.txt" (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encrypti= on|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 `(("boost" ,boost) ("json-modern-cxx" ,json-modern-cxx) ("libolm" ,libolm) ("libsodium" ,libsodium) ("openssl" ,openssl) ("spdlog" ,spdlog) ("zlib" ,zlib))) (native-inputs `(("googletest" ,googletest) ("pkg-config" ,pkg-config))) (home-page "https://github.com/Nheko-Reborn/mtxclient") (synopsis "Client API library for the Matrix protocol") (description "@code{mtxclient} is a C++ library that implements client = API for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (license license:expat))) (define-public nheko (package (name "nheko") (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Nheko-Reborn/nheko") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524")))) (arguments `(#:tests? #f ;no test target #:configure-flags (list "-DCMAKE_BUILD_TYPE=3DRelease" "-DCMAKE_CXX_FLAGS=3D-fpermissive") #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-Werror (lambda _ (substitute* "CMakeLists.txt" (("-Werror") "")) #t)) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") #t))))) (build-system qt-build-system) (inputs `(("boost" ,boost) ("cmark" ,cmark) ("json-modern-cxx" ,json-modern-cxx) ("libolm" ,libolm) ("lmdb" ,lmdb) ("lmdbxx" ,lmdbxx) ("mtxclient-new" ,mtxclient-new) ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) ("tweeny" ,tweeny) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (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 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 un= encrypted). @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") (license license:gpl3+)))= ------------=_1630699682-29932-3-- From unknown Sun Jun 22 08:09:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ekaitz Zarraga Subject: bug#48057: closed (Re: bug#46012: Upgrade Nheko) Message-ID: References: <87y28dzamc.fsf_-_@gnu.org> X-Gnu-PR-Message: they-closed 48057 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 48057@debbugs.gnu.org Date: Fri, 03 Sep 2021 20:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1630699682-29932-5" This is a multi-part message in MIME format... ------------=_1630699682-29932-5 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #46012: [PATCH]: Update nheko which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 48057@debbugs.gnu.org. --=20 46012: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D46012 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1630699682-29932-5 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 46012-done) by debbugs.gnu.org; 3 Sep 2021 20:07:33 +0000 Received: from localhost ([127.0.0.1]:45927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMFTJ-0007m8-Cn for submit@debbugs.gnu.org; Fri, 03 Sep 2021 16:07:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMFTH-0007lu-46 for 46012-done@debbugs.gnu.org; Fri, 03 Sep 2021 16:07:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57326) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMFTB-0006mD-CG; Fri, 03 Sep 2021 16:07:25 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48854 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMFTB-0002fC-43; Fri, 03 Sep 2021 16:07:25 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: =?utf-8?Q?Nicol=C3=B2?= Balzarotti Subject: Re: bug#46012: Upgrade Nheko 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> <87k0onrfu7.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <0d873a1e5f8db448e279d558d9f6845e161cccb7.camel@telenet.be> <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Fri, 03 Sep 2021 22:07:23 +0200 In-Reply-To: <87eeevqw7t.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> (=?utf-8?Q?=22Nicol=C3=B2?= Balzarotti"'s message of "Tue, 27 Apr 2021 23:00:22 +0200") Message-ID: <87y28dzamc.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 46012-done Cc: 46012-done@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) Hi Nicol=C3=B2, Nicol=C3=B2 Balzarotti skribis: >>>From 5ea66aa57f81976d39c60f59357ddf6027fadabb Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 27 Jan 2021 23:44:04 +0100 > Subject: [PATCH v5 1/4] gnu: Add cpp-httplib. > > * gnu/packages/cpp.scm (cpp-httplib): New variable. [...] >>>From f2982d9f3a8f6fcf66950ed78259125f3750ca08 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 20 Jan 2021 17:56:04 +0100 > Subject: [PATCH v5 2/4] gnu: Add blurhash. > > * gnu/packages/image.scm (blurhash): New variable. [...] >>>From a709f28a8dacd890a46eb848bbf6b42efaa6a447 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 20 Jan 2021 19:23:17 +0100 > Subject: [PATCH v5 3/4] gnu: Add single-application-qt5. >=20 > * gnu/packages/qt.scm (single-application-qt5): New variable. [...] >>>From 2564b19691b0721407ee48f90de18353796278d0 Mon Sep 17 00:00:00 2001 > From: nixo > Date: Wed, 27 Jan 2021 23:54:55 +0100 > Subject: [PATCH v5 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 ph= ase > 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. I=E2=80=99m really sorry that it took 7 months (!), but I=E2=80=99ve now ap= plied this series. I had to tweak =E2=80=98single-application-qt5=E2=80=99 to adjust = it to the qtbase -> qtbase-5 rename, but that=E2=80=99s about it. Thank you, and thanks Maxime for the review=E2=80=94much appreciated, as al= ways! Ludo=E2=80=99. ------------=_1630699682-29932-5 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Apr 2021 12:46:17 +0000 Received: from localhost ([127.0.0.1]:48240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbN6X-0002mc-1B for submit@debbugs.gnu.org; Tue, 27 Apr 2021 08:46:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:41348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lbN6S-0002mP-73 for submit@debbugs.gnu.org; Tue, 27 Apr 2021 08:46:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbN6R-0000fe-OL for guix-patches@gnu.org; Tue, 27 Apr 2021 08:46:11 -0400 Received: from mail-40136.protonmail.ch ([185.70.40.136]:18984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbN6M-0001vP-Ut for guix-patches@gnu.org; Tue, 27 Apr 2021 08:46:11 -0400 Date: Tue, 27 Apr 2021 12:45:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail3; t=1619527551; bh=DR25hZ48TJ5nFC2fxqMDy5lH2Hf+U+cTfcUdgKayCuU=; h=Date:To:From:Reply-To:Subject:From; b=P3jOXgQyYtbfKvP35p8WFlzO3V4+RjWkUr3mjdUAeRrAooRkH2b+F5INn27Z2fWpP QiW8LRbd4XKmwuGAVc8YeDk07rZD61x5Aq9Z5PrSJn5aCSmuvKJ2LrWxdCnHO6A4aM NSLw3AyN3yd7IjYsDHgjtpPWKx3oyS0xgF2GytyfoBoBvlOvqYWZoXwo72En0rsAuP wiAiEt0ivXGdTwJEPhIvhmmYcgc/04Nsn8eTJN3xJgrOErh/prAWnzJtE0qgW5+Pjx +jgUkoALuFMli1ymBFND5fID8lhxEiOSjMRC+th5EznaHlCtJIeGn4WLdsbXzAI2jd eDN7q3iV+I7Ow== To: "guix-patches@gnu.org" From: Ekaitz Zarraga Subject: [PATCH]: Update nheko Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_sh17NvZofppNHythUz7jvGzq6BcNfkdRepjmY91Hg" X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Received-SPF: pass client-ip=185.70.40.136; envelope-from=ekaitz@elenq.tech; helo=mail-40136.protonmail.ch 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Ekaitz Zarraga Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --b1_sh17NvZofppNHythUz7jvGzq6BcNfkdRepjmY91Hg Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, This series of patches update Nheko messaging client to 0.8.1 version. There's a newer 0.8.2 version but they make use of different dependencies a= nd we need to deal with them before updating. Hope they are useful, Ekaitz --b1_sh17NvZofppNHythUz7jvGzq6BcNfkdRepjmY91Hg Content-Type: text/x-patch; name=0002-gnu-nheko-Update-to-0.8.1.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-nheko-Update-to-0.8.1.patch RnJvbSA1MTczZDc2NTAxNTI0YzczZTllN2FlOWM4ZWRjOWQyZjU5YzY5OTYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFR1ZSwgMjcgQXByIDIwMjEgMTQ6MDM6MjEgKzAyMDAKU3ViamVjdDogW1BBVENIIDIvMl0g Z251OiBuaGVrbzogVXBkYXRlIHRvIDAuOC4xCgoqIGdudS9wYWNrYWdlcy9tZXNzYWdpbmcuc2Nt IChuaGVrbyk6IFVwZGF0ZSB0byAwLjguMS4KW2lucHV0c106IEFkZCBxdGtleWNoYWluCi0tLQog Z251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20gfCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9t ZXNzYWdpbmcuc2NtIGIvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KaW5kZXggODFjYjdjNzE3 OC4uZjU2NTI4MzY3MiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KKysr IGIvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KQEAgLTIzMDAsNyArMjMwMCw3IEBAIGZvciB0 aGUgTWF0cml4IHByb3RvY29sLiAgSXQgaXMgYnVpbHQgb24gdG8gb2YgQGNvZGV7Qm9vc3QuQXNp b30uIikKIChkZWZpbmUtcHVibGljIG5oZWtvCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgIm5oZWtv IikKLSAgICAodmVyc2lvbiAiMC43LjIiKQorICAgICh2ZXJzaW9uICIwLjguMSIpCiAgICAgKHNv dXJjZQogICAgICAob3JpZ2luCiAgICAgICAgKG1ldGhvZCBnaXQtZmV0Y2gpCkBAIC0yMzA5LDcg KzIzMDksNyBAQCBmb3IgdGhlIE1hdHJpeCBwcm90b2NvbC4gIEl0IGlzIGJ1aWx0IG9uIHRvIG9m IEBjb2Rle0Jvb3N0LkFzaW99LiIpCiAgICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5nLWFwcGVu ZCAidiIgdmVyc2lvbikpKSkKICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUg dmVyc2lvbikpCiAgICAgICAgKHNoYTI1NgotICAgICAgICAoYmFzZTMyICIxY2JoZ2FmOWtsZ3hk aXJyeGo1NzFmcXdzcG0wYnlsNzVjMXhjNDBsNzI3YTZxc3d2cDdzIikpKSkKKyAgICAgICAgKGJh c2UzMiAiMXY3azNpZnppMDVmZHIwNmhtd3Mxd2tmbDFibWhybmFtM2Rid2FocDA4NnZrajByODUy NCIpKSkpCiAgICAgKGFyZ3VtZW50cwogICAgICBgKCM6dGVzdHM/ICNmICAgICAgICAgICAgICAg ICAgICAgIDtubyB0ZXN0IHRhcmdldAogICAgICAgICM6Y29uZmlndXJlLWZsYWdzCkBAIC0yMzQx LDYgKzIzNDEsNyBAQCBmb3IgdGhlIE1hdHJpeCBwcm90b2NvbC4gIEl0IGlzIGJ1aWx0IG9uIHRv IG9mIEBjb2Rle0Jvb3N0LkFzaW99LiIpCiAgICAgICAgKCJxdGJhc2UiICxxdGJhc2UpCiAgICAg ICAgKCJxdGRlY2xhcmF0aXZlIiAscXRkZWNsYXJhdGl2ZSkKICAgICAgICAoInF0Z3JhcGhpY2Fs ZWZmZWN0cyIgLHF0Z3JhcGhpY2FsZWZmZWN0cykKKyAgICAgICAoInF0a2V5Y2hhaW4iICxxdGtl eWNoYWluKQogICAgICAgICgicXRtdWx0aW1lZGlhIiAscXRtdWx0aW1lZGlhKQogICAgICAgICgi cXRxdWlja2NvbnRyb2xzMiIgLHF0cXVpY2tjb250cm9sczIpCiAgICAgICAgKCJxdHN2ZyIgLHF0 c3ZnKQotLSAKMi4zMS4wCgo= --b1_sh17NvZofppNHythUz7jvGzq6BcNfkdRepjmY91Hg Content-Type: text/x-patch; name=0001-gnu-mtxclient-Update-to-0.4.1.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-mtxclient-Update-to-0.4.1.patch RnJvbSA3NWQ2OWJiNWFlY2RmNDlmOWQxZGZkZGJjMGE1MDgxNWM1MGE1Mjk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFa2FpdHogWmFycmFnYSA8ZWthaXR6QGVsZW5xLnRlY2g+CkRh dGU6IFR1ZSwgMjcgQXByIDIwMjEgMTQ6MDE6MzIgKzAyMDAKU3ViamVjdDogW1BBVENIIDEvMl0g Z251OiBtdHhjbGllbnQ6IFVwZGF0ZSB0byAwLjQuMQoKKiBnbnUvcGFja2FnZXMvbWVzc2FnaW5n LnNjbSAobXR4Y2xpZW50KTogVXBkYXRlIHRvIDAuNC4xLgotLS0KIGdudS9wYWNrYWdlcy9tZXNz YWdpbmcuc2NtIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9tZXNzYWdpbmcuc2NtIGIvZ251 L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KaW5kZXggYzM1NjQ5OGZkMi4uODFjYjdjNzE3OCAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL21lc3NhZ2luZy5zY20KKysrIGIvZ251L3BhY2thZ2VzL21l c3NhZ2luZy5zY20KQEAgLTIyNTAsNyArMjI1MCw3IEBAIFFNYXRyaXhDbGllbnQgcHJvamVjdC4i KQogKGRlZmluZS1wdWJsaWMgbXR4Y2xpZW50CiAgIChwYWNrYWdlCiAgICAgKG5hbWUgIm10eGNs aWVudCIpCi0gICAgKHZlcnNpb24gIjAuMy4xIikKKyAgICAodmVyc2lvbiAiMC40LjEiKQogICAg IChzb3VyY2UKICAgICAgKG9yaWdpbgogICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQpAQCAtMjI1 OSw3ICsyMjU5LDcgQEAgUU1hdHJpeENsaWVudCBwcm9qZWN0LiIpCiAgICAgICAgICAgICAgKGNv bW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikpKSkKICAgICAgICAoZmlsZS1uYW1lIChn aXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCiAgICAgICAgKHNoYTI1NgotICAgICAgICAoYmFz ZTMyICIxZGc0ZHEyMGcwYWg2Mmo1czNncHN4cXE0bnk3bHhreGR4YTlxNmc1NGhkd2tyYjltczd4 IikpKSkKKyAgICAgICAgKGJhc2UzMiAiMTA0NHppbDNpemhiM3doaGZqYWg3dzBrZzVtcjNoeXMz MmNqZmZreTY4MWQzbWIzd2k1biIpKSkpCiAgICAgKGFyZ3VtZW50cwogICAgICBgKCM6Y29uZmln dXJlLWZsYWdzCiAgICAgICAgKGxpc3QKLS0gCjIuMzEuMAoK --b1_sh17NvZofppNHythUz7jvGzq6BcNfkdRepjmY91Hg-- ------------=_1630699682-29932-5--