From patchwork Wed Sep 21 08:24:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42802 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 1BF9027BBEA; Wed, 21 Sep 2022 09:33:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D16F927BBE9 for ; Wed, 21 Sep 2022 09:33:53 +0100 (BST) Received: from localhost ([::1]:41050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oavB2-0006G4-Ln for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 04:33:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oav3S-0002MJ-5y for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oav3R-0006F8-TA for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oav3R-0005Ef-Nk for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v8 1/7] gnu: Add abseil-cpp-cxxstd17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Sep 2022 08:26: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.166374870720009 (code B ref 57675); Wed, 21 Sep 2022 08:26:01 +0000 Received: (at 57675) by debbugs.gnu.org; 21 Sep 2022 08:25:07 +0000 Received: from localhost ([127.0.0.1]:60570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oav2Z-0005Cf-IJ for submit@debbugs.gnu.org; Wed, 21 Sep 2022 04:25:07 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oav2X-0005Bo-So for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 04:25:06 -0400 Date: Wed, 21 Sep 2022 16:24:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663748700; 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=f2Z9jxajWZ60dRF/55UVKRx9MMZm42glC0EhyOgiMQ3vT0l3iHjEqMWcVhQFC6CaLXuRfT /Cv4jN8IV+p4pp6z5o9Es7H1L1a4qjngZ9Z2wvGfRN20t2BRGgusbcuKEW5a+cdeg0uEcS nrRXnWQqaTegwhSaenx7ncWtfWfse5bhmdMI90Y9ozcelzJ80YVteC+lSnK1/BgVzZfQLi XZKFnJllwM4xDLLUAaRYET8zOTiQIzuJbeBc4E7tV+eoOJ6EhHomgsqbR6hS2coTOflyrZ mv2Ah1n5Tuj1aWjhnJCinlGxnILx327bLZ9ZA5Xh3ENRnL/8TyTLUYUf8BHcyA== 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(+) 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 Wed Sep 21 08:24: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: 42804 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 929A827BBEA; Wed, 21 Sep 2022 09:36:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B009427BBE9 for ; Wed, 21 Sep 2022 09:36:40 +0100 (BST) Received: from localhost ([::1]:60136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oavDj-0007y2-J3 for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 04:36:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oav3S-0002MK-N9 for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oav3S-0006FF-Eg for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oav3S-0005En-8I for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v8 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Sep 2022 08:26: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.166374872020044 (code B ref 57675); Wed, 21 Sep 2022 08:26:02 +0000 Received: (at 57675) by debbugs.gnu.org; 21 Sep 2022 08:25:20 +0000 Received: from localhost ([127.0.0.1]:60573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oav2l-0005DE-QO for submit@debbugs.gnu.org; Wed, 21 Sep 2022 04:25:20 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:41812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oav2k-0005Cy-Hb for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 04:25:19 -0400 Date: Wed, 21 Sep 2022 16:24:58 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663748712; 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=zpfDxRF0csxXtOczbrnl5FvGN/pKW/LRv7tFQLqzlJI=; b=PlHdYDA/J0tu6dp8/tcZg4ygI89gf7otqePH8MPIRHMjvrGjccu5vTLRx2l40ZJB6fNplo E+ntaSq0Iphd/ruvgaWXSaBEsDDSGTZEzD3GBa94tuUNjU0iQ9hmW7tlcwC5VqbmJ1Nyol sF5pjDdV7x44BnZSLSzrd3EHK47RpRwKa7dGVsJnkumZvdsTIV2yzqmQaCOTXXKRVgfL0R L1h9hExoubp/MwEmiK+3f61pf6YCtwvvSWceOyjYESuUagNtfVuOD1kDPOUMwsPsLmjjfz diudHmytaWEGcIYZmR6KUpmCE0Gms6wCkr28z7nuxvJiasOzu94FMA99oknfWA== 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 (crc32c-for-telegram-desktop): New variable. (libvpx-for-telegram-desktop): Remove variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments]<#:phases>: Adjusted according to unbundled packages. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 85 ++++++++++--------- 3 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza +Date: Sun, 15 May 2022 12:47:41 +0200 +Subject: [PATCH] fix(h265_pps_parser): fix missing cstdint include + +--- + src/common_video/h265/h265_pps_parser.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h +index 28c95ea9..c180b1b9 100644 +--- a/src/common_video/h265/h265_pps_parser.h ++++ b/src/common_video/h265/h265_pps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H265_PPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..79086d845c 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:) @@ -74,35 +77,35 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") - (revision "2211")) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name - "libyuv-for-telegram-desktop" + "crc32c-for-telegram-desktop" (git-version "0" revision commit))) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (origin @@ -297,8 +300,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,58 +317,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (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 @@ -377,13 +384,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 Wed Sep 21 08:25:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42803 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 79E8327BBEA; Wed, 21 Sep 2022 09:35: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 ACF8327BBE9 for ; Wed, 21 Sep 2022 09:35:30 +0100 (BST) Received: from localhost ([::1]:44928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oavCb-0007OL-O6 for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 04:35:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oav3T-0002Me-4J for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oav3S-0006FN-S8 for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oav3S-0005Eu-Mi for guix-patches@gnu.org; Wed, 21 Sep 2022 04:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v8 3/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: Wed, 21 Sep 2022 08:26: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.166374873720081 (code B ref 57675); Wed, 21 Sep 2022 08:26:02 +0000 Received: (at 57675) by debbugs.gnu.org; 21 Sep 2022 08:25:37 +0000 Received: from localhost ([127.0.0.1]:60576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oav31-0005Dm-IN for submit@debbugs.gnu.org; Wed, 21 Sep 2022 04:25:37 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:41760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oav2x-0005DU-Ri for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 04:25:33 -0400 Date: Wed, 21 Sep 2022 16:25:11 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663748725; 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=QryInE7dxbH2GJxeglEo8VSdB1mOClRzfT8OopCpSlg=; b=s2K2mSllkFhc1UJsVpNDv3St9o1J1ACyy9HTbRHA+ir0rfnW+reNDzp2ZMPAWSCveI3zBS xk+QP83UsTCRSBpLy2W77equYXC/4MhMrklHheVrEKJjmT4JSjDnRs0QdI7jfizv/dg+mj yrSv/47Nir9dHe3fLKoLpHf22EPrAVqYQX9p/fVWcVuN/POhQ+BPaEfaOENNFnP0fKm7hB mMYfYm1ILr1xbNyM1EhGCnxMTaEWIN5WKtQaW9ZBbRMn/p8RB6/jYsZKCA9sstdNQRnuMO IhV3u19in3aG46rrZcGgeS1LS40p0w7q0YanXF7hosb5JA/E9tJcoigQZu+6Gw== 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-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop) (libtgvoip-for-telegram-desktop,%telegram-desktop): Remove variables. (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-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-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.1.1. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++ gnu/packages/telegram.scm | 520 +++++++++--------- 3 files changed, 376 insertions(+), 270 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,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-allow-disable-libtgvoip.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-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); + const auto RegisterV2 = tgcalls::Register(); + const auto RegV2Ref = tgcalls::Register(); + const auto RegisterV240 = tgcalls::Register(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register(); ++#endif + + [[nodiscard]] base::flat_set CollectEndpointIds( + const QVector &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 79086d845c..d75c057251 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2022 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -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,6 +62,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) @@ -75,8 +78,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) @@ -107,197 +108,230 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + (let ((commit "0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69") + (revision "430")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit commit))) + (file-name (git-file-name + "cmake-helpers-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa281zk1"))))) (define codegen-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + (let ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") + (revision "54")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit commit))) + (file-name (git-file-name + "codegen-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + (let ((commit "37fab6b4da32c91bc5d049baad2e9ad51cfcd195") + (revision "380")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit commit))) + (file-name (git-file-name + "lib-base-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq6l10k5"))))) (define lib-crl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") + (revision "21")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit commit))) + (file-name (git-file-name + "lib-crl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + (let ((commit "f3563bc6b0e042095d4d667d013f62cb8ae62b65") + (revision "57")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit commit))) + (file-name (git-file-name + "lib-lottie-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard76cgvsg"))))) (define lib-qr-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + (let ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") + (revision "10")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit commit))) + (file-name (git-file-name + "lib-qr-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) (define lib-rpl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + (let ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") + (revision "19")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit commit))) + (file-name (git-file-name + "lib-rpl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + (let ((commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060") + (revision "197")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit commit))) + (file-name (git-file-name + "lib-spellcheck-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vhyjhbwh"))))) (define lib-storage-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + (let ((commit "839609369d04615475cb1518636de3619106a917") + (revision "22")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit commit))) + (file-name (git-file-name + "lib-storage-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + (let ((commit "0d234b5aabf43d598e0cb0867566ee570d9e2755") + (revision "39")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit commit))) + (file-name (git-file-name + "lib-tl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7sxcd96"))))) (define lib-ui-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + (let ((commit "2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a") + (revision "883")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit commit))) + (file-name (git-file-name + "lib-ui-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05hbybfcn"))))) (define lib-webrtc-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + (let ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") + (revision "83")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit commit))) + (file-name (git-file-name + "lib-webrtc-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq"))))) (define lib-webview-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + (let ((commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35") + (revision "76")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit commit))) + (file-name (git-file-name + "lib-webview-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l"))))) (define tgcalls-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (let ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "921")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name + "tgcalls-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -392,8 +426,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 "678")) (hidden-package (package (inherit rlottie) @@ -409,67 +443,17 @@ (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 %telegram-version) + (version "4.1.1") (source (origin (method git-fetch) @@ -481,15 +465,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "0zhwaql1fk0nqr1x2lchcswz61x7sb2297qdxiysgqamr0fk9ppn")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -515,16 +503,17 @@ (define-public telegram-desktop ;; also stored in <#$source/snap/snapcraft.yaml>. "-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") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + (string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -537,81 +526,72 @@ (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/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 + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+))))