From patchwork Sat Jul 20 06:57:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 29418 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5B24627BBEA; Sat, 20 Jul 2024 07:58:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C704927BBE2 for ; Sat, 20 Jul 2024 07:58:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sV42q-0001Bs-5n; Sat, 20 Jul 2024 02:58:16 -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-00019Y-Ui 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-0004xu-Lo 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 1sV42b-0003if-Re; Sat, 20 Jul 2024 02:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72205] [PATCH 1/4] gnu: Add kdsingleapplication. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 20 Jul 2024 06:58:01 +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 , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 72205-submit@debbugs.gnu.org id=B72205.172145865914236 (code B ref 72205); Sat, 20 Jul 2024 06:58:01 +0000 Received: (at 72205) by debbugs.gnu.org; 20 Jul 2024 06:57:39 +0000 Received: from localhost ([127.0.0.1]:51610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV42E-0003hY-OE for submit@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:38 -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 1sV42B-0003hK-Tq for 72205@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=AtJzUfMGqma ikwQGaZRO5Txt6H1JMxOCfnRSkmcA7as=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=aBrCGAFYko21PW9i9Ldf6DP2LUWABZCljHU uWSIPcu6X6CUNrp1amtboX+2raqKD6jcQ0tB5xdx4og0QLsW60XreGES61dDDIZN0nztuy i676iHRK+msqTqrGNaDhHIhGCszE+gTN5XLDX7MgX/56vnhSMftnIRZO3hZJVrO4rA= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 9a30e033 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 20 Jul 2024 06:57:34 +0000 (UTC) From: Timotej Lazar Date: Sat, 20 Jul 2024 08:57:25 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (kdsingleapplication): New variable. Change-Id: I08407da35712d465f9573f6bf1de0cc2e8435cb1 --- gnu/packages/qt.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0138fd3dbf..c150dca78b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -5214,6 +5214,32 @@ (define-public libdbusmenu-qt and import their menus over DBus.") (license license:lgpl2.1+))) +(define-public kdsingleapplication + (package + (name "kdsingleapplication") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KDAB/KDSingleApplication") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1w7wg9w4mifrkpn7hhw1nnnwh1vhnf8i4wgfxvh44nacwslbwsb2")))) + (build-system qt-build-system) + (arguments + (list + #:qtbase qtbase + #:configure-flags + #~(list "-DKDSingleApplication_QT6=true" "-DKDSingleApplication_TESTS=true"))) + (inputs (list libxkbcommon vulkan-headers)) + (home-page "https://github.com/KDAB/KDSingleApplication") + (synopsis "Qt helper class for single-instance policy applications") + (description "KD SingleApplication is a helper class for single-instance +policy applications.") + (license (list license:bsd-3 license:expat)))) + (define-public kdsoap (package (name "kdsoap") From patchwork Sat Jul 20 06:57:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 29421 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 870C827BBEA; Sat, 20 Jul 2024 07:58:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14D6627BBE2 for ; Sat, 20 Jul 2024 07:58:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sV42p-0001Br-1m; Sat, 20 Jul 2024 02:58:16 -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 1sV42c-00016M-Lh for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:03 -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 1sV42c-0004xi-DL for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sV42c-0003il-BJ for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72205] [PATCH 2/4] gnu: mtxclient: Update to 0.10.0. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jul 2024 06:58:02 +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.172145866214251 (code B ref 72205); Sat, 20 Jul 2024 06:58:02 +0000 Received: (at 72205) by debbugs.gnu.org; 20 Jul 2024 06:57:42 +0000 Received: from localhost ([127.0.0.1]:51613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV42I-0003hn-1m for submit@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:42 -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 1sV42E-0003hK-2j for 72205@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=TV9vVV7Movb +fuK8+OnqOEdNtnN2wgHOgYt5GwCfkUQ=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=E/clLe3w3ok1ZXjtABfc2PLNQAMxBxZepFc EuhdIwJ6a/tAxkFZodKoGRFGFaXMNlADZwBMttWMmpMbfLd97ZYmz1OyVl7ArYXeIcho0C q1iS+6rkK6J+xNYdhwILu2+hPclQaAHb7Vsh2LcM7D+yMVlfti+S51HutIwy4D9xgY= Received: by araneo.si (OpenSMTPD) with ESMTPSA id d4e4e6e6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 20 Jul 2024 06:57:36 +0000 (UTC) From: Timotej Lazar Date: Sat, 20 Jul 2024 08:57:26 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/messaging.scm (mtxclient): Update to 0.10.0. Change-Id: I095e805803b02f5e22ab2a8b764f856a072d7df4 --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c097c16a97..4f065d4316 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2421,7 +2421,7 @@ (define-public libqmatrixclient (define-public mtxclient (package (name "mtxclient") - (version "0.9.1") + (version "0.10.0") (source (origin (method git-fetch) @@ -2430,7 +2430,7 @@ (define-public mtxclient (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m8agc3c4n03r92nz3gxkpxmj2c3ncf125nmfdv0jf24gxib126z")))) + (base32 "10iidyxjk3w6cljw2r62i5azx84nw3p8hw97d8vy7r5gh1nrrrcn")))) (arguments `(#:configure-flags (list From patchwork Sat Jul 20 06:57:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 29419 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 87C5E27BBE2; Sat, 20 Jul 2024 07:58:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8137527BBE9 for ; Sat, 20 Jul 2024 07:58:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sV42i-0001B6-3O; Sat, 20 Jul 2024 02:58:08 -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-00018T-E5 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 1sV42c-0004xn-U4 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 1sV42c-0003is-R9 for guix-patches@gnu.org; Sat, 20 Jul 2024 02:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72205] [PATCH 3/4] gnu: mtxclient: Switch to new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jul 2024 06:58:02 +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.172145866314259 (code B ref 72205); Sat, 20 Jul 2024 06:58:02 +0000 Received: (at 72205) by debbugs.gnu.org; 20 Jul 2024 06:57:43 +0000 Received: from localhost ([127.0.0.1]:51615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV42I-0003ht-Hc for submit@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:42 -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 1sV42F-0003hK-Rw for 72205@debbugs.gnu.org; Sat, 20 Jul 2024 02:57:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=9ePBbiX5J80 Q4SAtwqkpBR8RxJvIA95JJFs/hpj75Fo=; h=references:in-reply-to:date: subject:cc:to:from; d=araneo.si; b=A1KTHDGi9z686RkQhL8a7HTkYaGr4sRDRqp 3fuIF4vNaia7wPV97vFkcd7QG/r3hnv+owMRdO8HrHNQl+RpQNTynf5XWMjrYEcO/310mG R5t4XvWotko1Whm0F19KdXnT7IzZDnSLIpOViwDC7XcWv67+jDhj/eyFuGn4L1IfcM= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 177f3450 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 20 Jul 2024 06:57:39 +0000 (UTC) From: Timotej Lazar Date: Sat, 20 Jul 2024 08:57:27 +0200 Message-ID: <1f95b9f9fa7f18a8e8b20606b920a11fa777bab7.1721458149.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/matrix.scm (mtxclient)[arguments]: Use g-exps. Change-Id: I044faf4e25b9e5d282e9364070a7e24bb6f89b5e --- gnu/packages/messaging.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4f065d4316..076861d963 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2431,19 +2431,18 @@ (define-public mtxclient (file-name (git-file-name name version)) (sha256 (base32 "10iidyxjk3w6cljw2r62i5azx84nw3p8hw97d8vy7r5gh1nrrrcn")))) - (arguments - `(#:configure-flags - (list - ;; Disable example binaries (not installed) - "-DBUILD_LIB_EXAMPLES=OFF") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-network-tests - (lambda _ - (substitute* "CMakeLists.txt" - (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)") - "# add_test"))))))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DBUILD_LIB_EXAMPLES=OFF") ; disable example binaries (not installed) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'disable-network-tests + (lambda _ + (substitute* "CMakeLists.txt" + (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)") + "# add_test"))))))) (inputs (list boost coeurl From patchwork Sat Jul 20 06:57:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 29420 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F0F8727BBEA; Sat, 20 Jul 2024 07:58:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0E4BC27BBE2 for ; Sat, 20 Jul 2024 07:58:35 +0100 (BST) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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