From patchwork Mon Sep 19 06:10:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42726 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 30ADE27BBEA; Mon, 19 Sep 2022 07:11:20 +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 9F50227BBE9 for ; Mon, 19 Sep 2022 07:11:19 +0100 (BST) Received: from localhost ([::1]:45124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oa9zy-00086D-HG for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:11:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oa9zi-0007vH-Vm for guix-patches@gnu.org; Mon, 19 Sep 2022 02:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oa9zi-0005pJ-N6 for guix-patches@gnu.org; Mon, 19 Sep 2022 02:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oa9zi-0002So-I0 for guix-patches@gnu.org; Mon, 19 Sep 2022 02:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 01/10] gnu: webrtc-for-telegram-desktop: Simplify inputs. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 06:11: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.16635678609455 (code B ref 57675); Mon, 19 Sep 2022 06:11:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:11:00 +0000 Received: from localhost ([127.0.0.1]:51897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oa9zg-0002SR-0C for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:11:00 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:45364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oa9ze-0002SE-9C for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:10:58 -0400 Date: Mon, 19 Sep 2022 14:10:41 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663567852; 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=xOhnYxcxstFpvSU5iW6JgVjbCad1os/2cTYDmeQo628=; b=2rmOxsHGeCaQVN9RKDiUOJtOaOu1uDG/rdnKx3Ee9Wluf7+xnxFsp1QVHgvR3SxxBuGdfZ XXJuG5kfH4/JOlAIwh8cNNQo9MEa/ZwjvML3x7uBSbJRziMudZGgB3P2IAzXj+1qndEpTk XOP+IAsh8V/vNSgV88EDNWzrcg1XYG8BzsaD1DqWGtt8MrK8fVEPBJfMLzkyqCXFhBwDZl V/wlu2fc80VGuF8vG78ZctKv5DSCQFSqpNJd4RxbW5UdqWSbKVSkLL2dthZW6vPWU64NSm gjos+4VutwsSAARge7IUxl453ZfjQvvJl6LmKivZ6xEknSMalShHMHIKbmtEAQ== 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]: Remove unneeded #t. [native-inputs,inputs]: Simplify inputs. --- gnu/packages/telegram.scm | 93 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 47 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1a22d230d2..3a46ab086c 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,52 +125,52 @@ (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))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (copy-recursively libyuv-from 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))) + (modify-inputs + `(("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"))))) + (append 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 06:11:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42727 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 188E727BBEA; Mon, 19 Sep 2022 07:12:22 +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 051EF27BBE9 for ; Mon, 19 Sep 2022 07:12:21 +0100 (BST) Received: from localhost ([::1]:41728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA0x-0008JC-6D for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:12:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA0g-0008Ix-AD for guix-patches@gnu.org; Mon, 19 Sep 2022 02:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52832) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA0g-0005tb-1S for guix-patches@gnu.org; Mon, 19 Sep 2022 02:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA0f-0002Un-Sf for guix-patches@gnu.org; Mon, 19 Sep 2022 02:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 02/10] gnu: telegram-desktop: Simplify inputs. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 06:12: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.16635678889539 (code B ref 57675); Mon, 19 Sep 2022 06:12:01 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:11:28 +0000 Received: from localhost ([127.0.0.1]:51907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA07-0002Tn-OF for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:11:28 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:54138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA05-0002Ta-3e for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:11:26 -0400 Date: Mon, 19 Sep 2022 14:11:08 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663567879; 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=r/fH+S8GSHZIJZxJk1OJ7Y9ggsUk5h+ZhtWpxpNC2IY=; b=IXfTdSNptNEKilqiK3UU04qo9paHK6KSJbeh7iCiiMxKCsIwHNWQw0/s8XYemi+uIKNWLx iTe5CpjjZ1DRyngprqIekt5Bj1AC1YG2yUBUSTaEComxYGQvS52IA4LwVwtonR+FCZAy0G MyEaUTBmw5V9FsHIfhtXLJynlFHiEILZjvYp9H2B5QnRj1KJ+HT4Yz2xAIrxv8Sqw8DG31 sUd/63R45X1wzfz7wW/KhZnTUDfAhOJcejnYlJg9muD4UEdEhjyPVhTSx0jO0ZdBkgoq/q X2iabOlNZXBMdfc2l6o72CW/ZTyU+nlr5obuLBEIGH2rR60h/9cFd/T2G6jhFw== 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]: Remove unneeded #t. [native-inputs,inputs]: Simplify inputs. --- gnu/packages/telegram.scm | 468 +++++++++++++++++++------------------- 1 file changed, 232 insertions(+), 236 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 3a46ab086c..cd25897634 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -293,8 +293,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 @@ -323,8 +322,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 @@ -351,246 +349,244 @@ (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 (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))) + (modify-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"))))) + (append 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)) + (modify-inputs + `(("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")))) + ("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")))) + ("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"))))) + (append 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 06:11:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42729 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 38AA327BBEA; Mon, 19 Sep 2022 07:13:37 +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 F273A27BBE9 for ; Mon, 19 Sep 2022 07:13:36 +0100 (BST) Received: from localhost ([::1]:56742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA2B-0000FS-UA for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA1e-0000DM-H7 for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA1e-00063R-8J for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA1e-0002XS-2l for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 03/10] 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 06:13: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.16635679229607 (code B ref 57675); Mon, 19 Sep 2022 06:13:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:12:02 +0000 Received: from localhost ([127.0.0.1]:51910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA0f-0002Um-Oi for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:12:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA0e-0002US-If for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:12:00 -0400 Date: Mon, 19 Sep 2022 14:11:43 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663567914; 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=TZ+mZK2otfJUDt0TZE3p42pD+kRzgLlMQALTNJ8NoGM=; b=t6VcFJDq4IETDSyDWPLLo60oPqfKmvubPXLrcTVW2An/R3uRtHOlr0PuY1ahFEcomNIivq G4PgqYjh6K26uy9jdJ5TDDJX0lq02wonM0lkN1N/G0fT782HeGKOu/gVeLGqBDTo77ayZd h64QokhUYpZAdf7Lt9Tbrv+76/VDvJoKZloBJ4iUSlcv5MajM7mek3I4zOj+fg3FHQLtVH dyYCIXgtN59We0OAgyWKp7BlVRndo2LGSviqrM11IkmsvYE/FBS/mVkupm/hrP7W/kO3Mr cGnN+pjUwc4bNcxeRHBDPi3P1fwfYv75iY9+UHEKuw1Jb9me2mMut4ZqdjV1Bw== 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 [#:configure-flags]: Use API ID from Telegram's official Snap builds. --- gnu/packages/telegram.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index cd25897634..cfa0d1c673 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -308,12 +308,10 @@ (define-public telegram-desktop (ice-9 match)) #:configure-flags (list - ;; Client applications must provide their own API-ID and API-HASH, + ;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml ;; see also . - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + "-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 06:12:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42728 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 8054B27BBEA; Mon, 19 Sep 2022 07:13:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 E531E27BBE9 for ; Mon, 19 Sep 2022 07:13:28 +0100 (BST) Received: from localhost ([::1]:56740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA23-0000FC-JP for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:13:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA1e-0000Ds-Si for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA1e-00063r-Jf for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA1e-0002XZ-Eh for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 04/10] gnu: webrtc-for-telegram-desktop: Use gexp. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 06:13: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.16635679589715 (code B ref 57675); Mon, 19 Sep 2022 06:13:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:12:38 +0000 Received: from localhost ([127.0.0.1]:51930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA1G-0002Wd-6v for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:12:38 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA1D-0002WQ-WF for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:12:36 -0400 Date: Mon, 19 Sep 2022 14:12:18 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663567950; 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=qdhx3Ekh2JS5mf7vuxfdjsKjsBwMHheZIGH9DdeGvCE=; b=lALlkWTKsCp1jDJ+hSY25uQ39Yb0J+4ZCS7zH0Wq0klWAZH5hy+EvvcXe9+IZ4axDhc+zI nvTmczRCdJhs507jYn0m9/PGU3MZ99EdkBdWIcJSPn64m+eB3A78++ZYH48qyrHt22ODMF LJqRr1TuFW2CUa3g3cq6cUEoijgjXk8YUUJQMLR9cthCSkP3Cw1tBbRZxFQJzsWT/5Nxg1 E/pQQxCFtH2VzADfEdSqO3pUomVJxuRnVeThzO86PLMJAyF0KakMuSzh5Wt2Ul0GB7iibU /urE3cnIXQkmqfWsrH0qEc4TJ7Du4NOQ2LJ+4SGyApPUEKCW+m238GLhs21Dhw== 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 (source-for-telegram-desktop, 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 | 116 ++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 60 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index cfa0d1c673..e6766d84eb 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,33 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define* (source-for-telegram-desktop #:key name url revision commit hash) + (let ((name (string-append name "-for-telegram-desktop")) + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url url) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 hash))))) + +(define libvpx-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://chromium.googlesource.com/webm/libvpx" + #:revision "0" + #:commit "5b63f0f821e94f8072eb483014cfc33b05978bb9" + #:hash "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68" + #:name "libvpx")) + +(define libyuv-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://chromium.googlesource.com/libyuv/libyuv" + #:revision "0" + #:commit "ad890067f661dc747a975bc55ba3767fe30d4452" + #:hash "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll" + #:name "libyuv")) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -109,68 +137,36 @@ (define-public webrtc-for-telegram-desktop (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))))))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-sources + (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 - (modify-inputs - `(("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"))))) - (append alsa-lib - ffmpeg - libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr - openssl - opus - pipewire - protobuf - pulseaudio - libx11 - libxext - 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 06:12:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42730 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 809CE27BBE9; Mon, 19 Sep 2022 07:14:32 +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 4AD9727BBE9 for ; Mon, 19 Sep 2022 07:14:31 +0100 (BST) Received: from localhost ([::1]:50674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA34-0000gb-Fq for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA1f-0000EF-8n for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA1e-000644-V3 for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA1e-0002Xh-Qd for guix-patches@gnu.org; Mon, 19 Sep 2022 02:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 05/10] gnu: telegram-desktop: Use gexp. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 06:13: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.16635679799750 (code B ref 57675); Mon, 19 Sep 2022 06:13:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:12:59 +0000 Received: from localhost ([127.0.0.1]:51933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA1a-0002XB-Mg for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:12:59 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:49800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA1Y-0002Ww-7k for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:12:57 -0400 Date: Mon, 19 Sep 2022 14:12:40 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663567970; 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=QFsA3qZuoSH+YWODKOK147mg/xuB6T5CtLBKKQWEkr0=; b=FmChH/NNxSk7m4hJ6cNtCakPxEu8sd+d0zvoPn/hqbJvC8YJNWuOCgppddgJLOd63UUI8s DjqhmzkSbuBqfigXz+G3bVmYvII3syFfB5A+YPokyoP66ebxYGwE+9sY2g1d3MDqHmdEnL JDIdH4noF50MsL06D9BujNAXW1ui3HG9hTmgkAjFvUHFkc2onQ3Mk2bw2Cy/yGq3e4vMoY gtCSrddd/EHJ5HzRTr0L6Vbmp6NGlc58sRUSrc7adFSLgzmaIHjfzzy500mUoRQGrKxajB Y/bRcfVn1VIIxwI34PYNUs8eUtrv5XwG9JffkTalkSFJdK8UYoUvmgNv311C0w== 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 | 515 +++++++++++++++++--------------------- 1 file changed, 229 insertions(+), 286 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index e6766d84eb..f56cbaf23a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -99,6 +99,134 @@ (define libyuv-for-telegram-desktop #:hash "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll" #:name "libyuv")) +(define cmake-helpers-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/cmake_helpers.git" + #:revision "0" + #:commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72" + #:hash "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5" + #:name "cmake-helpers")) + +(define codegen-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/codegen.git" + #:revision "0" + #:commit "248614b49cd7d5aff69d75a737f2e35b79fbb119" + #:hash "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk" + #:name "codegen")) + +(define lib-base-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_base.git" + #:revision "0" + #:commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6" + #:hash "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78" + #:name "lib-base")) + +(define lib-crl-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_crl.git" + #:revision "0" + #:commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f" + #:hash "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz" + #:name "lib-crl")) + +(define lib-lottie-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_lottie.git" + #:revision "0" + #:commit "0770df009db7928df1d0cad0900dc5110106d229" + #:hash "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb" + #:name "lib-lottie")) + +(define lib-qr-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_qr.git" + #:revision "0" + #:commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189" + #:hash "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0" + #:name "lib-qr")) + +(define lib-rlottie-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_rlottie.git" + #:revision "0" + #:commit "0671bf70547381effcf442ec9618e04502a8adbc" + #:hash "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv" + #:name "lib-rlottie")) + +(define lib-rpl-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_rpl.git" + #:revision "0" + #:commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617" + #:hash "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn" + #:name "lib-rpl")) + +(define lib-spellcheck-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_spellcheck.git" + #:revision "0" + #:commit "68c9b788958904aea7de79f986a0f82ec8c5b094" + #:hash "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn" + #:name "lib-spellcheck")) + +(define lib-storage-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_storage.git" + #:revision "0" + #:commit "403df6c4a29562bd417c92d410e49819f5a48cc1" + #:hash "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5" + #:name "lib-storage")) + +(define lib-tl-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_tl.git" + #:revision "0" + #:commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb" + #:hash "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m" + #:name "lib-tl")) + +(define lib-ui-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_ui.git" + #:revision "0" + #:commit "1b590f9e16eb9571a039f072d6fea66c607e419f" + #:hash "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f" + #:name "lib-ui")) + +(define lib-waylandshells-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_waylandshells.git" + #:revision "0" + #:commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7" + #:hash "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf" + #:name "lib-waylandshells")) + +(define lib-webrtc-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_webrtc.git" + #:revision "0" + #:commit "ef49f953f12b112008a094a719f40939aaf39db4" + #:hash "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw" + #:name "lib-webrtc")) + +(define lib-webview-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_webview.git" + #:revision "0" + #:commit "e06427c624515485774e2e2181d4afeb05ad5a67" + #:hash "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4" + #:name "lib-webview")) + +(define tgcalls-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/TelegramMessenger/tgcalls.git" + #:revision "0" + #:commit "81e97fa52e25b7775b62ce07bb653533d81e91b3" + #:hash "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj" + #:name "tgcalls")) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -292,294 +420,109 @@ (define-public telegram-desktop (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 - ;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - ;; see also . - "-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") - #: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 + #~`(;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + ;; see also . + "-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") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-sources + (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" #$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 - (modify-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"))))) - (append cmake-shared - extra-cmake-modules - `(,glib "bin") - `(,gtk+ "bin") - pkg-config - python-wrapper - qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - (modify-inputs - `(("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")))) - ("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")))) - ("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"))))) - (append 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))) + (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 From patchwork Mon Sep 19 06:13:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42731 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 4AB4F27BBEA; Mon, 19 Sep 2022 07:14:39 +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 0D65B27BBE9 for ; Mon, 19 Sep 2022 07:14:39 +0100 (BST) Received: from localhost ([::1]:38824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA3C-0000sM-48 for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:14:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA2d-0000qK-K4 for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA2c-0006AJ-7F for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA2c-0002Zq-22 for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 06/10] 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 06:14: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.16635679979818 (code B ref 57675); Mon, 19 Sep 2022 06:14:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:13:17 +0000 Received: from localhost ([127.0.0.1]:51939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA1s-0002YI-PQ for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:13:16 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA1r-0002Y5-Ia for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:13:15 -0400 Date: Mon, 19 Sep 2022 14:13:00 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663567990; 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=H6ikaYWUQXyJczc+5+c7bmCmrjDlfAhPFmk6mvK+TXooNrDi+bAOcIH3C/SPh/E/JKkk5k pGKFzXsRW2JmJhUBXEtnoofY223AXN1dPXxmjMwhkFFoS6UGqWCQzAqRhTVjXgJod7LLm4 D05UvzhgDmBZwjC9RleTkQpjhW0jix7e1gpKQ8yYIQSs9PHD4wOv2xjLUSuMICdjWfeHHN G3PYq9oFUR2UjO8iQWnwI/JQ9VWVODRV2jr9PcVL56GiS4SxqX6VXvBqZ212khpTPf3o5H olJV5DMbXXpOgcK9Fgt7wLk7krrd8UtKwNtJK/LVyrn4q7KNhoMVL0n/qxtPfQ== 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 06:13: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: 42732 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 EA05427BBEA; Mon, 19 Sep 2022 07:14:40 +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 B52BB27BBE9 for ; Mon, 19 Sep 2022 07:14:40 +0100 (BST) Received: from localhost ([::1]:38826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA3D-0000tY-OF for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:14:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA2d-0000qJ-Jz for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA2c-0006AK-Lm for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA2c-0002Zx-GZ for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 07/10] 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 06:14: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.16635680179853 (code B ref 57675); Mon, 19 Sep 2022 06:14:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:13:37 +0000 Received: from localhost ([127.0.0.1]:51942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA2D-0002Yq-1Y for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:13:37 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA2B-0002Yd-5N for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:13:35 -0400 Date: Mon, 19 Sep 2022 14:13:19 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663568009; 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=ShDc7oYgGlkUBY8M8Js1tinS/0GLFg2GZlpl94YruWAQLrtrxs28ip5kXRWX7i+MXrLfQR X6viDTYKx2dNxTHU0Ana5PUngTzcK/xXvHJ4rtAf16Anb3CNOMwAaiL49gT/YpyKq6cEkz oDSqNEshZL6Mxl3fYyqPcxeWyVUdxRnxXka7EPgNKNQHihDUdHoUB5ex/v9i+L9aYSeFSi keL1VbXdQtQEuVYY+Gd044YwBibLVH0hoj91wij5YIQ9/b+pTncY1pAmUbQ86HqBZ8VPOt PGHqrOQdoIPTw4YsHuTZJ9tq+jEDvu23PaR4z1fcmKZO9FKCkBx5WUc69BqhNg== 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 06:13:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42733 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 8430B27BBEA; Mon, 19 Sep 2022 07:14:51 +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 466D227BBE9 for ; Mon, 19 Sep 2022 07:14:51 +0100 (BST) Received: from localhost ([::1]:38476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA3N-0001DQ-Ea for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:14:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA2d-0000qL-Kb for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA2d-0006AL-2Y for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA2c-0002a5-Tp for guix-patches@gnu.org; Mon, 19 Sep 2022 02:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 08/10] 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 06:14: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.16635680369888 (code B ref 57675); Mon, 19 Sep 2022 06:14:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:13:56 +0000 Received: from localhost ([127.0.0.1]:51945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA2W-0002ZQ-BY for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:13:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:57780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA2U-0002ZC-So for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:13:55 -0400 Date: Mon, 19 Sep 2022 14:13:37 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663568029; 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=IxBuJy0AjfnVXdxNT+67j5iZ5z42kjqmL9SqlMki+d8=; b=hlRHWs1AIYXNB1ku9YcV6S4EMnOqEvWH1dDDqV9eUBsnSizydRu0Er0cb/6iME7W9QUmcv OQfZhRUH4cfK2ybXh2np1ZNCZ7+VX2Pqw3+M8j6bmjRQtMsvuWeD57SyuwcKsvc2zMm7H2 tqVFgUhMmhGQrWSY/wa1M3RhBQKJbHTveF//LaMipN6TEo/Vic08HYv4dRD0CH9F3Qos/H e2Smsezfi0VWGhbcKE3VmX5fQbn6TIU3pwtFFmTGIFoQ+eArVhP3uypC7slOe1psscmv0B N9ubVWqj8B26G8FKHpHuqrFIKqbiublMdTlcTcqApBn1v2W9IVUk/6SAcDBvaQ== 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. Remove unneeded #t. --- gnu/packages/kde-frameworks.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) -- 2.37.3 diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..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,21 +602,12 @@ (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"))) - #t)) - ;; 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)) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (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 06:13:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42734 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 C284327BBEB; Mon, 19 Sep 2022 07:15:26 +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 685CC27BBE9 for ; Mon, 19 Sep 2022 07:15:25 +0100 (BST) Received: from localhost ([::1]:49840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA3w-0001kb-Gr for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:15:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA3a-0001io-VW for guix-patches@gnu.org; Mon, 19 Sep 2022 02:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA3a-0006LA-JL for guix-patches@gnu.org; Mon, 19 Sep 2022 02:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA3a-0002cO-Dc for guix-patches@gnu.org; Mon, 19 Sep 2022 02:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 09/10] 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 06:15: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.16635680569979 (code B ref 57675); Mon, 19 Sep 2022 06:15:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:14:16 +0000 Received: from localhost ([127.0.0.1]:51956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA2q-0002as-0b for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:14:16 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA2o-0002aX-QG for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:14:15 -0400 Date: Mon, 19 Sep 2022 14:13:58 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663568049; 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=4kh3MEltAfh780JZAICNrR+GcqNiqcdP4IH9dngJlD4=; b=oTcDSjZ0/g6Af+LJEBP/O8Ia2Xeage4TS0/RqsSoNA+uK0KSVnTorGDi9yiHTeXxUaNKID IB7R7vbSytMg6KEg6UP3mqwPi7XzNp1NCFPaqyDz8tnx2cHs6rA9vnf5cLV7WL5Of4Drsf le7itOQFmz71JRALuqaA7q5dGhTRkbLnKZTf1kKqze8SpqbspDYuFNd/RkvI+4v/GLZbEw YJyc+yMa1nIhYXBHTE4unD7TtedEPay69kDswnczSlLEujbizkb/EEu7euFhfcR2P27eWN Qf9iEwg2q8URX4iJz3b8smIdtC3lvXisEPfAS7bf4Kc2bobF88uAvS0+HtLT0Q== 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, libvpx, openh264, libdrm, libglvnd, mesa, libxfixes. [snippet,#:phases,license]: Sync with source tree. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++ gnu/packages/telegram.scm | 103 ++++++++++-------- 3 files changed, 80 insertions(+), 45 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 542c06e221..ddbfe7de30 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1967,6 +1967,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 f56cbaf23a..7542f6cd17 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:) @@ -83,14 +86,6 @@ (define* (source-for-telegram-desktop #:key name url revision commit hash) (file-name (git-file-name name version)) (sha256 (base32 hash))))) -(define libvpx-for-telegram-desktop - (source-for-telegram-desktop - #:url "https://chromium.googlesource.com/webm/libvpx" - #:revision "0" - #:commit "5b63f0f821e94f8072eb483014cfc33b05978bb9" - #:hash "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68" - #:name "libvpx")) - (define libyuv-for-telegram-desktop (source-for-telegram-desktop #:url "https://chromium.googlesource.com/libyuv/libyuv" @@ -99,6 +94,14 @@ (define libyuv-for-telegram-desktop #:hash "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll" #:name "libyuv")) +(define crc32c-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/google/crc32c" + #:revision "0" + #:commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94" + #:hash "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4" + #:name "crc32c")) + (define cmake-helpers-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/cmake_helpers.git" @@ -228,8 +231,8 @@ (define tgcalls-for-telegram-desktop #:name "tgcalls")) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -245,55 +248,67 @@ (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" - ;; 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 + '("abseil-cpp" "libsrtp" "rnnoise" + ;; Not available in Guix. + "crc32c" "pffft"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (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 + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + ;; #:configure-flags + ;; #~'("-DTG_OWT_USE_PIPEWIRE=ON" + ;; "-DTG_OWT_USE_X11=ON" + ;; "-DTG_OWT_USE_PROTOBUF=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-sources (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 @@ -305,13 +320,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 06:14:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42735 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 9691E27BBE9; Mon, 19 Sep 2022 07:15:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 6DEAA27BBEA for ; Mon, 19 Sep 2022 07:15:25 +0100 (BST) Received: from localhost ([::1]:49838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaA3w-0001kM-HL for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 02:15:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaA3b-0001j6-Bo for guix-patches@gnu.org; Mon, 19 Sep 2022 02:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaA3b-0006Q7-3J for guix-patches@gnu.org; Mon, 19 Sep 2022 02:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaA3a-0002cX-Tp for guix-patches@gnu.org; Mon, 19 Sep 2022 02:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v4 10/10] 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 06:15: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.166356807910016 (code B ref 57675); Mon, 19 Sep 2022 06:15:02 +0000 Received: (at 57675) by debbugs.gnu.org; 19 Sep 2022 06:14:39 +0000 Received: from localhost ([127.0.0.1]:51959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA3C-0002bT-Qc for submit@debbugs.gnu.org; Mon, 19 Sep 2022 02:14:39 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaA37-0002bD-Um for 57675@debbugs.gnu.org; Mon, 19 Sep 2022 02:14:37 -0400 Date: Mon, 19 Sep 2022 14:14:16 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663568068; 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=UIQFQWURleF3TfWqZbHG17YEhArOtdnnxFGhk6lOpSA=; b=Lt1oWqoYfMjWiboAKMiBNeSMfPUW9hY9seGoraVH5vMwgqoFKJox8IBuYsuaw1YOp+jbbq wX0GlmHnbLCApTJUL7mSPS3DSmL6qkHJ7O7TuPE1TSrEJt0gM0MtlXRFpxL29P5RBh78bh lNvevlA0+PTWkor9noeSLj0Z5wonkXxC8pAMnBH9CO2kwGuh1aOeVPJHLwNwW56/oHErkp Tt9T6nZ5j7rFC8kew3LeVgRK+11TFGXs/qxkdwd+HzRICTgYwTU2rbCgtX1eMqoP9+naKJ H7b9MZmUpj7g1pnmjWagA16dzXhGwTO6E/bc7znIrwtteNrIyKEKQjAhvPoe7Q== 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]: Comment out with default vaules. Use system rlottie [native-inputs]: Add clang-toolchain. Drop cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, qtbase, wayland and webkitgtk. Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, materialdecoration, libdbusmenu-qt, libtgvoip-for-telegram-desktop, nimf, qtbase-5, qt5ct, libx11. [propagated-inputs]: Drop dconf. [snippet,#:phases,license]: Sync with source tree. --- gnu/packages/telegram.scm | 313 +++++++++++++++++--------------------- 1 file changed, 139 insertions(+), 174 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 7542f6cd17..7556513208 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -28,6 +28,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages digest) + #:use-module (gnu packages enchant) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) #:use-module (gnu packages freedesktop) @@ -43,6 +44,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,12 +62,14 @@ (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) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -105,131 +109,131 @@ (define crc32c-for-telegram-desktop (define cmake-helpers-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/cmake_helpers.git" - #:revision "0" - #:commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72" - #:hash "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5" + #:revision "1" + #:commit "b9f1b6036329e44ec61f51f0b363fe2319158b84" + #:hash "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3" #:name "cmake-helpers")) (define codegen-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/codegen.git" - #:revision "0" - #:commit "248614b49cd7d5aff69d75a737f2e35b79fbb119" - #:hash "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk" + #:revision "1" + #:commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c" + #:hash "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2" #:name "codegen")) (define lib-base-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_base.git" - #:revision "0" - #:commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6" - #:hash "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78" + #:revision "1" + #:commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5" + #:hash "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27" #:name "lib-base")) (define lib-crl-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_crl.git" - #:revision "0" - #:commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f" - #:hash "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz" + #:revision "1" + #:commit "4e620bc383d032aadea8e6af02661f8c76695cec" + #:hash "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x" #:name "lib-crl")) (define lib-lottie-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_lottie.git" - #:revision "0" - #:commit "0770df009db7928df1d0cad0900dc5110106d229" - #:hash "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb" + #:revision "1" + #:commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904" + #:hash "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4" #:name "lib-lottie")) (define lib-qr-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_qr.git" - #:revision "0" - #:commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189" - #:hash "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0" + #:revision "1" + #:commit "501f4c3502fd872ab4d777df8911bdac32de7c48" + #:hash "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f" #:name "lib-qr")) -(define lib-rlottie-for-telegram-desktop - (source-for-telegram-desktop - #:url "https://github.com/desktop-app/lib_rlottie.git" - #:revision "0" - #:commit "0671bf70547381effcf442ec9618e04502a8adbc" - #:hash "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv" - #:name "lib-rlottie")) - (define lib-rpl-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_rpl.git" - #:revision "0" - #:commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617" - #:hash "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn" + #:revision "1" + #:commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe" + #:hash "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf" #:name "lib-rpl")) (define lib-spellcheck-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_spellcheck.git" - #:revision "0" - #:commit "68c9b788958904aea7de79f986a0f82ec8c5b094" - #:hash "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn" + #:revision "1" + #:commit "0e386e22cb6ba8a114b569840a635e096dcb645e" + #:hash "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw" #:name "lib-spellcheck")) (define lib-storage-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_storage.git" - #:revision "0" - #:commit "403df6c4a29562bd417c92d410e49819f5a48cc1" - #:hash "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5" + #:revision "1" + #:commit "839609369d04615475cb1518636de3619106a917" + #:hash "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm" #:name "lib-storage")) (define lib-tl-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_tl.git" - #:revision "0" - #:commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb" - #:hash "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m" + #:revision "1" + #:commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa" + #:hash "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk" #:name "lib-tl")) (define lib-ui-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_ui.git" - #:revision "0" - #:commit "1b590f9e16eb9571a039f072d6fea66c607e419f" - #:hash "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f" + #:revision "1" + #:commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3" + #:hash "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5" #:name "lib-ui")) -(define lib-waylandshells-for-telegram-desktop - (source-for-telegram-desktop - #:url "https://github.com/desktop-app/lib_waylandshells.git" - #:revision "0" - #:commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7" - #:hash "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf" - #:name "lib-waylandshells")) - (define lib-webrtc-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_webrtc.git" - #:revision "0" - #:commit "ef49f953f12b112008a094a719f40939aaf39db4" - #:hash "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw" + #:revision "1" + #:commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a" + #:hash "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq" #:name "lib-webrtc")) (define lib-webview-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_webview.git" - #:revision "0" - #:commit "e06427c624515485774e2e2181d4afeb05ad5a67" - #:hash "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4" + #:revision "1" + #:commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35" + #:hash "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l" #:name "lib-webview")) (define tgcalls-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/TelegramMessenger/tgcalls.git" - #:revision "0" - #:commit "81e97fa52e25b7775b62ce07bb653533d81e91b3" - #:hash "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj" + #:revision "1" + #:commit "82c4921045c440b727c38e464f3a0539708423ff" + #:hash "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk" #:name "tgcalls")) +(define dispatch-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/apple/swift-corelibs-libdispatch.git" + #:revision "0" + #:commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73" + #:hash "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn" + #:name "dispatch")) + +(define libtgvoip-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/telegramdesktop/libtgvoip.git" + #:revision "0" + #:commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4" + #:hash "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hwki941h" + #:name "libtgvoip")) + (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") (revision "167")) @@ -328,8 +332,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) @@ -345,102 +349,52 @@ (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"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '(;; 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=? + (scandir ".") + (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 @@ -448,17 +402,31 @@ (define-public telegram-desktop ;; see also . "-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") + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name) + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + ;; "-DDESKTOP_APP_LOTTIE_USE_CACHE=ON" + ;; "-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_X11_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_USE_ALLOCATION_TRACER=OFF" + ;; "-DDESKTOP_APP_USE_PACKAGED=ON" + ;; "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" + ;; "-DDESKTOP_APP_DISABLE_SPELLCHECK=OFF" + ;; "-DDESKTOP_APP_USE_HUNSPELL_ONLY=OFF" + ;; "-DDESKTOP_APP_USE_ENCHANT=OFF" + ;; "-DDESKTOP_APP_NO_PDB=OFF" + ;; "-DDESKTOP_APP_DISABLE_JEMALLOC=OFF" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-sources - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda _ (for-each (match-lambda ((dst src) @@ -470,81 +438,78 @@ (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_USE_ENCHANT + ;; enchant + ;; 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+))))