From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aCCTIBtgm2a4UQAA62LTzQ:P1 (envelope-from ) for ; Sat, 20 Jul 2024 06:58:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aCCTIBtgm2a4UQAA62LTzQ (envelope-from ) for ; Sat, 20 Jul 2024 08:58:35 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=CEMv5ORT; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1721458715; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=O0jg1PT++wuYtIZQ36BQ2tqgGqPB+XEKGQcl8Dad6tU=; b=D2Pg4Hsr2lxOj5Abp4OcPIjuJqPN/gzAnISsJlGTaI/iON+9XGOnMVAFG0B+3WLQ1fWQoD 3l/HBxzpVbxwnyhae9xVv5odF0o3E1xS0xpLUafOXcLu7k7krrgUORiPVem21LA4gouqzS 1getW1Xk9P5T1h/tbvAyS0PmLmYTGwsQQ5oc3GDVnRDxll+SFyJouv72BQLafvqkjUhuA9 5reNtARUV5S5GfIGBjAuefKyFc1hcIO/doXZpk6dZ0cwh/k0zcFyaRQp9/63i2mIHJMoId y6p4ckQ1WvDfxpFgHJwCJxr5uPkRrkQ2cvzDpFIxys5EWuFo0FiSfBHy3orjSw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=CEMv5ORT; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721458715; a=rsa-sha256; cv=none; b=LCVR5VXipFfhck//eCD1HoQIQQ6KIn+4FpO3IZ2p+8nzWBiX/PrN3X7flqfyLQMq1Eh7J5 iOU0jHcRQOnnyo0Iga2K658+bZGrpRnvIjzSNPqovqUv1xxn9RS/F+NlMtNuR5r09oeXgq G97WYCmPdysANqCt20dkpGL6jU/B6LnxYziIoRUvQ1EKUlimAv5QUwd/6Z7DmzTWlHRI7j fv5kTjiEEZ/uNK8UKBg4+9OK8b68SZCqDli3I5zpp+iX429bF3TtxbnQKzaMhvlBKeRaqb F/ZmsYY0+geQRUi/Mq7sOrGHDJBWcjkyLe6+U+VCkVTpvCz2I3LpZjDdFouxgA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 43C1368B19 for ; Sat, 20 Jul 2024 08:58:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sV42o-0001Bn-2u; Sat, 20 Jul 2024 02:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sV42d-00019N-QZ for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sV42d-0004xs-IT for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sV42d-0003j0-AC for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72205] [PATCH 4/4] gnu: nheko: Update to 0.12.0. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jul 2024 06:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72205 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72205@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 72205-submit@debbugs.gnu.org id=B72205.172145866714276 (code B ref 72205); Sat, 20 Jul 2024 06:58:03 +0000 Received: (at 72205) by debbugs.gnu.org; 20 Jul 2024 06:57:47 +0000 Received: from localhost ([127.0.0.1]:51618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV42N-0003iB-0j for submit@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:47 -0400 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51]:50158 helo=araneo.si) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV42I-0003hK-MD for 72205@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=f4Bdk5nYSDT zO6suUmr7+QNZU28dcPiN/4q8biyF6FU=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=CEMv5ORTKpyniwlhxleHd1bR9r38pjAEFAD ygfTrO4hV5BWQm15cIBUooSyHZZ2JR8J9vHOAmVtltI0Ws5k24mvZrtVBOqBuJhato/wLE CdyRpGOF35vv/rty6k28yi5FdI1ii2QKVfGJb7mGF9Z8WTxCshZG94XZ3DopNNF0f4= Received: by araneo.si (OpenSMTPD) with ESMTPSA id a4fac353 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 20 Jul 2024 06:57:41 +0000 (UTC) From: Timotej Lazar Date: Sat, 20 Jul 2024 08:57:28 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 43C1368B19 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.81 X-Spam-Score: -3.81 X-TUID: om0x7TEin3uc * gnu/packages/messaging.scm (nheko): Update to 0.12.0. [arguments]: Switch to Qt 6. Use configure flags to disable bundled libraries. [inputs]: Add brotli, kdsingleapplication, libxkbcommon, vulkan-headers, and vulkan-loader. Drop boost, xcb-util-wm, qtbase-5, qtquickcontrols2-5, and single-application-qt5. Use version 6 for remaining Qt inputs. [native-inputs]: Replace qttools-5 with qttools. Change-Id: Id7f1ee119ce3ff5bad130b7d13b6c98ed382b928 --- gnu/packages/messaging.scm | 61 ++++++++++++++------------------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 076861d963..083a86ed8b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -142,6 +142,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) @@ -2466,7 +2467,7 @@ (define-public mtxclient (define-public nheko (package (name "nheko") - (version "0.11.3") + (version "0.12.0") (source (origin (method git-fetch) @@ -2475,41 +2476,25 @@ (define-public nheko (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0yjbxyba87nkpjmql7s6nv2r2i9s956zgwlfhdi4jjg96v2rgmnr")) + (base32 "113ids1k2pjmvs9cgh025vkpg5mipw295dlkx7n3ydi0r8mzw1l5")) (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "third_party"))))) + (snippet '(delete-file-recursively "third_party")))) (arguments (list #:tests? #f ;no test target + #:qtbase qtbase #:configure-flags #~(list "-DCMAKE_BUILD_TYPE=Release" ;; 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") + "-DCOMPILE_QML=ON" + ;; Use system libraries. + "-DUSE_BUNDLED_BLURHASH=OFF" + "-DUSE_BUNDLED_CPPHTTPLIB=OFF") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'unbundle-dependencies - (lambda* (#:key inputs #:allow-other-keys) - (let ((libSingleApplication.a - (search-input-file inputs "lib/libSingleApplication.a")) - (httplib.h (search-input-file inputs "include/httplib.h"))) - (substitute* "CMakeLists.txt" - ;; Remove include and source dirs,replace with the correct one - (("third_party/blurhash/blurhash\\.[ch]pp") "") - (("third_party/cpp-httplib-0\\.5\\.12") - (dirname httplib.h)) - (("add_subdirectory.*third_party/SingleApplication.*") "") - ;; Link using the correct static/shared libs - (("SingleApplication::SingleApplication") - (string-append - ;; Dynamic libraries - "httplib" "\n" "blurhash" "\n" - ;; Static library - libSingleApplication.a)))))) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. @@ -2521,37 +2506,37 @@ (define-public nheko `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))))))) (build-system qt-build-system) (inputs - (list boost - blurhash - cpp-httplib + (list blurhash + brotli cmark coeurl + cpp-httplib curl gst-plugins-base gst-plugins-bad ; sdp & webrtc for voip gst-plugins-good-qt ; rtpmanager for voip - nlohmann-json + kdsingleapplication libevent libnice ; for voip - olm + libxkbcommon lmdb lmdbxx mtxclient + nlohmann-json + olm openssl - qtbase-5 - qtdeclarative-5 - qtkeychain + qtdeclarative qtgraphicaleffects - qtmultimedia-5 - qtquickcontrols2-5 - qtsvg-5 + qtkeychain-qt6 + qtmultimedia + qtsvg re2 spdlog - single-application-qt5 - xcb-util-wm + vulkan-headers + vulkan-loader zlib)) (native-inputs - (list asciidoc pkg-config qttools-5)) + (list asciidoc pkg-config 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 -- 2.45.2