From unknown Sat Aug 16 13:42:06 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#57655 <57655@debbugs.gnu.org> To: bug#57655 <57655@debbugs.gnu.org> Subject: Status: [PATCH 0/5] gnu: telegram-desktop: Update to 4.1.1. Reply-To: bug#57655 <57655@debbugs.gnu.org> Date: Sat, 16 Aug 2025 20:42:06 +0000 retitle 57655 [PATCH 0/5] gnu: telegram-desktop: Update to 4.1.1. reassign 57655 guix-patches submitter 57655 Hilton Chain severity 57655 normal tag 57655 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 20:55:05 2022 Received: (at submit) by debbugs.gnu.org; 8 Sep 2022 00:55:05 +0000 Received: from localhost ([127.0.0.1]:56690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5ou-00079B-M6 for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:55:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:60668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5os-000791-WE for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:55:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oW5os-0005zG-QX for guix-patches@gnu.org; Wed, 07 Sep 2022 20:55:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oW5or-0003mt-A0 for guix-patches@gnu.org; Wed, 07 Sep 2022 20:55:02 -0400 Date: Thu, 08 Sep 2022 08:54:37 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662598497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=GsbK9GOPwfdL6ThCN9bepbP9nBhY5871VNR9FSar9qg=; b=ZksyqITDjNFKCxd7RI5c5z5BgkcU5Np6vD9wCX6D2YEFQgk3upoQeETJB7japcSspdMKS3 odVANG0vewRXQhxmWBsLpjkCxYJzwK9nfi2rZIU8l31KL97Yuu4yv55YZR7h5Fs2KwC3W2 jcVGct9UmHWFNbJEO/XKsVtpq97CE7zQqDQl5me9AEK3oeUpAHAxkJWw91aVL867RIm7Qg JA6n6Wmr9wvKeO9nBivlaohMW3Me9H61HYw1LHqOTi1v4OmMf+wDGCoYO5Npk2pbWennh6 47ZkE0gggq1ggQ/o3fP9iAmNKsITJk+dsbyNWxokIG9rbiqxuVvDC+u2rLll+Q== Message-ID: From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH 0/5] gnu: telegram-desktop: Update to 4.1.1. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello Guix, This patchset updates telegram-desktop to version 4.1.1, too many changes for me to write them all down (>.<), so just reply me when confused! Hilton Chain (5): gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop. gnu: webrtc-for-telegram-desktop: Update to a5fbc9. gnu: Remove rlottie-for-telegram-desktop. gnu: Remove libtgvoip-for-telegram-desktop. gnu: telegram-desktop: Update to 4.1.1. gnu/local.mk | 3 + ...se-for-telegram-desktop-support-musl.patch | 35 + ...telegram-desktop-add-missing-cstdint.patch | 21 + ...telegram-desktop-allow-disabling-X11.patch | 123 +++ gnu/packages/telegram.scm | 993 +++++++++--------- 5 files changed, 700 insertions(+), 475 deletions(-) create mode 100644 gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-add-missing-cstdint.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch base-commit: b45a44eaad890f31d9418dbb8cb14e3ee1d83c19 -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 20:57:19 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 00:57:19 +0000 Received: from localhost ([127.0.0.1]:56700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5r4-0007Cz-LF for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:57:18 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:35184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5r2-0007Ck-UW for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 20:57:17 -0400 Date: Thu, 08 Sep 2022 08:56:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662598630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: references:references; bh=Z8Oh4YVjQXGSjlIPsVDpefglPN7Hjj026bQXOHi8XAU=; b=Rzmdt6++DfqdGc/13yLKPz3pDYq+3CVLt1DH2Fe1wal1bUS+uIM9QStK3ubFB2pyo7BHqJ 8Szcn+vZWpb8DvncN7rst9txnWQ/YYwcR8g+8I1wyz7ylF+obTzKcMQA6MEzyCjO7PlwX8 K9qifLc4fZWFrdyyPQXEFAVz3XBpIAFWqRe5EFSs0RE8rJYpV0NgwkdNwS0i5W7RY1ZwuO gOivTgWTBqo2bXwPa2iAgqVpcHjFAFI5pTAslbLXxL/bIrGXkfKfIA7ScR+xshTr8z/IY+ 86Aw/68WII5vkC85p4sfEndKROCIi6LS3NceP4drMeO3ILl7ZWSBLsdc77MhDA== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: [PATCH 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop. References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (abseil-cpp-for-webrtc-for-telegram-desktop): New variable. --- gnu/packages/telegram.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4976acbc0c..25d6a3e226 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,17 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define-public abseil-cpp-for-webrtc-for-telegram-desktop + (let ((base abseil-cpp)) + ;; This package fixs a linking issue of Telegram Desktop. + ;; Remove once abseil-cpp had required C++17 as minimun. + (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")) -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 20:58:02 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 00:58:02 +0000 Received: from localhost ([127.0.0.1]:56703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5rl-0007Dx-1y for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:58:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5ri-0007Dg-MN for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 20:57:59 -0400 Date: Thu, 08 Sep 2022 08:57:39 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662598672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=jbDbWCtD7tIbqxN0y4mUgDJ3heGYOZ/p0j3stft5seY=; b=ki2cE+ifzqc4elWmpUM6JNhW+HRiFE2DrocStdjuO9mPkttn4J8aja8AKLISW6tGqb1Pwk hxChRzksk+FPpuejM9ttPVb8lXjlmjbKa+VAI6W0TQZu8hZ08WZzzM8kS4SgmFWImX1ZHk 8m4W+NDgDsLOXHSeaBxk44acRAcAccy9xoYir0chvY60x5YEw9BcLbIvlLTW/OGbmudHWs hzfRHjn4cvGejaF6sRhD4l44yQdSYcxfR8eXrdlD2dVt4+REAnwU8fjO51sZQMQs5pkegW bMOO8o1ZPwNqZdvhN8p5CLPxWjbvVvoRUQC2UavhSOfM2LMrcr2nhndMlHE5QQ== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: [PATCH 2/5] gnu: webrtc-for-telegram-desktop: Update to a5fbc9. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a5fbc9123e056e611e69acf0ceb4252ddd838adb. Use abseil-cpp-for-webrtc-for-telegram-desktop for abseil-cpp. [patches]: Add missing List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a5fbc9123e056e611e69acf0ceb4252ddd838adb. Use abseil-cpp-for-webrtc-for-telegram-desktop for abseil-cpp. [patches]: Add missing header. Add flag for disabling X11. [snippet]: Don't keep these files: openh264, usrsctp, libvpx. Remove use of bundled openh264. [#:configure-flags]: Comment out. [#:phases]: Drop bundled libvpx. Copy crc32c. Use cmake tool for compilation and installation (and use ninja). [inputs]: Simplify. Drop unneeded inputs. Add external-sources variable for managing recursive checkouts. Add crc32c. [native-inputs]: Add ninja. Drop perl. [propagated-inputs]: Move libraries also needed by telegram-desktop here from inputs. [license]: Update according to source tree updates. * gnu/packages/patches/webrtc-for-telegram-desktop-add-missing-cstdint.patch: New file. * gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch: New file. * gnu/local.mk: Add patches. --- gnu/local.mk | 2 + ...telegram-desktop-add-missing-cstdint.patch | 21 +++ ...telegram-desktop-allow-disabling-X11.patch | 123 +++++++++++++ gnu/packages/telegram.scm | 171 ++++++++++-------- 4 files changed, 242 insertions(+), 75 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-add-missing-cstdint.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch diff --git a/gnu/local.mk b/gnu/local.mk index 19102113c9..d0e5aeb125 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-add-missing-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-add-missing-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-add-missing-cstdint.patch new file mode 100644 index 0000000000..9dee9cf8e3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-add-missing-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/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..977f72475f --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch @@ -0,0 +1,123 @@ +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... + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e081ae7..c269177b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,13 +24,14 @@ 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) + + if (BUILD_SHARED_LIBS) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +- message(WARNING ++ message(DEBUG + "tg_owt is a fork of Google's webrtc library and is developed by them as a static library without stable ABI in mind." + "The feature of building tg_owt as a shared library is community maintained, it may and will break at any time without guarantee to work again." + "Please reconsider your decision. Good luck." +@@ -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/telegram.scm b/gnu/packages/telegram.scm index 25d6a3e226..d339bae017 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages linux) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) + #:use-module (gnu packages ninja) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) @@ -58,11 +60,13 @@ (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 utils) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -83,9 +87,12 @@ (define-public abseil-cpp-for-webrtc-for-telegram-desktop ((#:configure-flags flags) `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) +;; NOTE: Here's Telegram Desktop's official build guide. +;; https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((abseil-cpp abseil-cpp-for-webrtc-for-telegram-desktop) + (commit "a5fbc9123e056e611e69acf0ceb4252ddd838adb") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -96,94 +103,110 @@ (define-public webrtc-for-telegram-desktop (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/tg_owt.git") + (url "https://github.com/desktop-app/tg_owt") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "12qirihhabv46vn27dpw7dz0smlngb7wqjpypa9fm6k2zvf5py32")) (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-add-missing-cstdint.patch" + ;; Picked from Gentoo's repository. + ;; TODO: There's also a patch for using standalone crc32c, we can + ;; grab that patch once crc32c's been packaged. + "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" + '(;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (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") - #: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))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,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") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((libyuv-from (assoc-ref inputs "libyuv")) + (crc32c-from (assoc-ref inputs "crc32c")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv")) + (crc32c-to (string-append (getcwd) + "/src/third_party/crc32c/src"))) + (copy-recursively libyuv-from libyuv-to) + (copy-recursively crc32c-from crc32c-to)))) + (replace 'build + (lambda* (#:key (make-flags '()) (parallel-build? #t) + #:allow-other-keys) + (apply invoke "cmake" "--build" "." + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags)))) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "cmake" "--install" "." make-flags)))))) (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))) + (let ((external-sources + `(("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")))) + ("crc32c" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94"))) + (file-name + (git-file-name "crc32c-for-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))))) + (modify-inputs external-sources + (prepend openh264 ;Required + protobuf ;TG_OWT_USE_PROTOBUF + glib ;TG_OWT_USE_PIPEWIRE + libdrm + libglvnd + mesa + pipewire-0.3 + libxcomposite ;TG_OWT_USE_X11 + libxdamage + libxext + libxfixes + libxrandr + libxrender + libxtst)))) + (native-inputs (list ninja python-wrapper pkg-config yasm)) + (propagated-inputs + (list abseil-cpp ffmpeg libjpeg-turbo libvpx openssl opus)) (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.") @@ -194,13 +217,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 -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 20:58:26 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 00:58:26 +0000 Received: from localhost ([127.0.0.1]:56707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5sA-0007Ew-Hj for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:58:26 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5s8-0007Eh-Ez for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 20:58:24 -0400 Date: Thu, 08 Sep 2022 08:58:05 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662598698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+3vvIWBUJHTMlzkYoUBJUhN9J/DEsog999vMOts6kdo=; b=jdFu3P7+yK3dMEQTuncgGoo2cY/rU1U9L41zMiR7gcf5cJVNdIJx2KhzJ7LSXHthGgBAKB /N8qcET8h0Umh5yRvmyUJXTiMoiBR5DtHranYabPrWSRbyMCgFc9PxJ/+yzWt7VYXKa89z U5JW/aeC9kHXEXMbB5i/HuTquw9Gwe1uM9BoEYBR98Cro11Zds/l9Ptl1A8/PSRCHYcg3C tXu50MzewoAGcR2UBQQXa1m89t6u3YOLMGvTWjkYBrlzFG/aynCb3Pd9RnhVJm/yzbsSNn qVUSTiaIzkpMEfWSKztIcf3JjYIIotsbNiHtbF17UzdwtlKQH9GtCy6obAr2KQ== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: [PATCH 3/5] gnu: Remove rlottie-for-telegram-desktop. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (rlottie-for-telegram-desktop): Delete variable. --- gnu/packages/telegram.scm | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d339bae017..214e8ff90a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -224,40 +224,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")) -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 20:58:56 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 00:58:56 +0000 Received: from localhost ([127.0.0.1]:56710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5sd-0007Fi-Uk for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:58:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5sX-0007FM-Nj for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 20:58:55 -0400 Date: Thu, 08 Sep 2022 08:58:30 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662598724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=shGWZUMIDTUUGBTWilZ3eF2uxbCdoDxTuV/osLq9GUI=; b=nv21VMQH0DXyjALg658IQZ3aRNpxO2dzLkHxAazU8jlbM4z9Er5KzQ8vyUqRkO/vRyXUeg 72szjwn1ldgq1lDj/2FSCev6Ia+vk/z2GoVqHoT/BhKLdtEe+m6DEGneSn0A8s8Q7DG6a2 0BRudHgVRNOo0n4MDkDSi2uQ1ZeE29E8Xz8mFf2LE86d2BU2Ufv9XmQkGSduAJNvYJQ/wR a1OkaxIByPwP7vYYSc4GYtQ/Edb7I+/kUrGtoQscHD9iD5qXjGRuat/G257nReNyzsYtgd wQyuoy7RqyFt8XcRgK2/9PBK5g9pkcv5+jaGwGFfVeo/6FlH6eeGle3ydRyfxQ== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: [PATCH 4/5] gnu: Remove libtgvoip-for-telegram-desktop. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (libtgvoip-for-telegram-desktop): Delete variable. --- gnu/packages/telegram.scm | 41 --------------------------------------- 1 file changed, 41 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 214e8ff90a..bd8b5b31a7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -224,47 +224,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") -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 20:59:27 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 00:59:27 +0000 Received: from localhost ([127.0.0.1]:56716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5t7-0007Gz-GH for submit@debbugs.gnu.org; Wed, 07 Sep 2022 20:59:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:49374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW5t4-0007Gl-NU for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 20:59:24 -0400 Date: Thu, 08 Sep 2022 08:59:03 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662598757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JXtLzKFFMQf4Cy6/e4dpjBhIhtADzpCMsfuzQgcpaDw=; b=OelhfPsdgwHcyoMyr2ERXyDZvG/ozAoWJ+OqRIKv5Qbz3IKWkFeV91VxzCDCRo/FZKzUfT a6VPxNq5w6z/GvOQ/7TC1kR50meRRe23CMIUPCsbkN8oexLpKAbgCCrZa4Q9wbdo7CemWH dpheOsChEII3kjESScXUyxfga1KXUHlIKDuSWH/iI2mi48GkMdlMhI5TtQiWxE6R0IWA4M 3kH9/UsEGGxndHJ1rrcLCZUWex5R9c+SNieFN53L9UpEWgtbSgYTdyqyglvLlY4+yKBwjL cD3JKNspZdQZ4dXu0i8utxG5k5nq+3ed2ZWFGvrQOP/3Djwu0251Tgv+0/DsHw== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: [PATCH 5/5] gnu: telegram-desktop: Update to 4.1.1. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (telegram-desktop): Update to 4.1.1. [snippet]: Don't keep SPMediaKeyTap and statusnotifieritem as they'd got removed from upstream. Keep rlottie, libtgvoip and dispatch. [#:configure-flags]: Comment out to default value Use API id from official Snap builds. Enable DESKTOP_APP_USE_PACKAGED_LAZY, which is suitable for default configuration as it'll bundle as many features as possible. [#:phases]: Copy dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie and libtgvoip. Remove phase patch-cxx-flags, as that string's not there any more. Replace build and install phases with ones that use cmake tools. [native-inputs] Add variable external-sources for managing recursive checkouts. Bump cmake-helpers to source checkout-ed commit. Add ninja and clang-toolchain. [inputs] Add variable external-sources for managing recursive checkouts. Add dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie, libtgvoip to external-sources. Bump codegen, lib_base, lib_crl, lib_lottie, lib_qr, lib_rpl, lib_spellchec= k, lib_storage, lib_tl, lib_ui, lib_waylandshells, lib_webrtc, lib_webview and tgcalls to source checkout-ed commit. Add patch for lib_base to support musl compilation. Style adjustment. [license] Update with source tree changes. * gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch: New file. * gnu/local.mk: Add patch. --- gnu/local.mk | 1 + ...se-for-telegram-desktop-support-musl.patch | 35 + gnu/packages/telegram.scm | 735 ++++++++++-------- 3 files changed, 446 insertions(+), 325 deletions(-) create mode 100644 gnu/packages/patches/lib-base-for-telegram-desktop-supp= ort-musl.patch diff --git a/gnu/local.mk b/gnu/local.mk index d0e5aeb125..aa2fa69ddd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1354,6 +1354,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/julia-allow-parallel-build.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/lib-base-for-telegram-desktop-support-musl.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ diff --git a/gnu/packages/patches/lib-base-for-telegram-desktop-support-mus= l.patch b/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.p= atch new file mode 100644 index 0000000000..1a3a70286f --- /dev/null +++ b/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch @@ -0,0 +1,35 @@ +Stub out some glibc-specific functions + +This allows support for alternative libcs like musl + +diff --git a/base/platform/linux/base_info_linux.cpp b/base/platform/linux= /base_info_linux.cpp +index 714d8dc..b70cc23 100644 +--- a/base/platform/linux/base_info_linux.cpp ++++ b/base/platform/linux/base_info_linux.cpp +@@ -22,7 +22,7 @@ + + #include + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include + #endif // Q_OS_LINUX + +@@ -200,7 +200,7 @@ QString AutoUpdateKey() { + } + + QString GetLibcName() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + return "glibc"; + #endif // Q_OS_LINUX + +@@ -208,7 +208,7 @@ QString GetLibcName() { + } + + QString GetLibcVersion() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + static const auto result =3D [&] { + const auto version =3D QString::fromLatin1(gnu_get_libc_version()); + return QVersionNumber::fromString(version).isNull() ? QString() : versi= on; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index bd8b5b31a7..961cd32890 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =A9 2021 Raghav Gururajan +;;; Copyright =A9 2022 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,8 +29,10 @@ (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) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -42,6 +45,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 ninja) @@ -60,6 +64,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) @@ -227,339 +232,419 @@ (define-public webrtc-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) - (modules '((guix build utils) - (ice-9 ftw) - (srfi srfi-1))) - (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=3D? - (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (version "4.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telegramdesktop/tdesktop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zhwaql1fk0nqr1x2lchcswz61x7sb2297qdxiysgqamr0fk9ppn")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet #~(begin + (let ((keep + '(;; Custom fork + "rlottie" "libtgvoip" + ;; Not available in Guix. + "dispatch" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdPart= y" + (for-each delete-file-recursively + (lset-difference string=3D? + (scandir ".") + (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=3D2791056" - "-DTDESKTOP_API_HASH=3D582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=3DON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=3DOFF") - #:phases - (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-wayl= andshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-sour= ce")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-so= urce")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-sc= hemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ;No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; https://github.com/telegramdesktop/tdesktop/blob/dev/sna= p/snapcraft.yaml + ;; see also . + "-DTDESKTOP_API_ID=3D611335" + "-DTDESKTOP_API_HASH=3Dd524b414d21f4d37f08684c1df41ac9c" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=3D" #$name) + + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + + ;; "-DDESKTOP_APP_USE_PACKAGED=3DON" + ;; "-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=3DOFF" + ;; "-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=3DOFF" + ;; "-DDESKTOP_APP_DISABLE_X11_INTEGRATION=3DOFF" + ;; "-DDESKTOP_APP_DISABLE_SPELLCHECK=3DOFF" + ;; "-DDESKTOP_APP_USE_ENCHANT=3DOFF" + ;; "-DDESKTOP_APP_LOTTIE_USE_CACHE=3DON" + + ;; "-DLIBTGVOIP_DISABLE_ALSA=3DOFF" + ;; "-DLIBTGVOIP_DISABLE_PULSEAUDIO=3DOFF" + + ;; Build all the available detected features in the build + ;; environment. + "-DDESKTOP_APP_USE_PACKAGED_LAZY=3DON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + `(("cmake" ,(assoc-ref inputs "cmake-helpers")) + ("Telegram/codegen" ,(assoc-ref inputs "codegen-sour= ce")) + ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-so= urce")) + ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-sour= ce")) + ("Telegram/lib_lottie" ,(assoc-ref inputs "lib-lotti= e-source")) + ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source= ")) + ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-sour= ce")) + ("Telegram/lib_spellcheck" ,(assoc-ref inputs "lib-s= pellcheck-source")) + ("Telegram/lib_storage" ,(assoc-ref inputs "lib-stor= age-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 "li= b-waylandshells-source")) + ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrt= c-source")) + ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webv= iew-source")) + ("Telegram/ThirdParty/dispatch" ,(assoc-ref inputs "= dispatch-source")) + ("Telegram/ThirdParty/fcitx-qt5" ,(assoc-ref inputs = "fcitx-qt5-source")) + ("Telegram/ThirdParty/fcitx5-qt" ,(assoc-ref inputs = "fcitx5-qt-source")) + ("Telegram/ThirdParty/hime" ,(assoc-ref inputs "hime= -source")) + ("Telegram/ThirdParty/nimf" ,(assoc-ref inputs "nimf= -source")) + ("Telegram/ThirdParty/rlottie" ,(assoc-ref inputs "r= lottie-source")) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "t= gcalls-source")) + ("Telegram/ThirdParty/libtgvoip" ,(assoc-ref inputs = "libtgvoip-source")))))) + (replace 'build + (lambda* (#:key (make-flags '()) + (parallel-build? #t) #:allow-other-keys) + (apply invoke "cmake" "--build" "." + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-co= unt))) + '()) + ,@make-flags)))) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "cmake" "--install" "." make-flags))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-comp= ile-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))) + (let ((external-sources + `(("cmake-helpers" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers= ") + (commit "0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69"= ))) + (file-name + (git-file-name "cmake-helpers-for-telegram-desktop" ver= sion)) + (sha256 + (base32 "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa= 281zk1"))))))) + (modify-inputs external-sources + (append clang-toolchain ninja pkg-config python-wrapper)))) (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" versio= n)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"= )))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"= )))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"= )))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"= )))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (let ((external-sources + `(("codegen-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen") + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"= ))) + (file-name + (git-file-name "codegen" version)) + (sha256 + (base32 "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57b= y9mbq2")))) + ("lib-base-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base") + (commit "37fab6b4da32c91bc5d049baad2e9ad51cfcd195"= ))) + (file-name + (git-file-name "lib-base-for-telegram-desktop" version)) + (sha256 + (base32 "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq= 6l10k5")) + (patches + (search-patches "lib-base-for-telegram-desktop-support-= musl.patch")))) + ("lib-crl-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl") + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"= ))) + (file-name + (git-file-name "lib-crl-for-telegram-desktop" version)) + (sha256 + (base32 "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4= awah0x")))) + ("lib-lottie-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie") + (commit "f3563bc6b0e042095d4d667d013f62cb8ae62b65"= ))) + (file-name + (git-file-name "lib-lottie-for-telegram-desktop" versio= n)) + (sha256 + (base32 "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard7= 6cgvsg")))) + ("lib-qr-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr") + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"= ))) + (file-name + (git-file-name "lib-qr-for-telegram-desktop" version)) + (sha256 + (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4sz= r1rjq0")))) + ("lib-rpl-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl") + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"= ))) + (file-name + (git-file-name "lib-rpl-for-telegram-desktop" version)) + (sha256 + (base32 "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn= 9xxdxf")))) + ("lib-spellcheck-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellchec= k") + (commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060"= ))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" ve= rsion)) + (sha256 + (base32 "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vh= yjhbwh")))) + ("lib-storage-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage") + (commit "839609369d04615475cb1518636de3619106a917"= ))) + (file-name + (git-file-name "lib-storage-for-telegram-desktop" versi= on)) + (sha256 + (base32 "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5x= qmkwwm")))) + ("lib-tl-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl") + (commit "0d234b5aabf43d598e0cb0867566ee570d9e2755"= ))) + (file-name + (git-file-name "lib-tl-for-telegram-desktop" version)) + (sha256 + (base32 "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7= sxcd96")))) + ("lib-ui-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui") + (commit "2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a"= ))) + (file-name + (git-file-name "lib-ui-for-telegram-desktop" version)) + (sha256 + (base32 "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05h= bybfcn")))) + ("lib-waylandshells-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandsh= ells") + (commit "271290b93c65b6fb634cb9c69bff97f51b74f3a7"= ))) + (file-name + (git-file-name "lib-waylandshells-for-telegram-desktop"= version)) + (sha256 + (base32 "02d966kbpqf029wwma17vicmc8n5iaksibaq6d81jmh770= p2vsc9")))) + ("lib-webrtc-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc") + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"= ))) + (file-name + (git-file-name "lib-webrtc-for-telegram-desktop" versio= n)) + (sha256 + (base32 "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q= 68z5dq")))) + ("lib-webview-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview") + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"= ))) + (file-name + (git-file-name "lib-webview-for-telegram-desktop" versi= on)) + (sha256 + (base32 "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadiniv= l52z0l")))) + ("tgcalls-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls= ") + (commit "82c4921045c440b727c38e464f3a0539708423ff"= ))) + (file-name + (git-file-name "tgcalls-for-telegram-desktop" version)) + (sha256 + (base32 "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1g= ccv9mk")))) + ("libtgvoip-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telegramdesktop/libtgvoip= ") + (commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4"= ))) + (file-name + (git-file-name "libtgvoip-for-telegram-desktop" version= )) + (sha256 + (base32 "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hw= ki941h")))) + ("dispatch-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libd= ispatch") + (commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73"= ))) + (file-name + (git-file-name "dispatch-for-telegram-desktop" version)) + (sha256 + (base32 "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkx= mgjmqn")))) + ("fcitx-qt5-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fcitx/fcitx-qt5") + (commit "c2feea444ab79e6a8d6d205d4c7b13ab1db353c9"= ))) + (file-name + (git-file-name "fcitx-qt5-for-telegram-desktop" version= )) + (sha256 + (base32 + "1y10n2l0rbzpvsryw0mikyv9hic8wxd8gwr0ax37niwjbkil2zv8"= )))) + ("fcitx5-qt-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fcitx/fcitx5-qt") + (commit "fd06094f48e8281b6dc3fd4aaadfcd216c426a5a"= ))) + (file-name + (git-file-name "fcitx5-qt-for-telegram-desktop" version= )) + (sha256 + (base32 + "15mhcv3m39fi375ccd05hr8va4js9lkj0vllypnq90v43fcvawr1"= )))) + ("hime-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hime-ime/hime") + (commit "9b3e6f9ab59d1fe4d9de73d3bf0fed7789f921c5"= ))) + (file-name + (git-file-name "hime-for-telegram-desktop" version)) + (sha256 + (base32 + "1b98ql30ihbqz1zwlm0c3c1qmxp3gdz96wsic3h6ypqcr3xyj28f"= )))) + ("nimf-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamonikr/nimf") + (commit "181f9467fc1883c228fc272330ab2f000bfae163"= ))) + (file-name + (git-file-name "nimf-for-telegram-desktop" version)) + (sha256 + (base32 + "0kk430bx3w9n8c1d42ng5gicx44gi9bsjd60n2927wdpm6jxm2yl"= )))) + ("rlottie-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/rlottie") + (commit "8c69fc20cf2e150db304311f1233a4b55a8892d7"= ))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyr= xll64i"))))))) + (modify-inputs external-sources + (append c++-gsl ;Required + jemalloc + libexpected + minizip + openal + qrcodegen-cpp + qt5compat + qtbase + qtimageformats + qtsvg-5 + range-v3 + rnnoise + webrtc-for-telegram-desktop + xxhash + zlib + ;; Has options + fcitx-qt5 ;DESKTOP_APP_USE_PACKAGED_LAZY + fcitx5-qt + hime + nimf + glibmm-2.64 ;DESKTOP_APP_DISABLE_DBUS_INTEGRATION + enchant ;DESKTOP_APP_USE_ENCHANT + hunspell ;DESKTOP_APP_DISABLE_SPELLCHECK + lz4 ;DESKTOP_APP_LOTTIE_USE_CACHE + alsa-lib ;LIBTGVOIP_DISABLE_ALSA + pulseaudio ;LIBTGVOIP_DISABLE_PULSEAUDIO + qtwayland ;DESKTOP_APP_DISABLE_WAYLAND_INTEGRA= TION + wayland + libxcb ;DESKTOP_APP_DISABLE_X11_INTEGRATION + 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/fcitx-qt5 (platform input context plu= gin) + ;; Telegram/ThirdParty/fcitx5-qt (Fcitx5Qt4DBusAddons library + ;; and input context plugin, Fcitx5Qt5DBusAddons library and= Qt5 + ;; platform input context plugin) + license:bsd-3 + + ;; 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/hime (files not mentioned below) + license:lgpl2.1 + + ;; Telegram/ThirdParty/fcitx5-qt (files not mentioned above) + ;; Telegram/ThirdParty/rlottie + ;; Telegram/ThirdParty/rlottie/src/vector + license:lgpl2.1+ + + ;; Telegram/ThirdParty/nimf + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 + + ;; Telegram/ThirdParty/fcitx-qt5 (files not mentioned above) + ;; Telegram/ThirdParty/hime (Qt immodules) + license:gpl2 + + ;; Others + license:gpl3+)))) (define-public tl-parser (let ((commit "1933e76f8f4fb74311be723b432e4c56e3a5ec06") -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 23:11:31 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 03:11:32 +0000 Received: from localhost ([127.0.0.1]:56854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW7ww-0002Dy-61 for submit@debbugs.gnu.org; Wed, 07 Sep 2022 23:11:31 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW7wt-0002Dg-08 for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 23:11:28 -0400 Date: Thu, 08 Sep 2022 11:10:58 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662606679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mUlxdIEFqiuPBQfLjUvoJ20y9P3mnwkzW3Aj5vKZkCE=; b=NO0Dyq3A+a3wPpuMJ1yi/XMMrxVAywePxdJpq1m9eSZu+Z/VfjC3QN5nXVa9S1z18avCQu vhd4D9h/PKuONKWIJXcAqTd1/yc7rQV6rZ4aI2PJyXIVSaKdNXmw/Z3B3xjeOKYdVLkPZD McoJXE8oihIE1MfkJVLWpt7gqLnY7mVl8Jg1dfNi7wUWs1giW7VwOzNJeuMx0tr3stNX2H 9JzrvcCD6a05f7JBQWPN+GG9gKaL7QfpM7n6ZgI7REBWArMjRNUHrjtjQm8J+2xrBMrSXI jF2EXiCCSDfnOtPB3267Hdur4EZvzfXoouHBmBbN01/wy8FmK7GmK/uDHNML3Q== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: [PATCH 5/5 RESEND UNTABIFIED] gnu: telegram-desktop: Update to 4.1.1. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (telegram-desktop): Update to 4.1.1. [snippet]: Don't keep SPMediaKeyTap and statusnotifieritem as they'd got removed from upstream. Keep rlottie, libtgvoip and dispatch. [#:configure-flags]: Comment out to default value Use API id from official Snap builds. Enable DESKTOP_APP_USE_PACKAGED_LAZY, which is suitable for default configuration as it'll bundle as many features as possible. [#:phases]: Copy dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie and libtgvoip. Remove phase patch-cxx-flags, as that string's not there any more. Replace build and install phases with ones that use cmake tools. [native-inputs] Add variable external-sources for managing recursive checkouts. Bump cmake-helpers to source checkout-ed commit. Add ninja and clang-toolchain. [inputs] Add variable external-sources for managing recursive checkouts. Add dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie, libtgvoip to external-sources. Bump codegen, lib_base, lib_crl, lib_lottie, lib_qr, lib_rpl, lib_spellchec= k, lib_storage, lib_tl, lib_ui, lib_waylandshells, lib_webrtc, lib_webview and tgcalls to source checkout-ed commit. Add patch for lib_base to support musl compilation. Style adjustment. [license] Update with source tree changes. * gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch: New file. * gnu/local.mk: Add patch. --- RESEND: Untabify musl patch. gnu/local.mk | 1 + ...se-for-telegram-desktop-support-musl.patch | 35 + gnu/packages/telegram.scm | 735 ++++++++++-------- 3 files changed, 446 insertions(+), 325 deletions(-) create mode 100644 gnu/packages/patches/lib-base-for-telegram-desktop-supp= ort-musl.patch diff --git a/gnu/local.mk b/gnu/local.mk index f1fda8151b..dfcc82b7f6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1356,6 +1356,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/julia-allow-parallel-build.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/lib-base-for-telegram-desktop-support-musl.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ diff --git a/gnu/packages/patches/lib-base-for-telegram-desktop-support-mus= l.patch b/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.p= atch new file mode 100644 index 0000000000..1a3a70286f --- /dev/null +++ b/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch @@ -0,0 +1,35 @@ +Stub out some glibc-specific functions + +This allows support for alternative libcs like musl + +diff --git a/base/platform/linux/base_info_linux.cpp b/base/platform/linux= /base_info_linux.cpp +index 714d8dc..b70cc23 100644 +--- a/base/platform/linux/base_info_linux.cpp ++++ b/base/platform/linux/base_info_linux.cpp +@@ -22,7 +22,7 @@ + + #include + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include + #endif // Q_OS_LINUX + +@@ -200,7 +200,7 @@ QString AutoUpdateKey() { + } + + QString GetLibcName() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + return "glibc"; + #endif // Q_OS_LINUX + +@@ -208,7 +208,7 @@ QString GetLibcName() { + } + + QString GetLibcVersion() { +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + static const auto result =3D [&] { + const auto version =3D QString::fromLatin1(gnu_get_libc_ver= sion()); + return QVersionNumber::fromString(version).isNull() ? QStri= ng() : version; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index bd8b5b31a7..961cd32890 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2021 Raghav Gururajan +;;; Copyright =C2=A9 2022 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,8 +29,10 @@ (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) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -42,6 +45,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 ninja) @@ -60,6 +64,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) @@ -227,339 +232,419 @@ (define-public webrtc-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) - (modules '((guix build utils) - (ice-9 ftw) - (srfi srfi-1))) - (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=3D? - (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (version "4.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telegramdesktop/tdesktop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zhwaql1fk0nqr1x2lchcswz61x7sb2297qdxiysgqamr0fk9ppn")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet #~(begin + (let ((keep + '(;; Custom fork + "rlottie" "libtgvoip" + ;; Not available in Guix. + "dispatch" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdPart= y" + (for-each delete-file-recursively + (lset-difference string=3D? + (scandir ".") + (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=3D2791056" - "-DTDESKTOP_API_HASH=3D582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=3DON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=3DOFF") - #:phases - (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-wayl= andshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-sour= ce")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-so= urce")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-sc= hemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ;No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; https://github.com/telegramdesktop/tdesktop/blob/dev/sna= p/snapcraft.yaml + ;; see also . + "-DTDESKTOP_API_ID=3D611335" + "-DTDESKTOP_API_HASH=3Dd524b414d21f4d37f08684c1df41ac9c" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=3D" #$name) + + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + + ;; "-DDESKTOP_APP_USE_PACKAGED=3DON" + ;; "-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=3DOFF" + ;; "-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=3DOFF" + ;; "-DDESKTOP_APP_DISABLE_X11_INTEGRATION=3DOFF" + ;; "-DDESKTOP_APP_DISABLE_SPELLCHECK=3DOFF" + ;; "-DDESKTOP_APP_USE_ENCHANT=3DOFF" + ;; "-DDESKTOP_APP_LOTTIE_USE_CACHE=3DON" + + ;; "-DLIBTGVOIP_DISABLE_ALSA=3DOFF" + ;; "-DLIBTGVOIP_DISABLE_PULSEAUDIO=3DOFF" + + ;; Build all the available detected features in the build + ;; environment. + "-DDESKTOP_APP_USE_PACKAGED_LAZY=3DON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + `(("cmake" ,(assoc-ref inputs "cmake-helpers")) + ("Telegram/codegen" ,(assoc-ref inputs "codegen-sour= ce")) + ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-so= urce")) + ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-sour= ce")) + ("Telegram/lib_lottie" ,(assoc-ref inputs "lib-lotti= e-source")) + ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source= ")) + ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-sour= ce")) + ("Telegram/lib_spellcheck" ,(assoc-ref inputs "lib-s= pellcheck-source")) + ("Telegram/lib_storage" ,(assoc-ref inputs "lib-stor= age-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 "li= b-waylandshells-source")) + ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrt= c-source")) + ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webv= iew-source")) + ("Telegram/ThirdParty/dispatch" ,(assoc-ref inputs "= dispatch-source")) + ("Telegram/ThirdParty/fcitx-qt5" ,(assoc-ref inputs = "fcitx-qt5-source")) + ("Telegram/ThirdParty/fcitx5-qt" ,(assoc-ref inputs = "fcitx5-qt-source")) + ("Telegram/ThirdParty/hime" ,(assoc-ref inputs "hime= -source")) + ("Telegram/ThirdParty/nimf" ,(assoc-ref inputs "nimf= -source")) + ("Telegram/ThirdParty/rlottie" ,(assoc-ref inputs "r= lottie-source")) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "t= gcalls-source")) + ("Telegram/ThirdParty/libtgvoip" ,(assoc-ref inputs = "libtgvoip-source")))))) + (replace 'build + (lambda* (#:key (make-flags '()) + (parallel-build? #t) #:allow-other-keys) + (apply invoke "cmake" "--build" "." + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-co= unt))) + '()) + ,@make-flags)))) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "cmake" "--install" "." make-flags))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-comp= ile-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))) + (let ((external-sources + `(("cmake-helpers" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers= ") + (commit "0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69"= ))) + (file-name + (git-file-name "cmake-helpers-for-telegram-desktop" ver= sion)) + (sha256 + (base32 "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa= 281zk1"))))))) + (modify-inputs external-sources + (append clang-toolchain ninja pkg-config python-wrapper)))) (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" versio= n)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"= )))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"= )))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"= )))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"= )))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (let ((external-sources + `(("codegen-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen") + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"= ))) + (file-name + (git-file-name "codegen" version)) + (sha256 + (base32 "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57b= y9mbq2")))) + ("lib-base-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base") + (commit "37fab6b4da32c91bc5d049baad2e9ad51cfcd195"= ))) + (file-name + (git-file-name "lib-base-for-telegram-desktop" version)) + (sha256 + (base32 "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq= 6l10k5")) + (patches + (search-patches "lib-base-for-telegram-desktop-support-= musl.patch")))) + ("lib-crl-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl") + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"= ))) + (file-name + (git-file-name "lib-crl-for-telegram-desktop" version)) + (sha256 + (base32 "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4= awah0x")))) + ("lib-lottie-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie") + (commit "f3563bc6b0e042095d4d667d013f62cb8ae62b65"= ))) + (file-name + (git-file-name "lib-lottie-for-telegram-desktop" versio= n)) + (sha256 + (base32 "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard7= 6cgvsg")))) + ("lib-qr-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr") + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"= ))) + (file-name + (git-file-name "lib-qr-for-telegram-desktop" version)) + (sha256 + (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4sz= r1rjq0")))) + ("lib-rpl-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl") + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"= ))) + (file-name + (git-file-name "lib-rpl-for-telegram-desktop" version)) + (sha256 + (base32 "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn= 9xxdxf")))) + ("lib-spellcheck-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellchec= k") + (commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060"= ))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" ve= rsion)) + (sha256 + (base32 "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vh= yjhbwh")))) + ("lib-storage-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage") + (commit "839609369d04615475cb1518636de3619106a917"= ))) + (file-name + (git-file-name "lib-storage-for-telegram-desktop" versi= on)) + (sha256 + (base32 "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5x= qmkwwm")))) + ("lib-tl-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl") + (commit "0d234b5aabf43d598e0cb0867566ee570d9e2755"= ))) + (file-name + (git-file-name "lib-tl-for-telegram-desktop" version)) + (sha256 + (base32 "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7= sxcd96")))) + ("lib-ui-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui") + (commit "2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a"= ))) + (file-name + (git-file-name "lib-ui-for-telegram-desktop" version)) + (sha256 + (base32 "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05h= bybfcn")))) + ("lib-waylandshells-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandsh= ells") + (commit "271290b93c65b6fb634cb9c69bff97f51b74f3a7"= ))) + (file-name + (git-file-name "lib-waylandshells-for-telegram-desktop"= version)) + (sha256 + (base32 "02d966kbpqf029wwma17vicmc8n5iaksibaq6d81jmh770= p2vsc9")))) + ("lib-webrtc-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc") + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"= ))) + (file-name + (git-file-name "lib-webrtc-for-telegram-desktop" versio= n)) + (sha256 + (base32 "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q= 68z5dq")))) + ("lib-webview-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview") + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"= ))) + (file-name + (git-file-name "lib-webview-for-telegram-desktop" versi= on)) + (sha256 + (base32 "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadiniv= l52z0l")))) + ("tgcalls-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls= ") + (commit "82c4921045c440b727c38e464f3a0539708423ff"= ))) + (file-name + (git-file-name "tgcalls-for-telegram-desktop" version)) + (sha256 + (base32 "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1g= ccv9mk")))) + ("libtgvoip-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telegramdesktop/libtgvoip= ") + (commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4"= ))) + (file-name + (git-file-name "libtgvoip-for-telegram-desktop" version= )) + (sha256 + (base32 "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hw= ki941h")))) + ("dispatch-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libd= ispatch") + (commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73"= ))) + (file-name + (git-file-name "dispatch-for-telegram-desktop" version)) + (sha256 + (base32 "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkx= mgjmqn")))) + ("fcitx-qt5-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fcitx/fcitx-qt5") + (commit "c2feea444ab79e6a8d6d205d4c7b13ab1db353c9"= ))) + (file-name + (git-file-name "fcitx-qt5-for-telegram-desktop" version= )) + (sha256 + (base32 + "1y10n2l0rbzpvsryw0mikyv9hic8wxd8gwr0ax37niwjbkil2zv8"= )))) + ("fcitx5-qt-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fcitx/fcitx5-qt") + (commit "fd06094f48e8281b6dc3fd4aaadfcd216c426a5a"= ))) + (file-name + (git-file-name "fcitx5-qt-for-telegram-desktop" version= )) + (sha256 + (base32 + "15mhcv3m39fi375ccd05hr8va4js9lkj0vllypnq90v43fcvawr1"= )))) + ("hime-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hime-ime/hime") + (commit "9b3e6f9ab59d1fe4d9de73d3bf0fed7789f921c5"= ))) + (file-name + (git-file-name "hime-for-telegram-desktop" version)) + (sha256 + (base32 + "1b98ql30ihbqz1zwlm0c3c1qmxp3gdz96wsic3h6ypqcr3xyj28f"= )))) + ("nimf-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamonikr/nimf") + (commit "181f9467fc1883c228fc272330ab2f000bfae163"= ))) + (file-name + (git-file-name "nimf-for-telegram-desktop" version)) + (sha256 + (base32 + "0kk430bx3w9n8c1d42ng5gicx44gi9bsjd60n2927wdpm6jxm2yl"= )))) + ("rlottie-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/rlottie") + (commit "8c69fc20cf2e150db304311f1233a4b55a8892d7"= ))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyr= xll64i"))))))) + (modify-inputs external-sources + (append c++-gsl ;Required + jemalloc + libexpected + minizip + openal + qrcodegen-cpp + qt5compat + qtbase + qtimageformats + qtsvg-5 + range-v3 + rnnoise + webrtc-for-telegram-desktop + xxhash + zlib + ;; Has options + fcitx-qt5 ;DESKTOP_APP_USE_PACKAGED_LAZY + fcitx5-qt + hime + nimf + glibmm-2.64 ;DESKTOP_APP_DISABLE_DBUS_INTEGRATION + enchant ;DESKTOP_APP_USE_ENCHANT + hunspell ;DESKTOP_APP_DISABLE_SPELLCHECK + lz4 ;DESKTOP_APP_LOTTIE_USE_CACHE + alsa-lib ;LIBTGVOIP_DISABLE_ALSA + pulseaudio ;LIBTGVOIP_DISABLE_PULSEAUDIO + qtwayland ;DESKTOP_APP_DISABLE_WAYLAND_INTEGRA= TION + wayland + libxcb ;DESKTOP_APP_DISABLE_X11_INTEGRATION + 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/fcitx-qt5 (platform input context plu= gin) + ;; Telegram/ThirdParty/fcitx5-qt (Fcitx5Qt4DBusAddons library + ;; and input context plugin, Fcitx5Qt5DBusAddons library and= Qt5 + ;; platform input context plugin) + license:bsd-3 + + ;; 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/hime (files not mentioned below) + license:lgpl2.1 + + ;; Telegram/ThirdParty/fcitx5-qt (files not mentioned above) + ;; Telegram/ThirdParty/rlottie + ;; Telegram/ThirdParty/rlottie/src/vector + license:lgpl2.1+ + + ;; Telegram/ThirdParty/nimf + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 + + ;; Telegram/ThirdParty/fcitx-qt5 (files not mentioned above) + ;; Telegram/ThirdParty/hime (Qt immodules) + license:gpl2 + + ;; Others + license:gpl3+)))) (define-public tl-parser (let ((commit "1933e76f8f4fb74311be723b432e4c56e3a5ec06") -- 2.37.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 07 23:30:23 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 03:30:23 +0000 Received: from localhost ([127.0.0.1]:56864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW8FC-0004qb-Rh for submit@debbugs.gnu.org; Wed, 07 Sep 2022 23:30:23 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW8FB-0004qH-9I for 57655@debbugs.gnu.org; Wed, 07 Sep 2022 23:30:21 -0400 Date: Thu, 08 Sep 2022 11:29:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662607813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=F6AitWjlKnB0HudTEo+lOrs44Ao4Y2wcuyGyTeaiT8s=; b=KAF+QxtzyKdGqpMTgUvRzadEfpNKIqKRWZZbyW1iCRTtiELo4o7/QbNDQhEiLrmr4XY1X0 OAoCfWABu71k5LxWanaxkslq2bIFh/e9Ii1W/zqcJag92PRmCq6BjinO5Ua14DZ+CFnk9u kVdlM/ZpWerkB0fcvCOcDJIKKhWkahEHzzFNiYobBLFtuKtKdmPH/ZYz/NNEMugBzSvAwI 9zRuoURqPStqle6tdw8vXRNwo+KCnyE9hS9dVYonYmA1n5RFwuXYHWZadgfxlEvu2p68EO xrNdux1pJ+TMv36uvQdfrOO7NuJZ6rSeIEJKQzYCJIrys2iSIpV+KT7UJ3DuEw== Message-ID: From: Hilton Chain To: 57655@debbugs.gnu.org Subject: Re: [PATCH 5/5 RESEND UNTABIFIED] gnu: telegram-desktop: Update to 4.1.1. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Sorry that this RESEND one just makes it worse, since lib_base really uses a space before tabs... Just ignore this patch, if you feel confused, reply me and I'll send another set. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 00:41:07 2022 Received: (at 57655-close) by debbugs.gnu.org; 8 Sep 2022 04:41:07 +0000 Received: from localhost ([127.0.0.1]:56945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW9Lf-0000Kb-6X for submit@debbugs.gnu.org; Thu, 08 Sep 2022 00:41:07 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:54884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oW9La-0000Jw-VM for 57655-close@debbugs.gnu.org; Thu, 08 Sep 2022 00:41:06 -0400 Date: Thu, 08 Sep 2022 12:40:33 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662612054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=l39sTu+GoFPWVJHOQIiE2ryghLdeh3ujwgkaoNM5iOY=; b=xsE7Srv/1/PPhWMP9OAp4eyy67QVlIxKpMazb6mG8ZJ8tL0u34OI91agj2C9DAPJ0r+/2H oNk5Eri2NMrA7p6kYGxw8/oZU4VdJyIEpNPaMywkoRCnJM1GGhKdIAJe1iUgOzNuVeK5hq 3yg35MCIr+uaoq8yqpRBFo4igURi7+rSVXBJ04mIVN5Fjb89328OgN8yGWGFL1ifEPpOCT GhJLYFKuDMe1XikZ1guVxUL1Q0rwvQ61U3q5fjgEkuccjHEXUl0iXW9W0WsH8dvG0ug7Fv SHuhBJmexXUVBvFHIpzlLZoSEee8pioQyBRHTzfedU+9n7xhjZyjgaL4HwTzqA== Message-ID: From: Hilton Chain To: 57655-close@debbugs.gnu.org Subject: Re: [PATCH 5/5 RESEND UNTABIFIED] gnu: telegram-desktop: Update to 4.1.1. In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655-close X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) There seem to be an encoding issue, adding that I've received a hash-mismatching report, it's better close this for now... I'll send v2 once I'd checked again. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 10:16:06 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 14:16:06 +0000 Received: from localhost ([127.0.0.1]:59678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIK6-0008OM-Fm for submit@debbugs.gnu.org; Thu, 08 Sep 2022 10:16:06 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:43875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIK4-0008NR-71 for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 10:16:05 -0400 Received: by mail-ed1-f68.google.com with SMTP id a70so8463397edf.10 for <57655@debbugs.gnu.org>; Thu, 08 Sep 2022 07:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date; bh=0MDlWvq5DDdDH1AO6lKQgqsvDigr6UyUjlBaB6GPRm8=; b=JB5bjubGgxMafW5E5OyZ7qb4lXash4BewqGOlNZkqJu8kbiWpEq+FcBNNcH++ha7s6 wFiB61WTqAU/V2OU/tk+1hV+KxUiVSNN+tEkpXrA0f6liztklP3mQJ0HJcxp2473l+n+ TB50pg4zvQ0UudjzWZWgAIttvb3z9AscrkQFWeoOBr7M5LuQ/AtqgTg2mwxq3nueXheJ VkYM0lPv7vbKlkm+j982mox1SmBxmRAbaCu5OArqIWLHZHNxmxMPyw3TsavLbrS0Vcmi 8Y+q/1iWW3bQ48+e5COqpfdf+/k5tE7JUDnvkwrIX6zYXYtTOCOkByAwqUgKxzqztsIx bNSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date; bh=0MDlWvq5DDdDH1AO6lKQgqsvDigr6UyUjlBaB6GPRm8=; b=mvfcSUhHH/NynCn/qQ7K4vCV0KEvOYzSZE6mFPstJbzTv9llgtkVucz/VB3e5twW8A XBbwyL7KtiWGiihGcJlFSxN37645sYb77glQRAC4Xlq67WHJYel4VikI145a+ymPSSgs ziaYmwwhUFZjo+WoZzN3CUJ+TZrngyrXE2yiZC7yTlEwPILJvvdK7VIqFIWRBDa/wuRN NxvM3sUezsN4oknz0SwiDW/Nsidmcfyv4Xr+8h2fgZIc8P1ld5Fd8SMt3fRqu3aeigP3 4hi5IpewmIATnrzQTllcvoamzUrPoQtqFVKBpZOzZvD9yRRw7K9dPL8sSLciH9ZLNham BrjQ== X-Gm-Message-State: ACgBeo3cQFhoPsGmPnJOp/SQcrmB5ht6KsEHKlubaCCH1hxZyONe10N9 3BtEVqh7g94V6q5vZwf/i+M= X-Google-Smtp-Source: AA6agR64mThcn3PPFcuSenmYXV0tu98bsAfiQsST5vNjE8YQEgRDlbg1dYWweA4bJZBoOgdGuUsyyQ== X-Received: by 2002:a05:6402:2554:b0:450:28d2:2152 with SMTP id l20-20020a056402255400b0045028d22152mr3136515edb.303.1662646558249; Thu, 08 Sep 2022 07:15:58 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x13-20020a05640226cd00b0044f1e64e9f4sm2981698edd.17.2022.09.08.07.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 07:15:57 -0700 (PDT) Message-ID: Subject: Re: [PATCH 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop. From: Liliana Marie Prikler To: Hilton Chain , 57655@debbugs.gnu.org Date: Thu, 08 Sep 2022 16:15:57 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 08.09.2022 um 08:56 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (abseil-cpp-for-webrtc-for-telegram- > desktop): New > variable. > --- LGTM From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 10:16:33 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 14:16:33 +0000 Received: from localhost ([127.0.0.1]:59683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIKW-0008P7-Of for submit@debbugs.gnu.org; Thu, 08 Sep 2022 10:16:32 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:39780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIKV-0008Ov-1H for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 10:16:31 -0400 Received: by mail-ed1-f65.google.com with SMTP id z8so24599723edb.6 for <57655@debbugs.gnu.org>; Thu, 08 Sep 2022 07:16:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date; bh=3h5jWW2HEpELX5PlCtSuOe8C0AONim1KJoTGki1GggE=; b=nJWG00BVK1CURJ9z7gti5vMFkB4CQhUREwyFlsucn6phwV6g6AR0d+p+baET8v+1yA WQswda6mndv6OLuxc2FPWjMKVqKDxJ3/IrWuXi/ZGWqu7Pgo9FiPbRFDd53YDCvULACF INaW40BW1eIJpNmilHujE5zkzv16XjHrDRTIFzk3sxf1atm3gkAORq6GxL4ehaPFCB4W l8/eqGO+hlczAZLG2lhik9EvdP1vdp4j9IgiIOQRPqs9Rl2kvASMzZlNmHTPDFRWrMLe sQFwzp0BGMaiHqdKidcbuT7D9GQ5NJHM8siO+rawmaxi7MK5Dj3R0ee/f2zGJN7QxIeg T1ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date; bh=3h5jWW2HEpELX5PlCtSuOe8C0AONim1KJoTGki1GggE=; b=qMqFrAjDAfBNENj3fb+aN24fdnFjKwbqQsb9Ca+/cxVf49Yvg11ZqmA0NdgHU40nQM rbMkqJsbtmnWK0Id/UqOAjcIMcsUoYgaZspjOM91lG5eaSpuXgUwRUsdrIPRJJRBMgNV U4G7QjPy1Ng3i4idiuMkl0MTucjRd+I5/2V5DfCYwH9YwUDxM60YRqmQ42CXa4E4SW+U MZtmD+m6IChKIxUmwSvx6uOGoN9I6QubueEcvMQ4dDmtrDMD7sJQ8GfEIVAN6KxmAPbz a3qmXakRbLfndMaxzjOMAstKN0E0V8A67+kyfEsD2S3BR09rhqHI3JlNZsayVeOQFXKc mz0Q== X-Gm-Message-State: ACgBeo2X/p2caOFav2Oz2aJuHsF1fXJDPaolXH4MzEkqztbw368G7hmC BuTQ6voavkbQqWMF41sY0naxcp8DThA= X-Google-Smtp-Source: AA6agR5JdMtXhPvp8oyBMPPkaojq9uZfYXgLOy1L6AicUeFvxGmg75KshSSN3tYd7XaXBGbFoohRyQ== X-Received: by 2002:a05:6402:54b:b0:44e:ac69:c617 with SMTP id i11-20020a056402054b00b0044eac69c617mr7522664edx.64.1662646585366; Thu, 08 Sep 2022 07:16:25 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ia14-20020a170907a06e00b0076fa6d9d891sm1306161ejc.46.2022.09.08.07.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 07:16:25 -0700 (PDT) Message-ID: Subject: Re: [PATCH 3/5] gnu: Remove rlottie-for-telegram-desktop. From: Liliana Marie Prikler To: Hilton Chain , 57655@debbugs.gnu.org Date: Thu, 08 Sep 2022 16:16:24 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 08.09.2022 um 08:58 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (rlottie-for-telegram-desktop): Delete > variable. SGTM but do this only after updating telegram desktop. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 10:16:55 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 14:16:55 +0000 Received: from localhost ([127.0.0.1]:59686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIKt-0008Pj-0e for submit@debbugs.gnu.org; Thu, 08 Sep 2022 10:16:55 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:36795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIKr-0008PU-Ea for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 10:16:53 -0400 Received: by mail-ed1-f65.google.com with SMTP id e18so24589032edj.3 for <57655@debbugs.gnu.org>; Thu, 08 Sep 2022 07:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date; bh=rxqVmj9FpfsCV8Jgk2BmExym5s8eoH/vWooHdPTgb90=; b=NXOtdkVL9D5je7qvE2gcXJPkkleL7oOKcKHeQC4zVC3t9ojFH213thJcc6zKwZg4yx udxXK2GpWpVfOYPPp9zzqOQkjEhLITQ9zmPb2gLHmOp3/C7yjIbXQve97SefAzdXUDbe p4Dbzq05ONB9wdjtnjgCwxhLbTWPhgJdrHidDV8K7Z4nvXDNtNEhv0XElA711WHnI91K BOLJz4wCriHZ6Xv1Sb3xfeAqfp+hRRrMGZxqE1Z9jp0plXsWgpM3thebINFd9XNfRDgE mOsQHSPXYEck2oQqKIkHaRTV5u2FvFdegtPV2AWDgQa6HbEMeYR8VBdxzhoNUjuS8x4E CvWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date; bh=rxqVmj9FpfsCV8Jgk2BmExym5s8eoH/vWooHdPTgb90=; b=ngvDdwKMxb7548rzWFcVr8v+4HY3621UxfTkMeQVQjoQI9L4kJUCikvTibYYtKxQm8 BmhDZcaa1ZJk4fiucsaupwN2Tr/In9v9OZ3n2QXsOPK8I70gEwb61X/EDo1JACmTHHJE vqJd4XtvMr3U4f2iNu7pt5q8Wmg8UrtgyuafZU5qHi0sLH4GiU6xuysN7sygEV6kp6g4 swFo6XSI46Om9+xJtxc7f3V04sEzs1VCNj/e+BIiWJJWobZ/3DER1dy36T427x58W5G8 D4XqFRf2QvhNz8Wq8qihT1hU3gZi3tQgTzran6RJwG7MIBXKZc4lTCzdbJhQ3BsjgJpc IPWw== X-Gm-Message-State: ACgBeo0NoBwDeDK4T46RYuKSyzeX0LcqAgG7IkDW/QKP7DYn8axphbCu OfmSkGicsShbpXzThwhZwPo= X-Google-Smtp-Source: AA6agR5oxzhDCSeljJduFmXt32CnSdOe3eUAsO3AzDZM/CrNK2PaM7Ci7lGpUL3bVbV/CLEUo5cl0A== X-Received: by 2002:a05:6402:1f13:b0:44e:97dd:7b77 with SMTP id b19-20020a0564021f1300b0044e97dd7b77mr7420806edb.300.1662646608002; Thu, 08 Sep 2022 07:16:48 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b5-20020aa7c6c5000000b00450206d9dfbsm1281236eds.84.2022.09.08.07.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 07:16:47 -0700 (PDT) Message-ID: Subject: Re: [PATCH 4/5] gnu: Remove libtgvoip-for-telegram-desktop. From: Liliana Marie Prikler To: Hilton Chain , 57655@debbugs.gnu.org Date: Thu, 08 Sep 2022 16:16:47 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 08.09.2022 um 08:58 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (libtgvoip-for-telegram-desktop): Delete > variable. Same as for rlottie-for-telegram-desktop. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 10:30:06 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 14:30:06 +0000 Received: from localhost ([127.0.0.1]:59809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIXc-0000Tq-6G for submit@debbugs.gnu.org; Thu, 08 Sep 2022 10:30:06 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:37388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIXX-0000Q1-Ty for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 10:30:02 -0400 Received: by mail-ed1-f65.google.com with SMTP id b16so24678029edd.4 for <57655@debbugs.gnu.org>; Thu, 08 Sep 2022 07:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date; bh=XbTe1zaLSjPvW2mfVmwWYMwcK/qrdRQi/YXtIZdgCdA=; b=CXV5zZEMJ53ZFgfksIdF62lZGeKWzNSKsZ1xOhgr6A3XbXkFL4ofT9q8M3nCH1Pq3i sZj2QmUTTPU6P3QIyTp7Ovm+7L2LOuwMC8ITpWdcU5+MO5fkRV8OlH4CQ7eYRERF8Mt0 LrSplITQgRs4mezc/M0+3HnrpAJFY5RgYDsffIJwce5wSy1tc7PJcMbNxlBGe/unaLq+ LWQRIlFB+dearYr3SAmeC2LdqZKERY//QxZdwKRstJFHx0QdQFupYx76PhfU8qe9x/Ai 6rdmblTbut9NREu/G/5F0jclsiz3nFafOq2x+g8e54/m78Ag83Wx+3nThNZ1GF0JFRVM Ql+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date; bh=XbTe1zaLSjPvW2mfVmwWYMwcK/qrdRQi/YXtIZdgCdA=; b=zR1jaDJrK7CaTE7Cpouu/VUiI/BdkB8ENhGqHPoi+uCOvoCeJ59xoLtjS53wf/fbZE pa0VR3lEiq9Fz+5I7VG2FIAceID+Wf+gGHRa9UeehfsEDGPgph+24Mxguusknqf0X/hd tdtjaDBsp988IhH3dWS51UkQejSZJZrwx1HShNADqvyEoFI6uT//nvlQExDHO1IhkFKG 7LSQluMAA/LiIV9ZN1BlgDhIOjZrgWPS2dsHAGXChbejT4piSsIImNbbiTis8edH5Y+2 drNG7XKB3w2Bj+Dludqci4J+/AR34weAxUZwa9scdKGRChAfaFoEsyJM5lUWb6aBk65w nCDA== X-Gm-Message-State: ACgBeo1Qvz4d9N/X8O7Bz1Jd3iYwJNkMtO/nJLGgt1wxi046SNRtJBEI cn1Q6Txb+WtZ0AgvvxFo3g4= X-Google-Smtp-Source: AA6agR5FFE0nsZcZWwuQmZ6f47y4tJQ0YRLryCK5O/iKgNjAcMlroHkAlbMK4skfNwhH7zIRuL5R0w== X-Received: by 2002:a05:6402:1d55:b0:440:7104:240c with SMTP id dz21-20020a0564021d5500b004407104240cmr7588369edb.207.1662647392818; Thu, 08 Sep 2022 07:29:52 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r18-20020a170906551200b0073d678f50bfsm1280549ejp.164.2022.09.08.07.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 07:29:52 -0700 (PDT) Message-ID: <2d24006e95d4d71828dfff84a60901f0c37ae0b2.camel@gmail.com> Subject: Re: [PATCH 2/5] gnu: webrtc-for-telegram-desktop: Update to a5fbc9. From: Liliana Marie Prikler To: Hilton Chain , 57655@debbugs.gnu.org Date: Thu, 08 Sep 2022 16:29:51 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Donnerstag, dem 08.09.2022 um 08:57 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): > Update to a5fbc9123e056e611e69acf0ceb4252ddd838adb. > Use abseil-cpp [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: xiretza.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Am Donnerstag, dem 08.09.2022 um 08:57 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): > Update to a5fbc9123e056e611e69acf0ceb4252ddd838adb. > Use abseil-cpp-for-webrtc-for-telegram-desktop for abseil-cpp. > [patches]: > Add missing header. > Add flag for disabling X11. Mention the patches first in the ChangeLog, then you can just say "Add [patch basename]". > [snippet]: > Don't keep these files: openh264, usrsctp, libvpx. > Remove use of bundled openh264. Can be shortened to "Remove bundled openh264, ..." > [#:configure-flags]: Comment out. > [#:phases]: > Drop bundled libvpx. You might want to do this in the snippet. > Copy crc32c. > Use cmake tool for compilation and installation (and use ninja). You should still be able to produce Unix Makefiles with CMake. If ninja is really required, invoke it as ninja. > [inputs]: > Simplify. > Drop unneeded inputs. > Add external-sources variable for managing recursive checkouts. > Add crc32c. I think it's wiser to declare the external sources as variables, e.g. (define libyuv-for-telegram-desktop (origin ...)) and then just refer to those variables in the post-unpack unpack step via G-Expressions. > [native-inputs]: > Add ninja. > Drop perl. > [propagated-inputs]: Move libraries also needed by telegram-desktop > here from > inputs. > [license]: Update according to source tree updates. > > * gnu/packages/patches/webrtc-for-telegram-desktop-add-missing- > cstdint.patch: > New file. > * gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling- > X11.patch: > New file. > * gnu/local.mk: Add patches. > --- Please avoid gratuitous newlines in the ChangeLog. >  gnu/local.mk                                  |   2 + >  ...telegram-desktop-add-missing-cstdint.patch |  21 +++ >  ...telegram-desktop-allow-disabling-X11.patch | 123 +++++++++++++ >  gnu/packages/telegram.scm                     | 171 ++++++++++------ > -- >  4 files changed, 242 insertions(+), 75 deletions(-) >  create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop- > add-missing-cstdint.patch >  create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop- > allow-disabling-X11.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 19102113c9..d0e5aeb125 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-add-missing- > 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-add- > missing-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram- > desktop-add-missing-cstdint.patch > new file mode 100644 > index 0000000000..9dee9cf8e3 > --- /dev/null > +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-add-missing- > 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/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..977f72475f > --- /dev/null > +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-allow- > disabling-X11.patch > @@ -0,0 +1,123 @@ > +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... > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 2e081ae7..c269177b 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -24,13 +24,14 @@ 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) > + > + if (BUILD_SHARED_LIBS) > +     set(CMAKE_POSITION_INDEPENDENT_CODE ON) > +-    message(WARNING > ++    message(DEBUG > +         "tg_owt is a fork of Google's webrtc library and is > developed by them as a static library without stable ABI in mind." > +         "The feature of building tg_owt as a shared library is > community maintained, it may and will break at any time without > guarantee to work again." > +         "Please reconsider your decision. Good luck." > +@@ -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/telegram.scm b/gnu/packages/telegram.scm > index 25d6a3e226..d339bae017 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -30,6 +30,7 @@ (define-module (gnu packages telegram) >    #:use-module (gnu packages digest) >    #:use-module (gnu packages fcitx) >    #:use-module (gnu packages fcitx5) > +  #:use-module (gnu packages gl) >    #:use-module (gnu packages glib) >    #:use-module (gnu packages gnome) >    #:use-module (gnu packages gnupg) > @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) >    #:use-module (gnu packages linux) >    #:use-module (gnu packages lxqt) >    #:use-module (gnu packages lua) > +  #:use-module (gnu packages ninja) >    #:use-module (gnu packages perl) >    #:use-module (gnu packages pkg-config) >    #:use-module (gnu packages protobuf) > @@ -58,11 +60,13 @@ (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 utils) > +  #:use-module (guix gexp) >    #:use-module (guix git-download) >    #:use-module (guix build-system cmake) >    #:use-module (guix build-system copy) > @@ -83,9 +87,12 @@ (define-public abseil-cpp-for-webrtc-for-telegram- > desktop >            ((#:configure-flags flags) >             `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) > > +;; NOTE: Here's Telegram Desktop's official build guide. > +;; > https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode >  (define-public webrtc-for-telegram-desktop > -  (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") > -        (revision "166")) > +  (let ((abseil-cpp abseil-cpp-for-webrtc-for-telegram-desktop) > +        (commit "a5fbc9123e056e611e69acf0ceb4252ddd838adb") > +        (revision "167")) >      (hidden-package >       (package >         (name "webrtc-for-telegram-desktop") > @@ -96,94 +103,110 @@ (define-public webrtc-for-telegram-desktop >            (method git-fetch) >            (uri >             (git-reference > -            (url "https://github.com/desktop-app/tg_owt.git") > +            (url "https://github.com/desktop-app/tg_owt") >              (commit commit))) >            (file-name >             (git-file-name name version)) >            (sha256 > -           (base32 > "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) > +           (base32 > "12qirihhabv46vn27dpw7dz0smlngb7wqjpypa9fm6k2zvf5py32")) >            (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-add-missing-cstdint.patch" > +            ;; Picked from Gentoo's repository. > +            ;; TODO: There's also a patch for using standalone > crc32c, we can > +            ;; grab that patch once crc32c's been packaged. > +            "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" > +                     '(;; Custom forks which are incompatible with > the ones in Guix. > +                       "abseil-cpp" "libsrtp" "rnnoise" >                         ;; Not available in Guix. > -                       "pffft" "usrsctp" > -                       ;; Has cmake support files for libvpx input. > -                       "libvpx"))) > +                       "pffft"))) >                  (with-directory-excursion "src/third_party" >                    (for-each delete-file-recursively >                              (lset-difference string=? >                                               (scandir ".") > -                                             (cons* "." ".." > keep)))) > -                #t))))) > +                                             (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") > -          #: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))))) > -       (native-inputs > -        `(("perl" ,perl) > -          ("pkg-config" ,pkg-config) > -          ("python" ,python-wrapper) > -          ("yasm" ,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") > +              #:phases > +              #~(modify-phases %standard-phases > +                  (add-after 'unpack 'copy-inputs > +                    (lambda* (#:key inputs outputs #:allow-other- > keys) > +                      (let* ((libyuv-from (assoc-ref inputs > "libyuv")) > +                             (crc32c-from (assoc-ref inputs > "crc32c")) > +                             (libyuv-to (string-append (getcwd) > +                                                       > "/src/third_party/libyuv")) > +                             (crc32c-to (string-append (getcwd) > +                                                       > "/src/third_party/crc32c/src"))) > +                        (copy-recursively libyuv-from libyuv-to) > +                        (copy-recursively crc32c-from crc32c-to)))) > +                  (replace 'build > +                    (lambda* (#:key (make-flags '()) (parallel- > build? #t) > +                              #:allow-other-keys) > +                      (apply invoke "cmake" "--build" "." > +                             `(,@(if parallel-build? > +                                     `("-j" ,(number->string > (parallel-job-count))) > +                                     '()) > +                               ,@make-flags)))) > +                  (replace 'install > +                    (lambda* (#:key (make-flags '()) #:allow-other- > keys) > +                      (apply invoke "cmake" "--install" "." make- > flags)))))) >         (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))) > +        (let ((external-sources > +               `(("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")))) > +                 ("crc32c" > +                  ,(origin > +                     (method git-fetch) > +                     (uri (git-reference > +                           (url "https://github.com/google/crc32c") > +                           (commit > "21fc8ef30415a635e7351ffa0e5d5367943d4a94"))) > +                     (file-name > +                      (git-file-name "crc32c-for-webrtc-for- > telegram-desktop" version)) > +                     (sha256 > +                      (base32 > "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))))) > +          (modify-inputs external-sources > +            (prepend openh264           ;Required > +                     protobuf           ;TG_OWT_USE_PROTOBUF > +                     glib               ;TG_OWT_USE_PIPEWIRE > +                     libdrm > +                     libglvnd > +                     mesa > +                     pipewire-0.3 > +                     libxcomposite      ;TG_OWT_USE_X11 > +                     libxdamage > +                     libxext > +                     libxfixes > +                     libxrandr > +                     libxrender > +                     libxtst)))) > +       (native-inputs (list ninja python-wrapper pkg-config yasm)) > +       (propagated-inputs > +        (list abseil-cpp ffmpeg libjpeg-turbo libvpx openssl opus)) Avoid propagating inputs. Instead patch invocations where needed. >         (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.") > @@ -194,13 +217,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 > -- > 2.37.2 > Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 10:54:15 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 14:54:15 +0000 Received: from localhost ([127.0.0.1]:59850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIv0-0005PO-LS for submit@debbugs.gnu.org; Thu, 08 Sep 2022 10:54:14 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:34813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWIuy-0005PB-7E for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 10:54:13 -0400 Received: by mail-ed1-f65.google.com with SMTP id z21so14730937edi.1 for <57655@debbugs.gnu.org>; Thu, 08 Sep 2022 07:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date; bh=xi8bOpWcQaYez/z6o5gCPmKBqkyzbNfjXR1O+VoL9qI=; b=C/uOoXRYRQFd9XluqcRl418LSx3RX/dRmReLpcEIByXBRa6zYD2nV7l4xP3jMKaE/1 vryRvk58OJINj99bE7NffTEYNPBC0bQsobBjMHdPm+wCk9VbBOO+qLi+MQUpFnpEidFx EtiWNk/c5dXWLk3rmHCR18xvsX2lWI3m3I9ea4COfW+xHqaGp99IcOUfV2W6OH8JLQWd QK0nhNPF74nvMnfQKaEcCvaK4ZDQ5Ilz2C1l3i8/SPnQkrpObjrZtwUCBi92wMM23q1k dWxgAEjDtpycOLbxZYiASfKrpa9MfiSIc5/xPAAiivud6KU3ft5DzFF2AU606WXKhvFa 7Qdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date; bh=xi8bOpWcQaYez/z6o5gCPmKBqkyzbNfjXR1O+VoL9qI=; b=j6lU/Gt1zjzhBnxuqxvGAglVZaHfc/pKyZJdeYBsKawmndqeZFs6kuZW99YWl/Vwno KPt8/r8k76RSMZWkUN47K4Q37ExG2M9cYAkAVHYKsR7RPs+ujfv8GYCLjzF1Dgrx/dNm X0rQAz/RhT4x6At0u5yA+d4aX1QeHZeXNCkPM8Uq8GWvXKeSSHTEmQuh27ROIjcVWBWo knmiR6Ki8+PL1yn5emZLNq+ew8qBGbBP+8pJwAtxQtQ0P+eUIDVHA1zTc3MHJ+kPQy7C CAZFQLGip531h3SQrlLzmRcFm8zQzMw5oahV43npb2BBnifeTJa+LUBqP1C8pPnfG9he OxHg== X-Gm-Message-State: ACgBeo0SFG3OPiU0921Fy2+w2VfHkeYSLcF30IgL0t5qW6Qpk1SwLu9R R3jc1vdXFyFQMDUy+PZKPDY= X-Google-Smtp-Source: AA6agR7i+t2JzmZgv2M3/qTJR69rDVdY4gYK908nIbAZs9gcBuLhfrB5dyfPtgfFnAmgAzRgdk8pEA== X-Received: by 2002:aa7:c74d:0:b0:44f:d34:affb with SMTP id c13-20020aa7c74d000000b0044f0d34affbmr7124057eds.143.1662648846232; Thu, 08 Sep 2022 07:54:06 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f6-20020a0564021e8600b0043cc66d7accsm12411377edf.36.2022.09.08.07.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 07:54:05 -0700 (PDT) Message-ID: <8425a0cccd764c06a64580fd68cc85dc9722437a.camel@gmail.com> Subject: Re: [PATCH 5/5] gnu: telegram-desktop: Update to 4.1.1. From: Liliana Marie Prikler To: Hilton Chain , 57655@debbugs.gnu.org Date: Thu, 08 Sep 2022 16:54:05 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 08.09.2022 um 08:59 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (telegram-desktop): Update to 4.1.1. > [snippet]: > Don't keep SPMediaKeyTap and statusnotifieritem as they'd got removed > from > upstream. > Keep rlottie, libtgvoip and dispatch. Why keep rlottie and libtgvoip? We had packages for those (which fair enough, you removed, but still...) > [#:configure-flags]: > Comment out to default value > Use API id from official Snap builds. SGTM. > Enable DESKTOP_APP_USE_PACKAGED_LAZY, which is suitable for default > configuration as it'll bundle as many features as possible. > [#:phases]: > Copy dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie and > libtgvoip. We should *unbundle* those, not make the bundling worse. > Remove phase patch-cxx-flags, as that string's not there any more. > Replace build and install phases with ones that use cmake tools. Like with webrtc, use ninja if you like it better, but prefer invoking it as ninja :) > [native-inputs] > Add variable external-sources for managing recursive checkouts. > Bump cmake-helpers to source checkout-ed commit. > Add ninja and clang-toolchain. > [inputs] > Add variable external-sources for managing recursive checkouts. > Add dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie, libtgvoip to > external-sources. > Bump codegen, lib_base, lib_crl, lib_lottie, lib_qr, lib_rpl, > lib_spellcheck, > lib_storage, lib_tl, lib_ui, lib_waylandshells, lib_webrtc, > lib_webview and > tgcalls to source checkout-ed commit. > Add patch for lib_base to support musl compilation. > Style adjustment. I didn't mention this in 2/5, but try separating style changes from code changes. > [license] > Update with source tree changes. > > * gnu/packages/patches/lib-base-for-telegram-desktop-support- > musl.patch: New > file. > * gnu/local.mk: Add patch. > --- Again, avoid gratuitous vertical spaces, mention patches by name, yadda yadda. So I'm aware you're going to do a v2 anyway due to some tabs vs spaces issue, but I wanted you to know that there are more things to fix :) Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 11:29:07 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 15:29:07 +0000 Received: from localhost ([127.0.0.1]:59908 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWJSk-0006K0-Tx for submit@debbugs.gnu.org; Thu, 08 Sep 2022 11:29:07 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:33978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWJSi-0006JT-91 for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 11:29:05 -0400 Date: Thu, 08 Sep 2022 23:28:34 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1662650937; 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=tQsKCJvSidsH0mbtB2B2e7FMZhQCrHbBBEeIlIn14jw=; b=sMkeX4cR2E9s9v75kbBjKe7kr501BhTii7CExe80ncvXKify1WHE1D4R1ZPG0NvYjFJOHy +IOtHzMHDEN+8gMjBDgBx6WwO1rrWKP1719vr0u9L9V1ESaaG8Exoe4XOwnvnm0pwLV0cJ hF/pN7xupdc3MS8MEKvxnkyzhwsmNgfxG1C0QBTsJqYLPSleOW7G5hBptpoWMmPfct0lFG WsdWI+z5UmRzZlAfNkq7GdQE6136P9zag/ooPmezl2+IHIQ0/OXogaQ3K9Xr1gIb4JCf4I GliHNlmpDbBxaGPSWOmQuhPCz3JZdZlMeX3BwEPapg9O7U4CJmXYWFAnBtGy9g== Message-ID: From: Hilton Chain To: Liliana Marie Prikler Subject: Re: [PATCH 5/5] gnu: telegram-desktop: Update to 4.1.1. In-Reply-To: <8425a0cccd764c06a64580fd68cc85dc9722437a.camel@gmail.com> References: <8425a0cccd764c06a64580fd68cc85dc9722437a.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 Cc: 57655@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Why keep rlottie and libtgvoip? We had packages for those (which fair > enough, you removed, but still...) Telegram uses their own fork for these two.. (*_*) A lot to learn! Also a great learning chance. :) It's a bit late at my place, changes would come tommorrow. (^>^) Thanks! From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 12:17:11 2022 Received: (at 57655) by debbugs.gnu.org; 8 Sep 2022 16:17:11 +0000 Received: from localhost ([127.0.0.1]:59967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWKDG-0007f6-Te for submit@debbugs.gnu.org; Thu, 08 Sep 2022 12:17:11 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:43552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWKDD-0007er-WF for 57655@debbugs.gnu.org; Thu, 08 Sep 2022 12:17:09 -0400 Received: by mail-ej1-f66.google.com with SMTP id gb36so39175501ejc.10 for <57655@debbugs.gnu.org>; Thu, 08 Sep 2022 09:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date; bh=ksDELGD3Ccf7bwHGu7QHtFj2XC8Jcwz1JZvbbQAXiC0=; b=hXJeodOWQdMpfUygTGlWdOjnyzKKyGo5PG2DLXn8KQnQIE+TZVdEz0D3X1q3YX5FOD cC3pNxKyXo6g6LZzMkHC1On30VRzmnbq4FtIa8zsW1LTIBPQa55QYxkLWQ2l7VWaOnkC Z7wb3o7A7k3QffPX91dQ2oZi/GmjC5Er07RzurNJigu7CivL/UV8TZk6hyyjQGEH3iDy bIIor4ej4aJLb4+6n71zDdHrsSWx5w1Iy+Xm9+udnol/iNZ7bQUZXcQ3/ldDdeKSmkWt xfF+iTtbg3fTyOSuG747PJAUOZVZb5ENB+zUes3LZEraJfOBlj0ZgS4G8JLD36BH5TyI AZng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date; bh=ksDELGD3Ccf7bwHGu7QHtFj2XC8Jcwz1JZvbbQAXiC0=; b=Rd2rpFoLHnBVOk473jB340Gu7AJOJkjWImRRBJDdMpizaqG0/GX/9marF64mzSrPAi 6Y4KI0+kC4xcvIG6MthW2O274RD4Ip+//9nzeEVajC6AFE8QZT1DrLvUpOkSiX6JpgwX uDxMoI3PNEX/0R5Mi1jmIKL7F6Ugt+4pDLIMkyOQmBDFyktpTeZ/OVl9FVAHgVxRihKh tcIxbOtkYd9f9eI8UsQ/qjdUmTJVfS2BbeP9zHFqq1nyJ/y4XEnz548gdwcpYhLGRYDu BRUTAUBltpfESxDMFLKnPQpFhU2bbKo8lu1Z7RLKgIU66NNZOJD178fOrpFC/r5wSiAt iHiQ== X-Gm-Message-State: ACgBeo2/wFRyAdwQHQvejk6bOxALj0bq815YPbBLfLP0wDVoi6O8IT7z ba+2tVmEVEGxz4hBa5kZU3swYn2dPAw= X-Google-Smtp-Source: AA6agR7UaLqeK463Zm5GdWnOgeW3OBkjA5qJARlwbtN1WVpwX+reKmxtBDXbZYksOd3kPbye9tmt0g== X-Received: by 2002:a17:906:9c82:b0:6df:baa2:9f75 with SMTP id fj2-20020a1709069c8200b006dfbaa29f75mr6685505ejc.762.1662653821283; Thu, 08 Sep 2022 09:17:01 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id lc1-20020a170906dfe100b0073d638a7a89sm1420277ejc.99.2022.09.08.09.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 09:17:00 -0700 (PDT) Message-ID: <593163b2656317d0c02f44d2bd6ea9b9547b4c4e.camel@gmail.com> Subject: Re: [PATCH 5/5] gnu: telegram-desktop: Update to 4.1.1. From: Liliana Marie Prikler To: Hilton Chain Date: Thu, 08 Sep 2022 18:17:00 +0200 In-Reply-To: References: <8425a0cccd764c06a64580fd68cc85dc9722437a.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57655 Cc: 57655@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 08.09.2022 um 23:28 +0800 schrieb Hilton Chain: > > Why keep rlottie and libtgvoip?  We had packages for those (which > > fair > > enough, you removed, but still...) > > Telegram uses their own fork for these two.. (*_*) We hitherto built those forks outside of telegram. Is this no longer possible? From unknown Sat Aug 16 13:42:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 07 Oct 2022 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator