From patchwork Sun Sep 11 10:11: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: 42465 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 CA3A027BBE9; Sun, 11 Sep 2022 11:12:13 +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 013A427BBEA for ; Sun, 11 Sep 2022 11:12:13 +0100 (BST) Received: from localhost ([::1]:58360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJwi-0005n7-5G for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJwY-0005mr-N3 for guix-patches@gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJwY-0007XY-Cq for guix-patches@gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJwY-0007R0-7v for guix-patches@gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10:12: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.166289110128537 (code B ref 57675); Sun, 11 Sep 2022 10:12:02 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:11:41 +0000 Received: from localhost ([127.0.0.1]:40772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwC-0007QD-Sa for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:11:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwA-0007Py-VB for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:11:39 -0400 Date: Sun, 11 Sep 2022 18:11:16 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891093; 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=yi1RRIk4jsLhjGkg6nX4zb2F+tXlNnLxxXGvgzhxPYs=; b=wD1VnSxg0/dRYCuWEjAvicgOTGIWSXDjg6tIOymETBt3mEwz+uhwDBlb4d8aZ3KLq3i5zs YfMgRhquo3/YBmXjwH8GGVwBx8p8OvTuQrjXlvi3jgb7VWW9I82Plj/rCwS4ydZt2/Wsg8 Q1Zr2GlD+U8rmbVUAjXUGsrUtzANbPT7Afd1Pqy+c0pkoaCPRqvqx/KAMn3TTEMw6AgW40 Q2liT7367VxVJ2IHs9MHe5NFp017QoH4iVgc3FCQEL2wl/m/oOR3ivdZxGdoWl5+3tA/fz 0si7gEaqM/MXvkcsASkTCbbF3YXyqVPeDr8fU4PTRkGrghPCSPqriyK8YQ3XOg== 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): Simplify inputs. --- gnu/packages/telegram.scm | 84 +++++++++++---------------------------- 1 file changed, 23 insertions(+), 61 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4976acbc0c..9bef94788b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -85,11 +85,12 @@ (define-public webrtc-for-telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/tg_owt.git") - (commit commit))) + (commit commit) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -99,79 +100,40 @@ (define-public webrtc-for-telegram-desktop '( ;; Custom forks which are incompatible with the ones in Guix. "abseil-cpp" "libsrtp" "openh264" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" + "pffft" "usrsctp" "libyuv" ;; 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)))) - #t))))) + (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)) - #t))))) + "-DCMAKE_CXX_FLAGS=-fPIC"))) (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") From patchwork Sun Sep 11 10:11:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42467 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 C031027BBEA; Sun, 11 Sep 2022 11:13: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 7E04027BBE9 for ; Sun, 11 Sep 2022 11:13:50 +0100 (BST) Received: from localhost ([::1]:53638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJyH-0006EQ-CR for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:13:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJxV-0006Dz-S8 for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52090) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJxV-0007hm-K5 for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJxV-0007TL-FW for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 2/7] gnu: telegram-desktop: Simplify inputs. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10:13: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.166289112228591 (code B ref 57675); Sun, 11 Sep 2022 10:13:01 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:12:02 +0000 Received: from localhost ([127.0.0.1]:40775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwX-0007Qq-Cw for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwV-0007QX-OC for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:00 -0400 Date: Sun, 11 Sep 2022 18:11:38 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891113; 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=xDyTwnZs+WnaJG3ueoM4MLg6vSIKEzN6m1PKft1E5cg=; b=JNxmTFrUxnPF5jHskdA5WWKAsF2m8i38xdza6bfPIeK/pFod+dYMNeCWs0vYLith3sTJQq FJXCNJ8jviYmO6cJwTiAuV+jXYHH1RQGPk40RZ1hHclFsQEgEt/ENIKbddXrPSjO48gdt2 6v+Y2/VpS7PNcHuz05qVRG9Z98Xwdwsz8I5figbI7MD+h60T7jbHCHroOjzgDFy2O+rkiP hr0ABnFTPABd19oJLde9LLITMGnVwX/SS6+15GTu5NpWRdUEEtjbpA7zEvuIKPmuNMpqxF Y2yh+4Wq1BWXLdIxxhY40euTamcUWXMjqa+f+rPrVATIdLwAV8v7o042Num/TQ== 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): Simplify inputs. --- gnu/packages/telegram.scm | 315 +++++++------------------------------- 1 file changed, 53 insertions(+), 262 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9bef94788b..6e7fa4a2ec 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -238,12 +238,12 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -256,8 +256,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 @@ -286,272 +285,64 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (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")))) - #t)) + (for-each make-file-writable (find-files ".")))) (add-before 'configure 'patch-cxx-flags (lambda _ (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch-framework2) - ("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))) + (list alsa-lib + c++-gsl + catch-framework2 + 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") From patchwork Sun Sep 11 10:11:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42466 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 C640827BBEC; Sun, 11 Sep 2022 11:13:50 +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 825C627BBEA for ; Sun, 11 Sep 2022 11:13:50 +0100 (BST) Received: from localhost ([::1]:53640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJyH-0006Er-D3 for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:13:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJxW-0006E8-Hp for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJxW-0007hs-6V for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJxV-0007TT-Va for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10:13: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.166289114028635 (code B ref 57675); Sun, 11 Sep 2022 10:13:01 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:12:20 +0000 Received: from localhost ([127.0.0.1]:40780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwq-0007Rm-Im for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:20 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:42590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJwo-0007RY-Py for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:19 -0400 Date: Sun, 11 Sep 2022 18:11:57 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891133; 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=dqbukadHo45AcV1tI7AjRwHBcC44oonpcmdRUfzC9ms=; b=tbiUrIPJjnmXmcGF1aA7W0uJLD/K7ny47DpG1t/HidUIGKUs6xPub8DG6O0ijnN/RyuUjY E2QPFlYhqzZT3vE8Kg4Umg4XgIyt7GV9XJzglYUd4NmJsuHRJlJaZ418t+AYN70TxnbNia k0ko3NJkm49QkhS1e1XZeYeQ/yb0TkaU1BchiWqajmQ4lQyGyPdXZN9aSx3sPQmL2rHaC+ rwa1J9bE4kVsELCU4rRtTSmqGCb+b35ugz+kIVqKTgrmV2VScJP1iLDFKdmjRQ/uasPxB7 HucqC/P/bUl31cCMvsxO/hy0sCdhvpqtPRwzh7HaQa9t+5GU3WiBnzkKDC7kfw== 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 (abseil-cpp-cxxstd17): New variable. --- gnu/packages/telegram.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6e7fa4a2ec..3b0444025c 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 utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,18 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + ;; Abseil built with pre C++17 standards enforcing would cause a linking + ;; issue when building Telegram Destop. (Currently it's by default 11, and + ;; has changed to 14 upstream.) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) From patchwork Sun Sep 11 10:12:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42468 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 9441C27BBEA; Sun, 11 Sep 2022 11:14:01 +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 769D427BBE9 for ; Sun, 11 Sep 2022 11:14:00 +0100 (BST) Received: from localhost ([::1]:52886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJyR-0006cb-LZ for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:13:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJxW-0006EG-Ss for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJxW-0007hx-KE for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJxW-0007Ta-FR for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 4/7] gnu: webrtc-for-telegram-desktop: Update to a5fbc9. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10: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.166289116028679 (code B ref 57675); Sun, 11 Sep 2022 10:13:02 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:12:40 +0000 Received: from localhost ([127.0.0.1]:40786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJx9-0007SU-4M for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:40 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJx6-0007SH-Ql for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:37 -0400 Date: Sun, 11 Sep 2022 18:12:15 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891151; 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=fvTNFxU5DBh4FoktqWmF7yuTEnp8/KQxk91xEhQsI58=; b=gh9OovzURDjlH8yp0WVG8q0xUQkdaC7IOrBGyl/MrM/MUFxsD5jqUm+orFvu4wVevhQ5Qx ElRvBvbIqliKzNfIKkdH5XXsmnAG+F0d8Mkpqr7U6vuYk8swpJ4DnK7vaXY9UncFf5syaJ p3poh0q3tZ9nlTpiPvo92AaaIWePdHAbEEAm4gERUFLDafAa9HHNAz/pi/2Y1dyW58DeZQ Vy2gsrdrG8Un6s2Zlj8XW3d3ywTr6WkmphZ/klg2z64KwFlvc2c9MdOEN3QhE/+uMjNh37 FwYCJ/Az4nT21SFuplfJgmYEQ+hMSTOHXbnHgF2M/WCubh9EKozF4Rg/0fN+MQ== 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-allow-disabling-X11.patch: New file. * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a5fbc9123 e056e611e69acf0ceb4252ddd838adb. [patches]: Add webrtc-for-telegram-desktop-allow-disabling-X11.patch. Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Sync with source tree. Unbundle openh264 and libvpx. [arguments]: Comment out to default values. [native-inputs]: Drop perl. [inputs]: Drop alsa-lib, pulseaudio, libx11. Add abseil-cpp-cxxstd17, libvpx, openh264, libdrm, libglvnd, mesa. Replace pipewire with pipewire-0.3. [license]: Sync with source tree. * gnu/local.mk: Add patches --- gnu/local.mk | 2 + ...telegram-desktop-allow-disabling-X11.patch | 138 ++++++++++++++++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++ gnu/packages/telegram.scm | 68 +++++---- 4 files changed, 202 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch 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 19102113c9..683f6bfe0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1966,6 +1966,8 @@ 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/webrtc-for-telegram-desktop-allow-disabling-X11.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-allow-disabling-X11.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch new file mode 100644 index 0000000000..801b64a554 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch @@ -0,0 +1,138 @@ +From 6c28002ae4326db71980a3bfdf214d5df53d5b62 Mon Sep 17 00:00:00 2001 +From: Hilton Chain +Date: Fri, 9 Sep 2022 22:28:23 +0800 +Subject: [PATCH] Allow disabling X11 desktop capturing independently. + +Squashed commit of the following: + +commit 253b09a07520a3cecb3b88b2b7e8889ab3d9158d +Author: Hilton Chain +Date: Fri Sep 9 22:13:15 2022 +0800 + + Adapt the patch with cmake_dependent_option. + +commit f6631bb43f353c9eafe1b1aba093e116518aa12a +Author: Esteve Varela Colominas +Date: Sun, 27 Jun 2021 23:57:04 +0200 + + Add -DTG_OWT_USE_X11 + + Allows disabling X11 desktop capturing independently of pipewire support, for + the few people that run wayland without any X11 support whatsoever. + + This setup is untested, but supported by the GNI build system, see: + * src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions) + + Toggling the WEBRTC_USE_X11 define also affects some files under + src/modules/audio_device, but that falls under "X11 support", regardless... + + Use cmake_dependent_option to better declare variables that relate on other variables +--- + CMakeLists.txt | 42 ++++++++++++++++++++++++++++++++++---- + cmake/libwebrtcbuild.cmake | 12 ++++++----- + 2 files changed, 45 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e081ae7..2b09682a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,6 +24,7 @@ endif() + + option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF) + option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS}) ++cmake_dependent_option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON "UNIX; NOT APPLE" OFF) + cmake_dependent_option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture." ON "UNIX; NOT APPLE" OFF) + cmake_dependent_option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire for desktop capture." ${not_packaged_build} TG_OWT_USE_PIPEWIRE OFF) + option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF) +@@ -96,6 +97,10 @@ endif() + add_library(tg_owt) + init_target(tg_owt) + ++if (TG_OWT_USE_X11) ++ link_x11(tg_owt) ++endif() ++ + if (TG_OWT_USE_PIPEWIRE) + if (TG_OWT_DLOPEN_PIPEWIRE) + include(cmake/generate_stubs.cmake) +@@ -188,10 +193,6 @@ endif() + include(cmake/libwebrtcbuild.cmake) + target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild) + +-if (UNIX AND NOT APPLE) +- link_x11(tg_owt) +-endif() +- + function(add_sublibrary postfix) + add_library(tg_owt_${postfix} OBJECT) + init_feature_target(tg_owt_${postfix} ${postfix}) +@@ -2369,6 +2370,39 @@ if (NOT TG_OWT_USE_PROTOBUF) + ) + endif() + ++if (NOT TG_OWT_USE_X11) ++ remove_target_sources(tg_owt ${webrtc_loc} ++ # src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions) ++ modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc ++ modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.h ++ modules/desktop_capture/linux/x11/screen_capturer_x11.cc ++ modules/desktop_capture/linux/x11/screen_capturer_x11.h ++ modules/desktop_capture/linux/x11/shared_x_display.cc ++ modules/desktop_capture/linux/x11/shared_x_display.h ++ modules/desktop_capture/linux/x11/window_capturer_x11.cc ++ modules/desktop_capture/linux/x11/window_capturer_x11.h ++ modules/desktop_capture/linux/x11/window_finder_x11.cc ++ modules/desktop_capture/linux/x11/window_finder_x11.h ++ modules/desktop_capture/linux/x11/window_list_utils.cc ++ modules/desktop_capture/linux/x11/window_list_utils.h ++ modules/desktop_capture/linux/x11/x_atom_cache.cc ++ modules/desktop_capture/linux/x11/x_atom_cache.h ++ modules/desktop_capture/linux/x11/x_error_trap.cc ++ modules/desktop_capture/linux/x11/x_error_trap.h ++ modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc ++ modules/desktop_capture/linux/x11/x_server_pixel_buffer.h ++ modules/desktop_capture/linux/x11/x_window_property.cc ++ modules/desktop_capture/linux/x11/x_window_property.h ++ ++ # screen_drawer_linux.cc depends on x11, rest are revdeps ++ modules/desktop_capture/screen_drawer.cc ++ modules/desktop_capture/screen_drawer.h ++ modules/desktop_capture/screen_drawer_linux.cc ++ modules/desktop_capture/screen_drawer_lock_posix.cc ++ modules/desktop_capture/screen_drawer_lock_posix.h ++ ) ++endif() ++ + if (NOT TG_OWT_USE_PIPEWIRE) + remove_target_sources(tg_owt ${webrtc_loc} + modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc +diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake +index 4d037f4b..388b7aa9 100644 +--- a/cmake/libwebrtcbuild.cmake ++++ b/cmake/libwebrtcbuild.cmake +@@ -29,6 +29,13 @@ INTERFACE + BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0 + ) + ++if (TG_OWT_USE_X11) ++ target_compile_definitions(libwebrtcbuild ++ INTERFACE ++ WEBRTC_USE_X11 ++ ) ++endif() ++ + if (TG_OWT_USE_PIPEWIRE) + target_compile_definitions(libwebrtcbuild + INTERFACE +@@ -65,11 +72,6 @@ else() + INTERFACE + WEBRTC_MAC + ) +- else() +- target_compile_definitions(libwebrtcbuild +- INTERFACE +- WEBRTC_USE_X11 +- ) + endif() + + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") 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 3b0444025c..cdd3816082 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,10 +60,12 @@ (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:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -85,8 +89,8 @@ (define-public abseil-cpp-cxxstd17 `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "a5fbc9123e056e611e69acf0ceb4252ddd838adb") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -103,49 +107,61 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2")) + (base32 "1hzck63spjjkqzkj0mlrxygrix4lw0n3i5cmc0vkxaphfzawz74n")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch" + ;; https://github.com/desktop-app/tg_owt/pull/107 + "webrtc-for-telegram-desktop-allow-disabling-X11.patch")) (snippet `(begin (let ((keep '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + "abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" "libyuv" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "libyuv" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Force using standalone openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No target - #:configure-flags - (list - "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC"))) - (native-inputs - (list perl pkg-config python-wrapper yasm)) + (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") + )) + (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 @@ -157,13 +173,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 Sun Sep 11 10:12:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42469 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 BABA227BBEA; Sun, 11 Sep 2022 11:14:09 +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 CD74727BBE9 for ; Sun, 11 Sep 2022 11:14:08 +0100 (BST) Received: from localhost ([::1]:43130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJyZ-0006m7-U6 for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJxX-0006EO-Cd for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJxW-0007i3-U3 for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJxW-0007Th-QB for guix-patches@gnu.org; Sun, 11 Sep 2022 06:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10: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.166289118028717 (code B ref 57675); Sun, 11 Sep 2022 10:13:02 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:13:00 +0000 Received: from localhost ([127.0.0.1]:40789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJxU-0007T6-55 for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:13:00 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJxR-0007Sq-Qp for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:12:58 -0400 Date: Sun, 11 Sep 2022 18:12:36 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W5aciK/CIF757LyKbnuruH/kJdEVYbjJX4hn9fFR3LA=; b=tx7mbrY7bMn6/pmcGr8Nqn3dXFqhfb+4qXIMbIcX6Wx9iPztG4Jvj40wDeLn7fRRHqnHec 90oX0sNSST/6jvn4mTdTSROCJ2++kOISLjIaI8KzELk3iiM3PU07A71Csjc7N5BBt4w5QP 8hnpqtzEKVJem9JZdtrP9XYyoPPUmKnyJa1yl6Ip/KgF42pCuin1iXcUPc5MsualwHN2GU HnJKzD6jCU0mjOcI6qeEOC5wI6PBae9UTKrcnXNMT+TrOIWrbviey5gvAgFM6RHVaGOIzq +5WPLg9tTx+9t67A2D9xhJLzry+2sKgv7w7BDiSLlIM7ZPOkFdyvvJEa8BAjqQ== 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/telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/packages/telegram.scm (telegram-desktop): Update to 4.1.1. [patches]: Add telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Sync with source tree. Add libtgvoip, rlottie and dispatch. [arguments]: Use App ID from Telegram's official Snap builds. Comment out to default configurations. Drop unneeded phases. [native-inputs]: Drop cmake-shared, extra-cmake-modules, glib:bin, gtk+:bin and qttools-5. [inputs]: Drop libexpected, fcitx-qt5, fcitx5-qt, glib, hime, gtk+, kwayland, libx11, catch-framework2, materialdecoration, nimf, qt5ct, libdbusmenu-qt, qtbase-5, libtgvoip-for-telegram-desktop and rlottie-for-telegram-desktop. Add abseil-cpp-cxxstd17, qt5compat, qtbase, qtwayland, wayland, webkitgtk and libvpx. [propageted-inputs]: Drop dconf. [license]: Sync with source tree. * gnu/local.mk: Add patch. --- gnu/local.mk | 1 + .../telegram-desktop-fix-gcc12-cstdint.patch | 10 + gnu/packages/telegram.scm | 175 ++++++++++-------- 3 files changed, 105 insertions(+), 81 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch -- 2.37.3 diff --git a/gnu/local.mk b/gnu/local.mk index 683f6bfe0d..1247a09a8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1868,6 +1868,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..a3d67e0c9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,10 @@ +--- a/Telegram/ThirdParty/tgcalls/tgcalls/utils/gzip.h ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/utils/gzip.h +@@ -2,6 +2,7 @@ + #define TGCALLS_UTILS_GZIP_H + + #include ++#include + #include + + namespace tgcalls { diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index cdd3816082..b943b3c4a2 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan -;;; +;;; Copyright © 2022 Hilton Chain ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -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) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -258,7 +260,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.1.1") (source (origin (method git-fetch) @@ -269,16 +271,25 @@ (define-public telegram-desktop (recursive? #t))) (file-name (git-file-name name version)) + (patches + (search-patches + ;; Cherry-picked from upstream, remove when bumping. + "telegram-desktop-fix-gcc12-cstdint.patch")) (sha256 - (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) + (base32 "0b8nwimks6hfnb3bqik8d4s9z689hhj4p9ykqgc36pmpr54nyma8")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet `(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Own fork, legacy library only used for backward + ;; compatibility. + "libtgvoip" + ;; Own fork with custom API. + "rlottie" + ;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -286,102 +297,104 @@ (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 - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also . - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-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") - `(,gtk+ "bin") - pkg-config - python-wrapper - qttools-5)) + (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" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name) + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + ;; 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_USE_PACKAGED_RLOTTIE=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" + ) + #:phases + #~(modify-phases %standard-phases + (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 pkg-config python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch-framework2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + 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+ - ;; Others - license:gpl3+)))) + (license (list + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/rlottie/src/vector/pixman + ;; Telegram/ThirdParty/rlottie/src/vector/stb + ;; Telegram/ThirdParty/rlottie/src/vector/rapidjson + license:expat + ;; Telegram/ThirdParty/rlottie/src/vector/freetype + license:freetype + ;; Telegram/ThirdParty/rlottie + ;; Telegram/ThirdParty/rlottie/src/vector + license:lgpl2.1+ + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 + ;; Others + license:gpl3+)))) (define-public tl-parser (let ((commit "1933e76f8f4fb74311be723b432e4c56e3a5ec06") From patchwork Sun Sep 11 10:12:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42471 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 61F8427BBEA; Sun, 11 Sep 2022 11:14:19 +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 1E9AA27BBE9 for ; Sun, 11 Sep 2022 11:14:19 +0100 (BST) Received: from localhost ([::1]:59852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJyk-00074Z-9w for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJyU-0006nT-9B for guix-patches@gnu.org; Sun, 11 Sep 2022 06:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJyU-0007mV-0T for guix-patches@gnu.org; Sun, 11 Sep 2022 06:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJyT-0007Vv-Sc for guix-patches@gnu.org; Sun, 11 Sep 2022 06:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 6/7] gnu: Remove rlottie-for-telegram-desktop. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10:14: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.166289119928812 (code B ref 57675); Sun, 11 Sep 2022 10:14:01 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:13:19 +0000 Received: from localhost ([127.0.0.1]:40798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJxm-0007Ue-Tm for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:13:19 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:49110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJxl-0007UR-M3 for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:13:18 -0400 Date: Sun, 11 Sep 2022 18:12:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891191; 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=2ojA2Cux3ItRQywZp72cb2YvnpErmrQGUnxgatG08yM=; b=rMHNe9KXFuIWoquqtrZlvALTYWag9r/hTJ1feKXy1N0hJXMgC2dkvmwXX8NgR9VdS5LLwK vW33Jt9q74piBmXhB5KjuI3UcJkC2UFacEfjIciKzNsySHevVl9tBMhy7D+e+f7m9nsQPt agfpKfOJER5aaI3psgF8c0MMeBKRW14AEF3RJIo7cVhoyRukAykKOeVkbjpi1TxkFiiPpH Q/7c7O7uXe6UoTQ0PwKFU9Za+EIMh9ByjI2TCUQADt20/gPmqUcZ7w0I8j603ZiTPb2H8t 7wMX8Tk0nRIniEweS1nJFYyyP1KeSeJbJloKI4xhIkbBIJJJTsre52cNwND9Vg== 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 (rlottie-for-telegram-desktop): Delete variable. --- gnu/packages/telegram.scm | 34 ---------------------------------- 1 file changed, 34 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index b943b3c4a2..16937de86b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -182,40 +182,6 @@ (define-public webrtc-for-telegram-desktop ;; LibSRTP, Crc32c and Others license:bsd-3)))))) -(define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) - (hidden-package - (package - (inherit rlottie) - (version - (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/rlottie.git") - (commit commit))) - (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")) From patchwork Sun Sep 11 10: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: 42470 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 32B1E27BBEA; Sun, 11 Sep 2022 11:14:14 +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 DDA2E27BBE9 for ; Sun, 11 Sep 2022 11:14:13 +0100 (BST) Received: from localhost ([::1]:43132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXJyf-0006qt-2X for patchwork@mira.cbaines.net; Sun, 11 Sep 2022 06:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXJyU-0006o7-N2 for guix-patches@gnu.org; Sun, 11 Sep 2022 06:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXJyU-0007mc-DV for guix-patches@gnu.org; Sun, 11 Sep 2022 06:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXJyU-0007W3-8r for guix-patches@gnu.org; Sun, 11 Sep 2022 06:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v3 7/7] gnu: Remove libtgvoip-for-telegram-desktop. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Sep 2022 10: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.166289122228851 (code B ref 57675); Sun, 11 Sep 2022 10:14:02 +0000 Received: (at 57675) by debbugs.gnu.org; 11 Sep 2022 10:13:42 +0000 Received: from localhost ([127.0.0.1]:40801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJyA-0007VH-Ax for submit@debbugs.gnu.org; Sun, 11 Sep 2022 06:13:42 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXJy8-0007V4-Oj for 57675@debbugs.gnu.org; Sun, 11 Sep 2022 06:13:41 -0400 Date: Sun, 11 Sep 2022 18:13:19 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662891214; 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=0l7BKP6SuPGCtdQn4bbGSAq2vds1atfCIUKZwWrab0Y=; b=yS8zhJaeYtEXQyJcw/bxUIFjoR4iC4+RFzGsBQTkj9MpIf2u40BHniY1SA61/8+c6Ntwl4 8hgysM5i+0Z1U/Wdr6LwU/dEMSfl57TXYcrwND1zLq6FtRo9HJkXOcnHAEiZ23sZVmYsfE oaiujDJHJfhjm0zqA9E4wBG0YZwFSyiSNRcmIXFya9DfysV8shJCRG7OPOcDdliPMwdz82 Y0IYjPab49jY3xPp5gRhBEWhxY05Lk1uEVP3XiU25rv54LyWp9AtWQTp+5n9VjU5KUtJ8e T7rJZzm8jP5RAKpDw7fj0jQHzx48TuSW4fSgaA1UhzMLvQz8OB1yXJXwr91ZBA== 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 (libtgvoip-for-telegram-desktop): Delete variable. --- gnu/packages/telegram.scm | 41 --------------------------------------- 1 file changed, 41 deletions(-) -- 2.37.3 diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 16937de86b..94c0492294 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -182,47 +182,6 @@ (define-public webrtc-for-telegram-desktop ;; LibSRTP, Crc32c and Others license:bsd-3)))))) -(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)))))) - (define-public telegram-desktop (package (name "telegram-desktop")