From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YEPtLWj9KGNB0wAAbAwnHQ (envelope-from ) for ; Tue, 20 Sep 2022 01:38:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wArfLWj9KGMt4AAAauVa8A (envelope-from ) for ; Tue, 20 Sep 2022 01:38:16 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 654253BB7E for ; Tue, 20 Sep 2022 01:38:16 +0200 (CEST) Received: from localhost ([::1]:57116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaQL8-0000j2-UU for larch@yhetil.org; Mon, 19 Sep 2022 19:38:14 -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 Content-Type: text/plain; charset=US-ASCII 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663630696; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=6/EHy3BG7AJ6eEWxETgUpnllbRz9DcAtwZkjhpB2dUE=; b=nId2AuzGUC20oH/e19jFrLcaml3TPCeeSqiOYmZg0kl1IMNHdKn46PoMwYE27xvg2rz5QG DZlbDB2udxJJgSbufp926Un89Avl317DpWhNTtEn4kKfEFdgjFZSpQ0LjPiLVRV0DdY5uf jLeImc8S6q/JB1saUQSQxPL3E2ET5uilV4suCv2joBd6dk96/lmp4K5hqV4PBZgsqjXXi0 Qfu4M3gFBtDDvDqFdmaocy3gNNxXrTZZQ0vFjuBSuTT8x7FgVTcQ7l7YkIBfvftNURph/F oxlJMdzk6hRI+VYauG3ns2MVc2Yh7tmTG2ujtqeGEDzuwi5MHxCIVjBNmJYJfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663630696; a=rsa-sha256; cv=none; b=e/ifOC44qKjH1kZ3Jq2kv+aSy3rUdcUSVEKBnG9lJ1mx3xfH413Es6Jxk648mp0Br2Q5ZI tIAl8hob4W9B4+ni75O/QaK48IyDsYIL4uD1X/WPKcZ9b6tjC2RG3HQ90i1XA5MKJSojbn E0NzpMNYkCqGNgzHAv0KTtPycNOHr9JdjR+zk4QYY339Si73XWq7gaUsKcZvEKmjiGXSUP wYKCL2I1BsS5vWQF+9nlIrSKwSzCTaAWrAe8gW9rhWLJPPT2F5EFhSk9orTQBlVy+HPrT1 QwSsn60/V5wM5bjuN/LYFkZmMqUDooI4CoqvSsJ5PELuuJBfq4lLX7MZSiKghw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=dz0VFE2s; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.84 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=dz0VFE2s; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 654253BB7E X-Spam-Score: -1.84 X-Migadu-Scanner: scn1.migadu.com X-TUID: 4KXGlTVHxKb/ * 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(-) 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+)))) -- 2.37.3