From patchwork Thu Sep 22 02:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42835 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 13D2027BBEA; Thu, 22 Sep 2022 03:32:41 +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 7517027BBE9 for ; Thu, 22 Sep 2022 03:32:39 +0100 (BST) Received: from localhost ([::1]:35126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obC10-0002nc-L8 for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obC0W-0002Kl-2c for guix-patches@gnu.org; Wed, 21 Sep 2022 22:32:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obC0Q-0007z9-8E for guix-patches@gnu.org; Wed, 21 Sep 2022 22:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obC0Q-000776-2q for guix-patches@gnu.org; Wed, 21 Sep 2022 22:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 RECURSIVE CLONE 1/9] gnu: telegram-desktop: Fetch submodules recursively. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:32: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.166381388027255 (code B ref 57675); Thu, 22 Sep 2022 02:32:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:31:20 +0000 Received: from localhost ([127.0.0.1]:35632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBzj-00075V-Rx for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:31:20 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBzh-00075H-BZ for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:31:18 -0400 Date: Thu, 22 Sep 2022 10:30:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813871; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4RcCzfQ8shc2GSlyyFxAwI+CLNNqCPSMwHAfr0OUXD8=; b=RaoPs1wOph63y0+PZMsQI/HO6wnLEvbWELW+MNNPGH9yAqxDjTW0XDAVxUZGrzIBHbxmCv 0OVD9+3B7SGGv9YsV8hnnbxND5ga66gbgQIeIhAwk7ksyNHMes7DsJ1URcqJCHLzeFxyTv HwzJTiPpBc0h8kcXFY2E2HkomDILRjsi0VzpocD//3zyPTZafH6vr+aFRpctt+NsjtPHNj qXaClV2VQzem6ir1FlQKlK8mavpw1LMUGZf2B9Df7+9kjHx1vdAttZNopL3yPJ+NrIfHRm gxdjYDgyXcrHcOo0Vc/dEfFwPS3sZlcqULx4ryPccdzH6zuWKumnUd5220ci0A== 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-version) (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): Remove variables. (tgcalls-for-telegram-desktop): Use git revision rather than telegram version. (telegram-desktop): Fetch submodules recursively. [arguments]<#:phases>: Adjust accordingly. --- gnu/packages/telegram.scm | 235 ++++---------------------------------- 1 file changed, 20 insertions(+), 215 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..eb94f3b995 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -72,8 +72,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") - (define libvpx-for-telegram-desktop (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") (revision "112")) @@ -104,197 +102,20 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define cmake-helpers-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - -(define codegen-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - -(define lib-base-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - -(define lib-crl-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - -(define lib-lottie-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - -(define lib-qr-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - -(define lib-rpl-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - -(define lib-spellcheck-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - -(define lib-storage-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - -(define lib-tl-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - -(define lib-ui-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - -(define lib-webrtc-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - -(define lib-webview-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - (define tgcalls-for-telegram-desktop - (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" %telegram-version)) - (sha256 - (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") + (revision "738")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name + "tgcalls-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") @@ -464,19 +285,18 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version %telegram-version) + (version "2.9.3") (source (origin (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (uri (git-reference + (url "https://github.com/telegramdesktop/tdesktop.git") + (commit (string-append "v" version)) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -526,22 +346,7 @@ (define-public telegram-desktop ((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))))) + '(("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) (add-before 'configure 'patch-cxx-flags (lambda _ (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all"))))