From patchwork Mon Sep 19 23:33:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42754 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 C8BD627BBEA; Tue, 20 Sep 2022 00:34:44 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 63A1027BBE9 for ; Tue, 20 Sep 2022 00:34:44 +0100 (BST) Received: from localhost ([::1]:37322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQHj-0005T9-H5 for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:34:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQH5-0005PE-2J for guix-patches@gnu.org; Mon, 19 Sep 2022 19:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQH4-0004Oa-9P for guix-patches@gnu.org; Mon, 19 Sep 2022 19:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQH4-0006pR-38 for guix-patches@gnu.org; Mon, 19 Sep 2022 19:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363042426215 (code B ref 57675); Mon, 19 Sep 2022 23:34:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:33:44 +0000 Received: from localhost ([127.0.0.1]:55529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQGm-0006ok-4s for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:33:44 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQGj-0006oY-Vw for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:33:42 -0400 Date: Tue, 20 Sep 2022 07:33:25 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oI/ittziWDJLK2IzW6+wn085tA/XyXkY5lXID7CFtpI=; b=LobHd2hVija7mSCD1htDKTfSk2EPDC/o2+j7RO+hkWE/v1bqEWclPg+56rhRE9+mi7u/FX tjeGvqGS3h3VpQxITta64QUB5RosGT61JrjiM5tNR/lvsMPlMuUz2U7VitrZXVpDMg9lIx aEJuS6zZKbyaSF0vVw6Yus+D1iBXYWED/5t8qsQGCBOzDYjh1gDHUs0RsA1NQ4x21iobuT aLuc7erz1CKm0der0U3xO/yMKspX224lhcblQSqW9yTPNHMD701PDsmM/Lqv3hCPQvgb2o YF2oghJGlX6JMtS5L2m+Xks8mCICCwbv1QrRSY0q63qtwOooVasjpvwWmWj6Mg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (webrtc-for-telegram-desktop)[source,#:phases]: Delete trailing #t. --- gnu/packages/telegram.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1a22d230d2..ae1b727df7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -106,8 +106,7 @@ (define-public webrtc-for-telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target @@ -126,8 +125,7 @@ (define-public webrtc-for-telegram-desktop (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) + (copy-recursively libyuv-from libyuv-to))))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) From patchwork Mon Sep 19 23:33:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42755 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 4404627BBEA; Tue, 20 Sep 2022 00:35:31 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 EAAD227BBE9 for ; Tue, 20 Sep 2022 00:35:30 +0100 (BST) Received: from localhost ([::1]:35684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQIU-0006G5-4x for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:35:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQI2-0006E1-RG for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQI2-0004UT-Ii for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQI2-0006rJ-AY for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 02/11] gnu: telegram-desktop: Delete trailing #t. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363044626284 (code B ref 57675); Mon, 19 Sep 2022 23:35:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:34:06 +0000 Received: from localhost ([127.0.0.1]:55534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQH8-0006pr-Hh for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:34:06 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQH6-0006pA-I4 for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:34:04 -0400 Date: Tue, 20 Sep 2022 07:33:47 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2PdI9XZUyx7NabgzdG0ezwOywrNClOsad8iktBNJ/bE=; b=U3gonP/vB10P9iA5w1jYOzFpukCNNUAdqztrfgOj+JSBoDlJryYrE7EILzQyKVATlPl5Bz MxJV2lNeQpbvIWqWGyPt4pY0ocwdBYNRwPHxEPEDOzh0wA2g8/PXcwaSng/e903+ZxxMMr LKbQl/A005efmYfZJyWMa6eK3Vtlo9VujCnIbHnC8wrT72ZFgOu4tpLWYMaP/rBzWWHr/J pUrgK7k6iZy/1WKBVD3LS9jVOtpjb7qpvSmMs6o1n4EmQkFbT9odwDOqbgq41ELQXbh9M4 lwg54CFFEzj/gRY+m3uX3mFA9tX6T+Dnvj7BGemSpma7UoLY6LD72L1bEyDyzg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (telegram-desktop)[source,#:phases]: Delete trailing #t. --- gnu/packages/telegram.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ae1b727df7..08a72d2e0f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -292,8 +292,7 @@ (define-public telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -322,8 +321,7 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-inputs (lambda* (#:key inputs outputs #:allow-other-keys) (for-each @@ -350,14 +348,10 @@ (define-public telegram-desktop ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) (add-before 'configure 'patch-cxx-flags (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap From patchwork Mon Sep 19 23:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42762 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 0F2AA27BBEA; Tue, 20 Sep 2022 00:42:57 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 5D7AD27BBE9 for ; Tue, 20 Sep 2022 00:42:56 +0100 (BST) Received: from localhost ([::1]:50596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQPe-0004jn-ID for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:42:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQI3-0006ED-3U for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQI2-0004UY-R2 for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQI2-0006rS-MY for guix-patches@gnu.org; Mon, 19 Sep 2022 19:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363048526337 (code B ref 57675); Mon, 19 Sep 2022 23:35:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:34:45 +0000 Received: from localhost ([127.0.0.1]:55537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQHk-0006qj-SZ for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:34:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQHj-0006qV-Pe for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:34:44 -0400 Date: Tue, 20 Sep 2022 07:34:26 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pKLi19+Qv8I+QFtQxV5Vq2qYLQPj5iwAxR8A0HYygpo=; b=eoeg4hfTEq/HD0YZUhxTO43QO9tBxUaVXO6Xa6LCNFGxsLA2a0bsEON5MvDL4uU7+Umca9 wKGPY4Okv/9cwyOmi+rVob2bhorr69cqF6uOBTvgczkyWYfspOy7J2sMcxT95RafDEKF8r Y9y6HBBPbrXYIyyRBmqT/Q3amsXtC0qDtJYEA51XtGE9eGPI4qZGWEfKlTNoK4zhhPpdxH UUWP+akH2zduaGDeBgDrDKkSYKND7VLZqnf2K0BnIXEFqYJi7FgB1T/3U3Tf2YONgkHPqb YIXWIfA8xC/8t9hltrwrLujBcPCiRdACZnOIibCJ/5mQzEtS+OkYt/INnxKDeQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (libvpx-for-telegram-desktop, libyuv-for-telegram-desktop): New variables. (webrtc-for-telegram-desktop)[#:phases]: Copy sources with gexp. [inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 148 +++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 73 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 08a72d2e0f..9e68965607 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,36 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define libvpx-for-telegram-desktop + (let* ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") + (revision "0") + (name "libvpx-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + +(define libyuv-for-telegram-desktop + (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "0") + (name "libyuv-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -94,82 +125,53 @@ (define-public webrtc-for-telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" - ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) - (with-directory-excursion "src/third_party" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "openh264" "rnnoise" + ;; Not available in Guix. + "pffft" "usrsctp" + ;; Has cmake support files for libvpx input. + "libvpx"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No target - #:configure-flags - (list - "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((libvpx-from (assoc-ref inputs "libvpx")) - (libyuv-from (assoc-ref inputs "libyuv")) - (libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to))))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (let* ((libvpx-to (string-append (getcwd) + "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv"))) + (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) + (native-inputs (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") From patchwork Mon Sep 19 23:34:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42757 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 945F127BBE9; Tue, 20 Sep 2022 00:36: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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 EA90527BBEA for ; Tue, 20 Sep 2022 00:36:34 +0100 (BST) Received: from localhost ([::1]:34914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQJW-00070C-1Z for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:36:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJ0-0006yu-Gi for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJ0-0004uK-87 for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJ0-0006te-3E for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: Use modern package style. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363050626408 (code B ref 57675); Mon, 19 Sep 2022 23:36:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:35:06 +0000 Received: from localhost ([127.0.0.1]:55542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQI5-0006rr-Eg for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:35:06 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQI2-0006r3-KP for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:35:04 -0400 Date: Tue, 20 Sep 2022 07:34:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NyVSm++2WiD2IPqxbBwHI9+B8jrClPcZuyzBruKQihg=; b=3/q8CtQepB0nzxDHircp81VG0a+dtpwCe7jK3BUS8IQVxkhYaeATHnurQGELFmXrRWMYv1 /EvHgNOKoqCvRGPVoNNOgMq83RloQfWmUogUKsPAte2CT/D5BfZgkZU6g4Ozqup+2qAhgW xBAe1i0mg+J5Ss3cSjscnjrlZ2KkRsZ1qjUrX8dirqgPDKlxF075xfiECTp1XlGf854Vyc 0sNB6xwKDonOgN0k0pZxYantuxERGkVSCh889SfvrZipQb0APvgQjbaPJ/tQvmSofIMcB9 Gv409GX7elE7y3cjsuR5wJff0/Krv/bmp2zPMbdwrkly0uhXfbTuaghcjhH+zQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop, codegen-for-telegram-desktop,lib-base-for-telegram-desktop, lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop, lib-qr-for-telegram-desktop,lib-rlottie-for-telegram-desktop, lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop, lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop, lib-ui-for-telegram-desktop,lib-waylandshells-for-telegram-desktop, lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop, tgcalls-for-telegram-desktop): New variables. (telegram-desktop)[#:phases]: Copy sources with gexp. [native-inputs,inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 649 +++++++++++++++++++++----------------- 1 file changed, 353 insertions(+), 296 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9e68965607..92c51ffe4b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -102,6 +102,246 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define cmake-helpers-for-telegram-desktop + (let* ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") + (revision "0") + (name "cmake-helpers-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) + +(define codegen-for-telegram-desktop + (let* ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119") + (revision "0") + (name "codegen-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))) + +(define lib-base-for-telegram-desktop + (let* ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6") + (revision "0") + (name "lib-base-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))) + +(define lib-crl-for-telegram-desktop + (let* ((commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f") + (revision "0") + (name "lib-crl-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))) + +(define lib-lottie-for-telegram-desktop + (let* ((commit "0770df009db7928df1d0cad0900dc5110106d229") + (revision "0") + (name "lib-lottie-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))) + +(define lib-qr-for-telegram-desktop + (let* ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189") + (revision "0") + (name "lib-qr-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))) + +(define lib-rlottie-for-telegram-desktop + (let* ((commit "0671bf70547381effcf442ec9618e04502a8adbc") + (revision "0") + (name "lib-rlottie-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) + +(define lib-rpl-for-telegram-desktop + (let* ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617") + (revision "0") + (name "lib-rpl-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))) + +(define lib-spellcheck-for-telegram-desktop + (let* ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094") + (revision "0") + (name "lib-spellcheck-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))) + +(define lib-storage-for-telegram-desktop + (let* ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1") + (revision "0") + (name "lib-storage-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))) + +(define lib-tl-for-telegram-desktop + (let* ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb") + (revision "0") + (name "lib-tl-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))) + +(define lib-ui-for-telegram-desktop + (let* ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f") + (revision "0") + (name "lib-ui-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))) + +(define lib-waylandshells-for-telegram-desktop + (let* ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") + (revision "0") + (name "lib-waylandshells-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandshells.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) + +(define lib-webrtc-for-telegram-desktop + (let* ((commit "ef49f953f12b112008a094a719f40939aaf39db4") + (revision "0") + (name "lib-webrtc-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))) + +(define lib-webview-for-telegram-desktop + (let* ((commit "e06427c624515485774e2e2181d4afeb05ad5a67") + (revision "0") + (name "lib-webview-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))) + +(define tgcalls-for-telegram-desktop + (let* ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") + (revision "0") + (name "tgcalls-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -286,306 +526,123 @@ (define-public telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Not available in Guix. + "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - `(#:tests? #f ; No target - #:imported-modules - (,@%qt-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules - ((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) - (guix build utils) - (ice-9 match)) - #:configure-flags - (list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also . - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ; No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; Client applications must provide their own API-ID and API-HASH, + ;; see also . + ;; In case, that the credentials below fail to work, contact + ;; Raghav Gururajan + "-DTDESKTOP_API_ID=2791056" + "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + ;; Disable WebkitGTK support as it fails to link + "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" + ;; Use bundled fonts as fallback. + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda _ + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + '(("cmake" #$cmake-helpers-for-telegram-desktop) + ("Telegram/codegen" #$codegen-for-telegram-desktop) + ("Telegram/lib_base" #$lib-base-for-telegram-desktop) + ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) + ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) + ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) + ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) + ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) + ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) + ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) + ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) + ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) + ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) + ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) + ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-before 'configure 'patch-cxx-flags + (lambda _ + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("glibmm" ,glibmm-2.64) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("jemalloc" ,jemalloc) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (list alsa-lib + c++-gsl + catch2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib)) + (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") From patchwork Mon Sep 19 23:35:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42756 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 228FF27BBE9; Tue, 20 Sep 2022 00:36:35 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 DE5A427BBE9 for ; Tue, 20 Sep 2022 00:36:34 +0100 (BST) Received: from localhost ([::1]:33118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQJW-000712-1O for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:36:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJ1-0006zJ-0s for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJ0-0004uQ-PE for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJ0-0006tm-Jo for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 05/11] gnu: telegram-desktop: Change Api ID. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363052326443 (code B ref 57675); Mon, 19 Sep 2022 23:36:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:35:23 +0000 Received: from localhost ([127.0.0.1]:55545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQIM-0006sR-O5 for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:35:23 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQIK-0006sB-V3 for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:35:21 -0400 Date: Tue, 20 Sep 2022 07:35:03 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/sZrycZ6u5YiD+DRQYX5sPv4Z0QwYQw/TyWNYv71P2A=; b=LGcHpT4krGXPrl5IMvYM9+2p8xMYl4F57nTlQuFZSqJ4hvhI2F0WNaYwLRDP1hChPxRjJq k/2A4I1daDxaWxhFVcQqfJLDFo3mRuujkdOrwIuRove3HEdev3SRFhkNhdSGnPGMEfVufc 0h6gERMs1xy6Y4gqgNMbVqcsaXxwMEt4fZCsbJFDuQBQQ+gKaIU4iS1bhhqNM7IafDK2st 6ghzUse6SW1Ri/k+LelUc9hZIPtVB0+TfCfNIlbvJIn+aGisc+mkJehk2IZoyVDV/qeD7r rn5W/wb3hgpCei4635LQmGZ7SQiKEMuFCPbABh7P9qY6xHl3gciiOAlt+ji9fQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (telegram-desktop) [#:configure-flags]: Use Api ID from Telegram's official Snap builds. --- gnu/packages/telegram.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 92c51ffe4b..ddc80df9c2 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -548,12 +548,12 @@ (define-public telegram-desktop (guix build utils) (ice-9 match)) #:configure-flags - #~`(;; Client applications must provide their own API-ID and API-HASH, - ;; see also . - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + #~`(;; Client applications need an API ID and hash, see also: + ;; . Here, we + ;; use the ones given by the official Snap package, see: + ;; . + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" ;; Disable WebkitGTK support as it fails to link "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" ;; Use bundled fonts as fallback. From patchwork Mon Sep 19 23:35:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42763 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 14F0327BBEA; Tue, 20 Sep 2022 00:43:24 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C597027BBE9 for ; Tue, 20 Sep 2022 00:43:23 +0100 (BST) Received: from localhost ([::1]:50912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQQ3-0004vI-Rx for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:43:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJ1-0006zK-Bn for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJ1-0004uV-4N for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJ1-0006u0-0Q for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 06/11] gnu: Add abseil-cpp-cxxstd17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363054526481 (code B ref 57675); Mon, 19 Sep 2022 23:36:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:35:45 +0000 Received: from localhost ([127.0.0.1]:55548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQIj-0006t3-3C for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:35:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQIh-0006sn-A9 for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:35:43 -0400 Date: Tue, 20 Sep 2022 07:35:26 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vCw9lXsXcaIUkTORlM9dL1Rt+pDavfh39EoC6yL9AQo=; b=NOK3yhyE/s9WYlXg4x8Uxmn45sD7BwBAsZxnZ9ZUd6xHLj94WeQu2O8L6OjkZFk9ORftoS uR8XX/SWIGCbTaQrZrPWfh6AO/YyLZuRJ4RGwbFJ8CA6RnKUH73VyXcdz8oSTMZdT+A3oz ab8LQcWjx8N9SsPnbatdgU6j9XU22JegdtKka8n9t1ivxgjkVgZm+TqK7vNE3IjuDgHz0r nIlT7YvFz3tV3mn11VrDhYeoKu3OQE3Iy9vZC34Pqi1/txp9eVTDFxEIvF2AQopu5KSeOS 7y9EIZMOJH+Xjp6QJq+kf4QDobTyUyZoTozrHR8VB9NONtehWy02wwxMGSXX6A== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.37.3 diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") From patchwork Mon Sep 19 23:35:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42764 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 D146C27BBEA; Tue, 20 Sep 2022 00:43:44 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 89B0B27BBE9 for ; Tue, 20 Sep 2022 00:43:44 +0100 (BST) Received: from localhost ([::1]:52618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQQR-000559-Ou for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:43:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJ1-0006zf-Nv for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJ1-0004ua-Fv for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJ1-0006u7-Bt for guix-patches@gnu.org; Mon, 19 Sep 2022 19:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 07/11] gnu: extra-cmake-modules: Update to 5.98.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363056226528 (code B ref 57675); Mon, 19 Sep 2022 23:36:03 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:36:02 +0000 Received: from localhost ([127.0.0.1]:55552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJ0-0006tk-Cw for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:41548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQIz-0006tL-HJ for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:01 -0400 Date: Tue, 20 Sep 2022 07:35:44 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RZuLimHHAOm/TJoSGpPnt4UqOPd54jRXCsPLpn96pKY=; b=3LhwxhevgUcFtTYaCj3kgExBdG0+WqoEysYJfkzUPvI91J+7wMhqfWRcn97MEdVO6YsdhC l6FmRRKokbdLZqyz/+qoCmupdSPk61A1FxDQaVwabd+qvo7lWfFeerd1hlYfSfSfit6lK7 pSo8cLqNsjt/mlMTjGdCQrmG9gKxABcy50t/AlGchax4d9/PDl1H/5bu3M/ojn4by+ahrp 0uYDNz8qC7xLc1r/vB0y1D0T3ATZlSsfK/DvBFeGcXZZnPIiNPmDaotqDTtcZH9f1ttX2E 8BXnnMjE4flJbT9CAFJI3HXJCSqr/38Diiahz/EDFE2ojgfaKOpNM36YXgyevw== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.37.3 diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too From patchwork Mon Sep 19 23:36:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42761 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 2383E27BBEA; Tue, 20 Sep 2022 00:40:02 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C21D827BBE9 for ; Tue, 20 Sep 2022 00:40:01 +0100 (BST) Received: from localhost ([::1]:55216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQMp-0002fj-Qr for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:40:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJz-0008Ao-Dg for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJy-000512-LL for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJy-0006wX-HG for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 08/11] gnu: kcoreaddons: Remove trailing #t. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363058326603 (code B ref 57675); Mon, 19 Sep 2022 23:37:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:36:23 +0000 Received: from localhost ([127.0.0.1]:55561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJL-0006v1-0s for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:23 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJH-0006ua-E6 for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:19 -0400 Date: Tue, 20 Sep 2022 07:36:01 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=D3UguPaFYoUd0mbt7+kC8Fsqps2dWnYu1h5gwO5hvu4=; b=ijC1Pea0yHGvO36PNv10RF3q9wZ3gABvsa8Z2/FfNkqjLtk1s+4PKf4YCgOW2xWVWHAF13 DMQpjyS+FVqfCtGc9MwucnjXL8BOvjbr7tUwFKdhTwu8UMi/ku3zpI4Ym/G17w4yg6d4nw GkgMjLM8FUPGW6ataIceROqO41/Tx8WaC24+GHxtZ9jNdznp8vTqvPwS1apDIalMmoiD2y aDNNDtNlxUA5e4mfhDq3r29GlOC1Pv0jWo31fuXsvUyA88OooeIqsloqGLloO+CeEMEQ9V IJOaLfW3YVRWmwnzOOX0u+u9VMTw/AP4nGjFxy1osVx0vZF+ZLYcvMFdTVVBig== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-frameworks.scm (kcoreaddons)[#:phases]: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.37.3 diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to From patchwork Mon Sep 19 23:36:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42765 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 ACFBE27BBEA; Tue, 20 Sep 2022 00:43:54 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 73B4D27BBE9 for ; Tue, 20 Sep 2022 00:43:54 +0100 (BST) Received: from localhost ([::1]:47884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQQb-0005JJ-Kr for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:43:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJz-0008Ap-Df for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJz-000514-4V for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJz-0006we-0I for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 09/11] gnu: kcoreaddons: Update to 5.98.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363059726632 (code B ref 57675); Mon, 19 Sep 2022 23:37:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:36:37 +0000 Received: from localhost ([127.0.0.1]:55564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJZ-0006vU-C9 for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:37 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:55190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJY-0006vG-8V for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:36 -0400 Date: Tue, 20 Sep 2022 07:36:19 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BusosAZcl+m4u/5RJme4PIFA+8Mf+CATZjsuNjvqJFk=; b=NEZVagFoLi+Uo8v6B+utDGyOt0eEuIeO64ojw0gZDcDGjGOMzX9xlTIlv5veJrMH1eYuAY skyvY7TgVP7HjldwLwkpDYE2QG/M5+U4xorX+mn6ed00T/WxqG5dZovaj9SrRjKQ4iG5/j vzomQ1BwiL5Mto/Uiw4tIPr2j/Tt7B44Xvi2+M5sVM6oFpvlnCH4jVxs8oBb7SM/0XM8WX JI3hlBV5PfFZlD6Tpo3Q1cURm8p/ZcZT+FNbLVmDVBDm/EsBT20vNWrZR3Fe7sEYpjsqH3 u+9TiaMitrl1g0oBh0M7sEXQAYtd1wxzna6JAAto8FQ7O5ILpF2XZ/0HKDkTCg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [#:phases]: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) -- 2.37.3 diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) From patchwork Mon Sep 19 23:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42759 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 ABC8727BBEA; Tue, 20 Sep 2022 00:38:02 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 B8D2527BBE9 for ; Tue, 20 Sep 2022 00:38:01 +0100 (BST) Received: from localhost ([::1]:53002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQKu-0000At-TQ for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:38:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQJz-0008Ar-OD for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQJz-00051D-Gf for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQJz-0006wm-Ci for guix-patches@gnu.org; Mon, 19 Sep 2022 19:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3d. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363061626663 (code B ref 57675); Mon, 19 Sep 2022 23:37:03 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:36:56 +0000 Received: from localhost ([127.0.0.1]:55567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJr-0006vy-RO for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQJp-0006vm-Vt for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:36:54 -0400 Date: Tue, 20 Sep 2022 07:36:36 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kiJuc69cHkf3sfbVK39Ydbd/Nk39o0lv0Pqifc275JU=; b=Qh62CYTX64PcInBGsVz90PZYjTsUFop8QO/BioCQWijM4TANBo5wwpCIY7MlzEksCCQAT4 dE7PzNnaVlphakDCDUWAKynj0RPwP0LvpjFG9PjDdqyVp4VLhlcvS9j47QoWd49kQq/dn2 ugq8SxKdsB3YTWJZs/vghFhdpweApr89Kv3kSY9cZ3zyYgktJb3nz6Bnb6SWuWfrQvV7cQ ksDO/Gry/7es9ixIpKcxL+djDvmjc2bJ0phLmDat8qgxfk8SYuaY/Ay3jyvvRZsnFoz7hE y+bZRvRKA8xFhQ+DQ2CegdSrUWcdmAjLWvtZELrO+im3SS+Hvpg44V0dGRL2Ng== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3d. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. use system openh264. [#:configure-flags]: Comment out with default values. [native-inputs]: Drop perl. [inputs]: Replace pipewire with pipewire-0.3. Drop alsa-lib, libx11 and pulseaudio. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. [snippet,#:phases,license]: Sync with source tree. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 89 ++++++++++--------- 3 files changed, 69 insertions(+), 42 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch -- 2.37.3 diff --git a/gnu/local.mk b/gnu/local.mk index 238fb72bc5..00f8d0adcb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza +Date: Sun, 15 May 2022 12:47:41 +0200 +Subject: [PATCH] fix(h265_pps_parser): fix missing cstdint include + +--- + src/common_video/h265/h265_pps_parser.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h +index 28c95ea9..c180b1b9 100644 +--- a/src/common_video/h265/h265_pps_parser.h ++++ b/src/common_video/h265/h265_pps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H265_PPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ddc80df9c2..6d9bfd9321 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -72,35 +75,35 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define libvpx-for-telegram-desktop - (let* ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") +(define libyuv-for-telegram-desktop + (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "0") - (name "libvpx-for-telegram-desktop") + (name "libyuv-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") +(define crc32c-for-telegram-desktop + (let* ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") (revision "0") - (name "libyuv-for-telegram-desktop") + (name "crc32c-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (let* ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") @@ -343,8 +346,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -360,57 +363,61 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list #:tests? #f ; No target - #:configure-flags - #~`("-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") + (list #:tests? #f ; No target #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ - (let* ((libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) - (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -422,13 +429,11 @@ (define-public webrtc-for-telegram-desktop license:asl2.0 ;; LibYuv (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") - ;; OpenH264 - license:bsd-2 ;; PFFFT (license:non-copyleft "file:///src/third_party/pffft/LICENSE") ;; RnNoise license:gpl3 - ;; LibSRTP, LibVPx, UsrSCTP and Others + ;; LibSRTP, Crc32c and Others license:bsd-3)))))) (define-public rlottie-for-telegram-desktop From patchwork Mon Sep 19 23:36:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42760 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 AEB0427BBF4; Tue, 20 Sep 2022 00:38:16 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 810BC27BBE9 for ; Tue, 20 Sep 2022 00:38:14 +0100 (BST) Received: from localhost ([::1]:57116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQL7-0000j2-M2 for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 19:38:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaQKw-0000et-BC for guix-patches@gnu.org; Mon, 19 Sep 2022 19:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaQKw-000579-3N for guix-patches@gnu.org; Mon, 19 Sep 2022 19:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaQKv-0006yU-Ut for guix-patches@gnu.org; Mon, 19 Sep 2022 19:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 23:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166363063626759 (code B ref 57675); Mon, 19 Sep 2022 23:38:01 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 23:37:16 +0000 Received: from localhost ([127.0.0.1]:55575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQKB-0006xW-Hx for submit@debbugs.gnu.org; Mon, 19 Sep 2022 19:37:16 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaQK9-0006xI-6K for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 19:37:14 -0400 Date: Tue, 20 Sep 2022 07:36:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663630627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6/EHy3BG7AJ6eEWxETgUpnllbRz9DcAtwZkjhpB2dUE=; b=dz0VFE2s8P+57V7JwxZzaX6pPsPagWsGkn/yxTgUU+6Cpb/xZ74/DSoluTujqB5j92DADb 5zwDTKmenvGTf3ujyVE41w/T/toiuG/SYGx6Zk6gYG3f7mbpnldTFd2hO4lF7r+VDhERzw 6ELB7OEcUr6Y9+mmfaiSOjsZzk8KqT5XEiuYVpZli2aROK6vPjNUlGRr8beeWwU168Oi00 POnbZJ6kDgz9zgSP0+NX+a1EJeUMUvz4B08GuRwunG8YsWU7jB62t+KvNvbaEryu0TubJN Rh+Mj7A904Y+vViaL/MrUgd4dRtP6ho6g866uwcj5Aip1h7cD7api0/M1/kdYQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop): Update to b9f1b6. (codegen-for-telegram-desktop): Update to 8815d7. (lib-base-for-telegram-desktop): Update to cc5550. (lib-crl-for-telegram-desktop): Update to 4e620b. (lib-lottie-for-telegram-desktop): Update to 6ed1c2. (lib-qr-for-telegram-desktop): Update to 501f4c. (lib-rpl-for-telegram-desktop): Update to fd31f5. (lib-spellcheck-for-telegram-desktop): Update to 0e386e. (lib-storage-for-telegram-desktop): Update to 839609. (lib-tl-for-telegram-desktop): Update to 36fb95. (lib-ui-for-telegram-desktop): Update to f82162. (lib-webrtc-for-telegram-desktop): Update to 9b1159. (lib-webview-for-telegram-desktop): Update to 546df6. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop): Remove variables. (tgcalls-for-telegram-desktop): Update to 82c492. (dispatch-for-telegram-desktop): New variable. (rlottie-for-telegram-desktop): Update to 8c69fc. [snippet]: Switch off werror. [arguments]: Use inherited ones. (libtgvoip-for-telegram-desktop): Update to 78a8e2. Change to source. (telegram-desktop): Update to 4.2.0. [#:configure-flags]: Use system rlottie. [native-inputs]: Add clang-toolchain. Drop cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf, qt5ct. [propagated-inputs]: Drop dconf. [snippet,#:phases,license]: Sync with source tree. --- gnu/packages/telegram.scm | 305 ++++++++++++++++---------------------- 1 file changed, 126 insertions(+), 179 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6d9bfd9321..58d70e2930 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -43,6 +43,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -106,8 +108,8 @@ (define crc32c-for-telegram-desktop "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop - (let* ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") - (revision "0") + (let* ((commit "b9f1b6036329e44ec61f51f0b363fe2319158b84") + (revision "1") (name "cmake-helpers-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -118,11 +120,11 @@ (define cmake-helpers-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3"))))) (define codegen-for-telegram-desktop - (let* ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119") - (revision "0") + (let* ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") + (revision "1") (name "codegen-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -133,11 +135,11 @@ (define codegen-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (let* ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6") - (revision "0") + (let* ((commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5") + (revision "1") (name "lib-base-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -148,11 +150,11 @@ (define lib-base-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27"))))) (define lib-crl-for-telegram-desktop - (let* ((commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f") - (revision "0") + (let* ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") + (revision "1") (name "lib-crl-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -163,11 +165,11 @@ (define lib-crl-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (let* ((commit "0770df009db7928df1d0cad0900dc5110106d229") - (revision "0") + (let* ((commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904") + (revision "1") (name "lib-lottie-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -178,11 +180,11 @@ (define lib-lottie-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4"))))) (define lib-qr-for-telegram-desktop - (let* ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189") - (revision "0") + (let* ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") + (revision "1") (name "lib-qr-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -193,26 +195,11 @@ (define lib-qr-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))) - -(define lib-rlottie-for-telegram-desktop - (let* ((commit "0671bf70547381effcf442ec9618e04502a8adbc") - (revision "0") - (name "lib-rlottie-for-telegram-desktop") - (version (git-version "0" revision commit))) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) (define lib-rpl-for-telegram-desktop - (let* ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617") - (revision "0") + (let* ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") + (revision "1") (name "lib-rpl-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -223,11 +210,11 @@ (define lib-rpl-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (let* ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094") - (revision "0") + (let* ((commit "0e386e22cb6ba8a114b569840a635e096dcb645e") + (revision "1") (name "lib-spellcheck-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -238,11 +225,11 @@ (define lib-spellcheck-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw"))))) (define lib-storage-for-telegram-desktop - (let* ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1") - (revision "0") + (let* ((commit "839609369d04615475cb1518636de3619106a917") + (revision "1") (name "lib-storage-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -253,11 +240,11 @@ (define lib-storage-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (let* ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb") - (revision "0") + (let* ((commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa") + (revision "1") (name "lib-tl-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -268,11 +255,11 @@ (define lib-tl-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk"))))) (define lib-ui-for-telegram-desktop - (let* ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f") - (revision "0") + (let* ((commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3") + (revision "1") (name "lib-ui-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -283,67 +270,82 @@ (define lib-ui-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5"))))) -(define lib-waylandshells-for-telegram-desktop - (let* ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") - (revision "0") - (name "lib-waylandshells-for-telegram-desktop") +(define lib-webrtc-for-telegram-desktop + (let* ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") + (revision "1") + (name "lib-webrtc-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") + (url "https://github.com/desktop-app/lib_webrtc.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq"))))) -(define lib-webrtc-for-telegram-desktop - (let* ((commit "ef49f953f12b112008a094a719f40939aaf39db4") - (revision "0") - (name "lib-webrtc-for-telegram-desktop") +(define lib-webview-for-telegram-desktop + (let* ((commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35") + (revision "1") + (name "lib-webview-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") + (url "https://github.com/desktop-app/lib_webview.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l"))))) -(define lib-webview-for-telegram-desktop - (let* ((commit "e06427c624515485774e2e2181d4afeb05ad5a67") +(define tgcalls-for-telegram-desktop + (let* ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "1") + (name "tgcalls-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) + +(define dispatch-for-telegram-desktop + (let* ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") (revision "0") - (name "lib-webview-for-telegram-desktop") + (name "dispatch-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") + (url "https://github.com/apple/swift-corelibs-libdispatch.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))) + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) -(define tgcalls-for-telegram-desktop - (let* ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") +(define libtgvoip-for-telegram-desktop + (let* ((commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4") (revision "0") - (name "tgcalls-for-telegram-desktop") + (name "libtgvoip-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") + (url "https://github.com/telegramdesktop/libtgvoip.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hwki941h"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -437,8 +439,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "672")) (hidden-package (package (inherit rlottie) @@ -454,87 +456,38 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) - -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Own fork, bundled build to avoid an addressing issue. + "libtgvoip" + ;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -542,14 +495,13 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags @@ -559,16 +511,16 @@ (define-public telegram-desktop ;; . "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -581,81 +533,76 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) + ("Telegram/ThirdParty/libtgvoip" #$libtgvoip-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/libtgvoip + license:unlicense + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+))))