* [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1.
@ 2022-09-08 12:38 Hilton Chain via Guix-patches via
2022-09-08 12:40 ` [bug#57675] [PATCH v2 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop Hilton Chain via Guix-patches via
` (13 more replies)
0 siblings, 14 replies; 155+ messages in thread
From: Hilton Chain via Guix-patches via @ 2022-09-08 12:38 UTC (permalink / raw)
To: 57675
Hello Guix!
These patches update Telegram Desktop to its latest release, changes are
detailed in commit messages.
One noticable point is that I leave libtgvoip's build within telegram-desktop's
environment, since I'm unable to build it with all features enabled neither via
autotools nor cmake.
Actually bundled building of that's Telegram's prefered way "since it's a
legacy library and its upstream build scripts aren't adapted to build with
tg_owt"[fn:1]
That's all, have a good day! =D
[fn:1]: https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode
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 | 995 +++++++++---------
5 files changed, 702 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
^ permalink raw reply [flat|nested] 155+ messages in thread* [bug#57675] [PATCH v2 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via @ 2022-09-08 12:40 ` Hilton Chain via Guix-patches via 2022-09-08 12:41 ` [bug#57675] [PATCH v2 2/5] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via 2022-09-11 10:10 ` [bug#57675] [PATCH v3 0/7] " Hilton Chain via Guix-patches via ` (12 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-08 12:40 UTC (permalink / raw) To: 57675 * gnu/packages/telegram.scm (abseil-cpp-for-webrtc-for-telegram-desktop): New variable. --- gnu/packages/telegram.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4976acbc0c..d41ace6181 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,18 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define-public abseil-cpp-for-webrtc-for-telegram-desktop + (let ((base abseil-cpp)) + ;; Abseil built with pre C++17 standards enforcing would cause a linking + ;; issue when building Telegram Destop. (Currently it's by default 11, and + ;; has changed to 14 upstream.) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) -- 2.37.2 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v2 2/5] gnu: webrtc-for-telegram-desktop: Update to a5fbc9. 2022-09-08 12:40 ` [bug#57675] [PATCH v2 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-08 12:41 ` Hilton Chain via Guix-patches via 2022-09-08 12:42 ` [bug#57675] [PATCH v2 3/5] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-08 12:41 UTC (permalink / raw) To: 57675 * 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/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a5fbc9 and simplify inputs style. [source]: 1. Bump version to a5fbc9123e056e611e69acf0ceb4252ddd838adb. 2. Patch: Add missing <cstdint.h> header. 3. Patch: Add configure flag TG_OWT_USE_X11 for disabling X11. 4. Bundled 3rd-party libraries: Remove openh264 and libvpx for building with system libraries, Drop usrsctp which is no longer available in source. [#:configure-flags]: 1. Available flags with default values are written and commented out. [#:phases]: 1. Drop the use of libvpx source. 2. Add crc32c source (which is intended to be checked out recursively). 3. Build and install with cmake utility. [inputs]: 1. Use abseil-cpp-for-webrtc-for-telegram-desktop for abseil-cpp. 2. Use variable external-sources to manage source chekouts. 3. Add crc32c checkout. 4. Catalog inputs required by certain configure flags. 5. Drop unneeded inputs. [native-inputs]: 1. Add ninja for use with cmake. 2. Drop perl. [propagated-inputs]: 1. Move libraries also required by telegram-desktop here from inputs. [license]: 1. Sync with source tree changes. --- gnu/local.mk | 2 + ...telegram-desktop-add-missing-cstdint.patch | 21 +++ ...telegram-desktop-allow-disabling-X11.patch | 123 +++++++++++++ gnu/packages/telegram.scm | 172 ++++++++++-------- 4 files changed, 243 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 <xiretza@xiretza.xyz> +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 <cstdint> + + 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 d41ace6181..d66a286167 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) @@ -84,9 +88,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") @@ -97,94 +104,111 @@ (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, there's also a patch to use + ;; standalone crc32c(not packaged yet). + "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.") @@ -195,13 +219,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 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v2 3/5] gnu: Remove rlottie-for-telegram-desktop. 2022-09-08 12:41 ` [bug#57675] [PATCH v2 2/5] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via @ 2022-09-08 12:42 ` Hilton Chain via Guix-patches via 2022-09-08 12:42 ` [bug#57675] [PATCH v2 4/5] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-08 12:42 UTC (permalink / raw) To: 57675 * 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 d66a286167..c6db1e61ac 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -226,40 +226,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 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v2 4/5] gnu: Remove libtgvoip-for-telegram-desktop. 2022-09-08 12:42 ` [bug#57675] [PATCH v2 3/5] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-08 12:42 ` Hilton Chain via Guix-patches via 2022-09-08 12:42 ` [bug#57675] [PATCH v2 5/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-08 12:42 UTC (permalink / raw) To: 57675 * 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 c6db1e61ac..78ec2558c7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -226,47 +226,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 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v2 5/5] gnu: telegram-desktop: Update to 4.1.1. 2022-09-08 12:42 ` [bug#57675] [PATCH v2 4/5] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-08 12:42 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-08 12:42 UTC (permalink / raw) To: 57675 * gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch: New file. * gnu/local.mk: Add patch. * gnu/packages/telegram.scm (telegram-desktop): Update to 4.1.1 and simplify inputs style. [source]: 1. Patch: Add support for musl. 2. Bundled 3rd-party libraries: Add rlottie, libtgvoip and dispatch. Remove SPMediaKeyTap and statusnotifieritem which are no longer available in source. [#:configure-flags]: 1. Available flags with default values are written and commented out. 2. Use Telegram's API id for their Snap builds. 3. Build a generic package with DESKTOP_APP_USE_PACKAGED_LAZY on. [#:phases]: 1. Copy checkouts for dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie and libtgvoip into source. 2. Build and install with cmake utility. 3. Don't patch C++ flags as they are not there any more. [native-inputs] 1. Use variable external-sources to manage source chekouts. 2. Bump cmake-helpers checkout. 3. Add ninja for use with cmake. 4. Add clang-toolchain as it's suggested by Telegram, cmake would used it automatically. 5. Drop cmake-shared, extra-cmake-modules, glib:bin, gobject-introspection, gtk+:bin and qttools-5. [inputs] 1. Use variable external-sources to manage source chekouts. 2. Add checkouts for dispatch, fcitx-qt5, fcitx5-qt, hime, nimf, rlottie and libtgvoip. 3. Bump checkouts for 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. 4. Patch lib_base for musl support. 5. Drop unneeded inputs. [license] 1. Sync with source tree changes. --- 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-support-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 = \ %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-musl.patch b/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch 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 <sys/utsname.h> + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include <gnu/libc-version.h> + #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 = [&] { + const auto version = QString::fromLatin1(gnu_get_libc_version()); + return QVersionNumber::fromString(version).isNull() ? QString() : version; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 78ec2558c7..24f9b9bbfc 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; 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) @@ -229,339 +234,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=? - (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/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (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 <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) - (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-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ;No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + ;; see also <https://core.telegram.org/api/obtaining_api_id>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name) + + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + + ;; "-DDESKTOP_APP_USE_PACKAGED=ON" + ;; "-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_X11_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_SPELLCHECK=OFF" + ;; "-DDESKTOP_APP_USE_ENCHANT=OFF" + ;; "-DDESKTOP_APP_LOTTIE_USE_CACHE=ON" + + ;; "-DLIBTGVOIP_DISABLE_ALSA=OFF" + ;; "-DLIBTGVOIP_DISABLE_PULSEAUDIO=OFF" + + ;; Build all the available detected features in the build + ;; environment. + "-DDESKTOP_APP_USE_PACKAGED_LAZY=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + `(("cmake" ,(assoc-ref inputs "cmake-helpers")) + ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) + ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) + ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) + ("Telegram/lib_lottie" ,(assoc-ref inputs "lib-lottie-source")) + ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) + ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) + ("Telegram/lib_spellcheck" ,(assoc-ref inputs "lib-spellcheck-source")) + ("Telegram/lib_storage" ,(assoc-ref inputs "lib-storage-source")) + ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) + ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) + ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) + ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) + ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) + ("Telegram/ThirdParty/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 "rlottie-source")) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-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-count))) + '()) + ,@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-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (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" version)) + (sha256 + (base32 "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa281zk1"))))))) + (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" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (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 "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) + ("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 "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq6l10k5")) + (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 "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) + ("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" version)) + (sha256 + (base32 "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard76cgvsg")))) + ("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 "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) + ("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 "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) + ("lib-spellcheck-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck") + (commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060"))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" version)) + (sha256 + (base32 "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vhyjhbwh")))) + ("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" version)) + (sha256 + (base32 "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) + ("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 "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7sxcd96")))) + ("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 "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05hbybfcn")))) + ("lib-waylandshells-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandshells") + (commit "271290b93c65b6fb634cb9c69bff97f51b74f3a7"))) + (file-name + (git-file-name "lib-waylandshells-for-telegram-desktop" version)) + (sha256 + (base32 "02d966kbpqf029wwma17vicmc8n5iaksibaq6d81jmh770p2vsc9")))) + ("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" version)) + (sha256 + (base32 "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) + ("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" version)) + (sha256 + (base32 "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) + ("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 "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) + ("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 "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hwki941h")))) + ("dispatch-source" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch") + (commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73"))) + (file-name + (git-file-name "dispatch-for-telegram-desktop" version)) + (sha256 + (base32 "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn")))) + ("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 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i"))))))) + (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_INTEGRATION + 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 plugin) + ;; 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 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-08 12:40 ` [bug#57675] [PATCH v2 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-11 10:10 ` Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via 2022-09-11 11:10 ` [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler 2022-09-19 6:09 ` [bug#57675] [PATCH v4 00/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via ` (11 subsequent siblings) 13 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:10 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v2 -> v3: Clone recursively instead of define every single git submodule... I said "tomorrow", what a long day XDDDDDDDD. Hilton Chain (7): gnu: webrtc-for-telegram-desktop: Simplify inputs. gnu: telegram-desktop: Simplify inputs. gnu: Add abseil-cpp-cxxstd17. gnu: webrtc-for-telegram-desktop: Update to a5fbc9. gnu: telegram-desktop: Update to 4.1.1. gnu: Remove rlottie-for-telegram-desktop. gnu: Remove libtgvoip-for-telegram-desktop. gnu/local.mk | 3 + .../telegram-desktop-fix-gcc12-cstdint.patch | 10 + ...telegram-desktop-allow-disabling-X11.patch | 138 ++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 632 +++++------------- 5 files changed, 347 insertions(+), 457 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 072cc8d1415a2abf66b36249c61658a828dead88 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs. 2022-09-11 10:10 ` [bug#57675] [PATCH v3 0/7] " Hilton Chain via Guix-patches via @ 2022-09-11 10:11 ` Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 2/7] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-11 11:10 ` [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Simplify inputs. --- gnu/packages/telegram.scm | 84 +++++++++++---------------------------- 1 file changed, 23 insertions(+), 61 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 4976acbc0c..9bef94788b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -85,11 +85,12 @@ (define-public webrtc-for-telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/tg_owt.git") - (commit commit))) + (commit commit) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -99,79 +100,40 @@ (define-public webrtc-for-telegram-desktop '( ;; Custom forks which are incompatible with the ones in Guix. "abseil-cpp" "libsrtp" "openh264" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" + "pffft" "usrsctp" "libyuv" ;; Has cmake support files for libvpx input. "libvpx"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target #:configure-flags (list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((libvpx-from (assoc-ref inputs "libvpx")) - (libyuv-from (assoc-ref inputs "libyuv")) - (libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) + "-DCMAKE_CXX_FLAGS=-fPIC"))) (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 2/7] gnu: telegram-desktop: Simplify inputs. 2022-09-11 10:11 ` [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via @ 2022-09-11 10:11 ` Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop): Simplify inputs. --- gnu/packages/telegram.scm | 315 +++++++------------------------------- 1 file changed, 53 insertions(+), 262 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9bef94788b..6e7fa4a2ec 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -238,12 +238,12 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -256,8 +256,7 @@ (define-public telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -286,272 +285,64 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) + (for-each make-file-writable (find-files ".")))) (add-before 'configure 'patch-cxx-flags (lambda _ (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch-framework2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("glibmm" ,glibmm-2.64) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("jemalloc" ,jemalloc) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) + (list alsa-lib + c++-gsl + catch-framework2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib)) (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17. 2022-09-11 10:11 ` [bug#57675] [PATCH v3 2/7] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-11 10:11 ` Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 4/7] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via 2022-09-11 11:13 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/telegram.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6e7fa4a2ec..3b0444025c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,18 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + ;; Abseil built with pre C++17 standards enforcing would cause a linking + ;; issue when building Telegram Destop. (Currently it's by default 11, and + ;; has changed to 14 upstream.) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 4/7] gnu: webrtc-for-telegram-desktop: Update to a5fbc9. 2022-09-11 10:11 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-11 10:12 ` Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-11 11:13 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch: New file. * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a5fbc9123 e056e611e69acf0ceb4252ddd838adb. [patches]: Add webrtc-for-telegram-desktop-allow-disabling-X11.patch. Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Sync with source tree. Unbundle openh264 and libvpx. [arguments]: Comment out to default values. [native-inputs]: Drop perl. [inputs]: Drop alsa-lib, pulseaudio, libx11. Add abseil-cpp-cxxstd17, libvpx, openh264, libdrm, libglvnd, mesa. Replace pipewire with pipewire-0.3. [license]: Sync with source tree. * gnu/local.mk: Add patches --- gnu/local.mk | 2 + ...telegram-desktop-allow-disabling-X11.patch | 138 ++++++++++++++++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++ gnu/packages/telegram.scm | 68 +++++---- 4 files changed, 202 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 19102113c9..683f6bfe0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1966,6 +1966,8 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch new file mode 100644 index 0000000000..801b64a554 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-allow-disabling-X11.patch @@ -0,0 +1,138 @@ +From 6c28002ae4326db71980a3bfdf214d5df53d5b62 Mon Sep 17 00:00:00 2001 +From: Hilton Chain <hako@ultrarare.space> +Date: Fri, 9 Sep 2022 22:28:23 +0800 +Subject: [PATCH] Allow disabling X11 desktop capturing independently. + +Squashed commit of the following: + +commit 253b09a07520a3cecb3b88b2b7e8889ab3d9158d +Author: Hilton Chain <hako@ultrarare.space> +Date: Fri Sep 9 22:13:15 2022 +0800 + + Adapt the patch with cmake_dependent_option. + +commit f6631bb43f353c9eafe1b1aba093e116518aa12a +Author: Esteve Varela Colominas <esteve.varela@gmail.com> +Date: Sun, 27 Jun 2021 23:57:04 +0200 + + Add -DTG_OWT_USE_X11 + + Allows disabling X11 desktop capturing independently of pipewire support, for + the few people that run wayland without any X11 support whatsoever. + + This setup is untested, but supported by the GNI build system, see: + * src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions) + + Toggling the WEBRTC_USE_X11 define also affects some files under + src/modules/audio_device, but that falls under "X11 support", regardless... + + Use cmake_dependent_option to better declare variables that relate on other variables +--- + CMakeLists.txt | 42 ++++++++++++++++++++++++++++++++++---- + cmake/libwebrtcbuild.cmake | 12 ++++++----- + 2 files changed, 45 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e081ae7..2b09682a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,6 +24,7 @@ endif() + + option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF) + option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS}) ++cmake_dependent_option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON "UNIX; NOT APPLE" OFF) + cmake_dependent_option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture." ON "UNIX; NOT APPLE" OFF) + cmake_dependent_option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire for desktop capture." ${not_packaged_build} TG_OWT_USE_PIPEWIRE OFF) + option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF) +@@ -96,6 +97,10 @@ endif() + add_library(tg_owt) + init_target(tg_owt) + ++if (TG_OWT_USE_X11) ++ link_x11(tg_owt) ++endif() ++ + if (TG_OWT_USE_PIPEWIRE) + if (TG_OWT_DLOPEN_PIPEWIRE) + include(cmake/generate_stubs.cmake) +@@ -188,10 +193,6 @@ endif() + include(cmake/libwebrtcbuild.cmake) + target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild) + +-if (UNIX AND NOT APPLE) +- link_x11(tg_owt) +-endif() +- + function(add_sublibrary postfix) + add_library(tg_owt_${postfix} OBJECT) + init_feature_target(tg_owt_${postfix} ${postfix}) +@@ -2369,6 +2370,39 @@ if (NOT TG_OWT_USE_PROTOBUF) + ) + endif() + ++if (NOT TG_OWT_USE_X11) ++ remove_target_sources(tg_owt ${webrtc_loc} ++ # src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions) ++ modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc ++ modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.h ++ modules/desktop_capture/linux/x11/screen_capturer_x11.cc ++ modules/desktop_capture/linux/x11/screen_capturer_x11.h ++ modules/desktop_capture/linux/x11/shared_x_display.cc ++ modules/desktop_capture/linux/x11/shared_x_display.h ++ modules/desktop_capture/linux/x11/window_capturer_x11.cc ++ modules/desktop_capture/linux/x11/window_capturer_x11.h ++ modules/desktop_capture/linux/x11/window_finder_x11.cc ++ modules/desktop_capture/linux/x11/window_finder_x11.h ++ modules/desktop_capture/linux/x11/window_list_utils.cc ++ modules/desktop_capture/linux/x11/window_list_utils.h ++ modules/desktop_capture/linux/x11/x_atom_cache.cc ++ modules/desktop_capture/linux/x11/x_atom_cache.h ++ modules/desktop_capture/linux/x11/x_error_trap.cc ++ modules/desktop_capture/linux/x11/x_error_trap.h ++ modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc ++ modules/desktop_capture/linux/x11/x_server_pixel_buffer.h ++ modules/desktop_capture/linux/x11/x_window_property.cc ++ modules/desktop_capture/linux/x11/x_window_property.h ++ ++ # screen_drawer_linux.cc depends on x11, rest are revdeps ++ modules/desktop_capture/screen_drawer.cc ++ modules/desktop_capture/screen_drawer.h ++ modules/desktop_capture/screen_drawer_linux.cc ++ modules/desktop_capture/screen_drawer_lock_posix.cc ++ modules/desktop_capture/screen_drawer_lock_posix.h ++ ) ++endif() ++ + if (NOT TG_OWT_USE_PIPEWIRE) + remove_target_sources(tg_owt ${webrtc_loc} + modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc +diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake +index 4d037f4b..388b7aa9 100644 +--- a/cmake/libwebrtcbuild.cmake ++++ b/cmake/libwebrtcbuild.cmake +@@ -29,6 +29,13 @@ INTERFACE + BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0 + ) + ++if (TG_OWT_USE_X11) ++ target_compile_definitions(libwebrtcbuild ++ INTERFACE ++ WEBRTC_USE_X11 ++ ) ++endif() ++ + if (TG_OWT_USE_PIPEWIRE) + target_compile_definitions(libwebrtcbuild + INTERFACE +@@ -65,11 +72,6 @@ else() + INTERFACE + WEBRTC_MAC + ) +- else() +- target_compile_definitions(libwebrtcbuild +- INTERFACE +- WEBRTC_USE_X11 +- ) + endif() + + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 3b0444025c..cdd3816082 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,10 +60,12 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -85,8 +89,8 @@ (define-public abseil-cpp-cxxstd17 `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "a5fbc9123e056e611e69acf0ceb4252ddd838adb") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -103,49 +107,61 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2")) + (base32 "1hzck63spjjkqzkj0mlrxygrix4lw0n3i5cmc0vkxaphfzawz74n")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch" + ;; https://github.com/desktop-app/tg_owt/pull/107 + "webrtc-for-telegram-desktop-allow-disabling-X11.patch")) (snippet `(begin (let ((keep '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + "abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" "libyuv" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "libyuv" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Force using standalone openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No target - #:configure-flags - (list - "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC"))) - (native-inputs - (list perl pkg-config python-wrapper yasm)) + (list #:tests? #f ; No target + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + ;; #:configure-flags + ;; #~'("-DTG_OWT_USE_PIPEWIRE=ON" + ;; "-DTG_OWT_USE_X11=ON" + ;; "-DTG_OWT_USE_PROTOBUF=ON") + )) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -157,13 +173,11 @@ (define-public webrtc-for-telegram-desktop license:asl2.0 ;; LibYuv (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") - ;; OpenH264 - license:bsd-2 ;; PFFFT (license:non-copyleft "file:///src/third_party/pffft/LICENSE") ;; RnNoise license:gpl3 - ;; LibSRTP, LibVPx, UsrSCTP and Others + ;; LibSRTP, Crc32c and Others license:bsd-3)))))) (define-public rlottie-for-telegram-desktop -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-11 10:12 ` [bug#57675] [PATCH v3 4/7] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via @ 2022-09-11 10:12 ` Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 6/7] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-11 11:17 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/packages/telegram.scm (telegram-desktop): Update to 4.1.1. [patches]: Add telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Sync with source tree. Add libtgvoip, rlottie and dispatch. [arguments]: Use App ID from Telegram's official Snap builds. Comment out to default configurations. Drop unneeded phases. [native-inputs]: Drop cmake-shared, extra-cmake-modules, glib:bin, gtk+:bin and qttools-5. [inputs]: Drop libexpected, fcitx-qt5, fcitx5-qt, glib, hime, gtk+, kwayland, libx11, catch-framework2, materialdecoration, nimf, qt5ct, libdbusmenu-qt, qtbase-5, libtgvoip-for-telegram-desktop and rlottie-for-telegram-desktop. Add abseil-cpp-cxxstd17, qt5compat, qtbase, qtwayland, wayland, webkitgtk and libvpx. [propageted-inputs]: Drop dconf. [license]: Sync with source tree. * gnu/local.mk: Add patch. --- gnu/local.mk | 1 + .../telegram-desktop-fix-gcc12-cstdint.patch | 10 + gnu/packages/telegram.scm | 175 ++++++++++-------- 3 files changed, 105 insertions(+), 81 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 683f6bfe0d..1247a09a8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1868,6 +1868,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..a3d67e0c9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,10 @@ +--- a/Telegram/ThirdParty/tgcalls/tgcalls/utils/gzip.h ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/utils/gzip.h +@@ -2,6 +2,7 @@ + #define TGCALLS_UTILS_GZIP_H + + #include <absl/types/optional.h> ++#include <cstdint> + #include <vector> + + namespace tgcalls { diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index cdd3816082..b943b3c4a2 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> -;;; +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages digest) + #:use-module (gnu packages enchant) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) #:use-module (gnu packages freedesktop) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -258,7 +260,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.1.1") (source (origin (method git-fetch) @@ -269,16 +271,25 @@ (define-public telegram-desktop (recursive? #t))) (file-name (git-file-name name version)) + (patches + (search-patches + ;; Cherry-picked from upstream, remove when bumping. + "telegram-desktop-fix-gcc12-cstdint.patch")) (sha256 - (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) + (base32 "0b8nwimks6hfnb3bqik8d4s9z689hhj4p9ykqgc36pmpr54nyma8")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet `(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Own fork, legacy library only used for backward + ;; compatibility. + "libtgvoip" + ;; Own fork with custom API. + "rlottie" + ;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -286,102 +297,104 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - `(#:tests? #f ; No target - #:imported-modules - (,@%qt-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules - ((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) - (guix build utils) - (ice-9 match)) - #:configure-flags - (list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") - `(,gtk+ "bin") - pkg-config - python-wrapper - qttools-5)) + (list #:tests? #f ;No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + ;; see also <https://core.telegram.org/api/obtaining_api_id>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name) + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + ;; "-DDESKTOP_APP_LOTTIE_USE_CACHE=ON" + ;; "-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_X11_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_USE_ALLOCATION_TRACER=OFF" + ;; "-DDESKTOP_APP_USE_PACKAGED=ON" + ;; "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" + ;; "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + ;; "-DDESKTOP_APP_DISABLE_SPELLCHECK=OFF" + ;; "-DDESKTOP_APP_USE_HUNSPELL_ONLY=OFF" + ;; "-DDESKTOP_APP_USE_ENCHANT=OFF" + ;; "-DDESKTOP_APP_NO_PDB=OFF" + ;; "-DDESKTOP_APP_DISABLE_JEMALLOC=OFF" + ) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs (list pkg-config python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch-framework2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 - rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs - (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_USE_ENCHANT + ;; enchant + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") - (license - (list - ;; ThirdParty - license:lgpl2.1+ - ;; Others - license:gpl3+)))) + (license (list + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/rlottie/src/vector/pixman + ;; Telegram/ThirdParty/rlottie/src/vector/stb + ;; Telegram/ThirdParty/rlottie/src/vector/rapidjson + license:expat + ;; Telegram/ThirdParty/rlottie/src/vector/freetype + license:freetype + ;; Telegram/ThirdParty/rlottie + ;; Telegram/ThirdParty/rlottie/src/vector + license:lgpl2.1+ + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 + ;; Others + license:gpl3+)))) (define-public tl-parser (let ((commit "1933e76f8f4fb74311be723b432e4c56e3a5ec06") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 6/7] gnu: Remove rlottie-for-telegram-desktop. 2022-09-11 10:12 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via @ 2022-09-11 10:12 ` Hilton Chain via Guix-patches via 2022-09-11 10:13 ` [bug#57675] [PATCH v3 7/7] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-11 11:17 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * 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 b943b3c4a2..16937de86b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -182,40 +182,6 @@ (define-public webrtc-for-telegram-desktop ;; LibSRTP, Crc32c and Others license:bsd-3)))))) -(define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) - (hidden-package - (package - (inherit rlottie) - (version - (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/rlottie.git") - (commit commit))) - (file-name - (git-file-name "rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) - (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") (revision "88")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 7/7] gnu: Remove libtgvoip-for-telegram-desktop. 2022-09-11 10:12 ` [bug#57675] [PATCH v3 6/7] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-11 10:13 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 10:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * 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 16937de86b..94c0492294 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -182,47 +182,6 @@ (define-public webrtc-for-telegram-desktop ;; LibSRTP, Crc32c and Others license:bsd-3)))))) -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) - (define-public telegram-desktop (package (name "telegram-desktop") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-11 10:12 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 6/7] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-11 11:17 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-11 11:17 UTC (permalink / raw) To: Hilton Chain, 57675 Am Sonntag, dem 11.09.2022 um 18:12 +0800 schrieb Hilton Chain: > [arguments]: Use App ID from Telegram's official Snap builds. This patch should probably be separated from the rest here. As for the rest, the same complaints as in v2 apply. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17. 2022-09-11 10:11 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 4/7] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via @ 2022-09-11 11:13 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-11 11:13 UTC (permalink / raw) To: Hilton Chain, 57675 Am Sonntag, dem 11.09.2022 um 18:11 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (abseil-cpp-cxxstd17): New variable. > --- > gnu/packages/telegram.scm | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 6e7fa4a2ec..3b0444025c 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) > #:use-module (gnu packages xorg) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > + #:use-module (guix utils) > #:use-module (guix git-download) > #:use-module (guix build-system cmake) > #:use-module (guix build-system copy) > @@ -71,6 +72,18 @@ (define-module (gnu packages telegram) > #:use-module (guix build-system python) > #:use-module (guix build-system qt)) > > +(define-public abseil-cpp-cxxstd17 > + (let ((base abseil-cpp)) > + ;; Abseil built with pre C++17 standards enforcing would cause a > linking > + ;; issue when building Telegram Destop. (Currently it's by > default 11, and > + ;; has changed to 14 upstream.) > + (hidden-package > + (package/inherit base > + (arguments > + (substitute-keyword-arguments (package-arguments base) > + ((#:configure-flags flags) > + `(cons* "-DCMAKE_CXX_STANDARD=17" ,flags)))))))) > + For the record, this ought to be placed near abseil-cpp, because the semantics of inheritance can screw you over cross-module. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-11 10:10 ` [bug#57675] [PATCH v3 0/7] " Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via @ 2022-09-11 11:10 ` Liliana Marie Prikler 2022-09-11 13:41 ` Hilton Chain via Guix-patches via 1 sibling, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-11 11:10 UTC (permalink / raw) To: Hilton Chain, 57675 Am Sonntag, dem 11.09.2022 um 18:10 +0800 schrieb Hilton Chain: > > v2 -> v3: Clone recursively instead of define every single git > submodule... Hard pass. We ought to decrease bundling, not make it worse. ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-11 11:10 ` [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler @ 2022-09-11 13:41 ` Hilton Chain via Guix-patches via 2022-09-11 14:08 ` Liliana Marie Prikler 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-11 13:41 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 hmmm..., then how about those bunch of stuff named in lib_xxx (other than libs contained in a "Third Party" directory)? I don't think it's necessary to define a variable for each of them... Thanks ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-11 13:41 ` Hilton Chain via Guix-patches via @ 2022-09-11 14:08 ` Liliana Marie Prikler 0 siblings, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-11 14:08 UTC (permalink / raw) To: Hilton Chain; +Cc: 57675 Am Sonntag, dem 11.09.2022 um 21:41 +0800 schrieb Hilton Chain: > hmmm..., then how about those bunch of stuff named in lib_xxx (other > than libs contained in a "Third > Party" directory)? I don't think it's necessary to define a variable > for each of them... You could declare a variable for all of them, a list of origins, and then unpack them with a for-each as is currently done. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 00/10] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-08 12:40 ` [bug#57675] [PATCH v2 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-11 10:10 ` [bug#57675] [PATCH v3 0/7] " Hilton Chain via Guix-patches via @ 2022-09-19 6:09 ` Hilton Chain via Guix-patches via 2022-09-19 6:10 ` [bug#57675] [PATCH v4 01/10] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via 2022-09-19 23:32 ` [bug#57675] [PATCH v5 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via ` (10 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:09 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v3 -> v4: 1. Move abseil-cpp-cxxstd17 to cpp.scm. 2. Split commits. 3. Define variables for sources. 4. Update kcoreaddons. 5. Bump to 4.2.0. Hilton Chain (10): gnu: webrtc-for-telegram-desktop: Simplify inputs. gnu: telegram-desktop: Simplify inputs. gnu: telegram-desktop: Change Api ID. gnu: webrtc-for-telegram-desktop: Use gexp. gnu: telegram-desktop: Use gexp. gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3d. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 1 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 804 ++++++++---------- 5 files changed, 395 insertions(+), 463 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: f7565101e49102da6f87ad92e4644ae7996515ab -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 01/10] gnu: webrtc-for-telegram-desktop: Simplify inputs. 2022-09-19 6:09 ` [bug#57675] [PATCH v4 00/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-19 6:10 ` Hilton Chain via Guix-patches via 2022-09-19 6:11 ` [bug#57675] [PATCH v4 02/10] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:10 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (webrtc-for-telegram-desktop)[source,#:phases]: Remove unneeded #t. [native-inputs,inputs]: Simplify inputs. --- gnu/packages/telegram.scm | 93 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1a22d230d2..3a46ab086c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -106,8 +106,7 @@ (define-public webrtc-for-telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target @@ -126,52 +125,52 @@ (define-public webrtc-for-telegram-desktop (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (copy-recursively libyuv-from libyuv-to))))))) + (native-inputs (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (modify-inputs + `(("libvpx" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) + (file-name + (git-file-name + "libvpx-for-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) + ("libyuv" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) + (file-name + (git-file-name + "libyuv-for-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + (append alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst))) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 02/10] gnu: telegram-desktop: Simplify inputs. 2022-09-19 6:10 ` [bug#57675] [PATCH v4 01/10] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via @ 2022-09-19 6:11 ` Hilton Chain via Guix-patches via 2022-09-19 6:11 ` [bug#57675] [PATCH v4 03/10] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop)[source,#:phases]: Remove unneeded #t. [native-inputs,inputs]: Simplify inputs. --- gnu/packages/telegram.scm | 468 +++++++++++++++++++------------------- 1 file changed, 232 insertions(+), 236 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 3a46ab086c..cd25897634 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -293,8 +293,7 @@ (define-public telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -323,8 +322,7 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-inputs (lambda* (#:key inputs outputs #:allow-other-keys) (for-each @@ -351,246 +349,244 @@ (define-public telegram-desktop ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) (add-before 'configure 'patch-cxx-flags (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (modify-inputs + `(("cmake-helpers" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (file-name + (git-file-name + "cmake-helpers-for-telegram-desktop" version)) + (sha256 + (base32 + "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) + (append cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5))) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("glibmm" ,glibmm-2.64) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("jemalloc" ,jemalloc) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (modify-inputs + `(("codegen-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (file-name + (git-file-name "codegen" version)) + (sha256 + (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + ("lib-base-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (file-name + (git-file-name "lib-base-for-telegram-desktop" version)) + (sha256 + (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + ("lib-crl-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (file-name + (git-file-name "lib-crl-for-telegram-desktop" version)) + (sha256 + (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + ("lib-lottie-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (file-name + (git-file-name "lib-lottie-for-telegram-desktop" version)) + (sha256 + (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + ("lib-qr-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (file-name + (git-file-name "lib-qr-for-telegram-desktop" version)) + (sha256 + (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + ("lib-rlottie-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) + (file-name + (git-file-name "lib-rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + ("lib-rpl-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (file-name + (git-file-name "lib-rpl-for-telegram-desktop" version)) + (sha256 + (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + ("lib-spellcheck-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" version)) + (sha256 + (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + ("lib-storage-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (file-name + (git-file-name "lib-storage-for-telegram-desktop" version)) + (sha256 + (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + ("lib-tl-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (file-name + (git-file-name "lib-tl-for-telegram-desktop" version)) + (sha256 + (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + ("lib-ui-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (file-name + (git-file-name "lib-ui-for-telegram-desktop" version)) + (sha256 + (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + ("lib-waylandshells-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_waylandshells.git") + (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) + (file-name + (git-file-name "lib-waylandshells-for-telegram-desktop" version)) + (sha256 + (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + ("lib-webrtc-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (file-name + (git-file-name "lib-webrtc-for-telegram-desktop" version)) + (sha256 + (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + ("lib-webview-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (file-name + (git-file-name "lib-webview-for-telegram-desktop" version)) + (sha256 + (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + ("tgcalls-source" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (file-name + (git-file-name "tgcalls-for-telegram-desktop" version)) + (sha256 + (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + (append alsa-lib + c++-gsl + catch2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib))) + (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 03/10] gnu: telegram-desktop: Change API ID. 2022-09-19 6:11 ` [bug#57675] [PATCH v4 02/10] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-19 6:11 ` Hilton Chain via Guix-patches via 2022-09-19 6:12 ` [bug#57675] [PATCH v4 04/10] gnu: webrtc-for-telegram-desktop: Use gexp Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler [#:configure-flags]: Use API ID from Telegram's official Snap builds. --- gnu/packages/telegram.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index cd25897634..cfa0d1c673 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -308,12 +308,10 @@ (define-public telegram-desktop (ice-9 match)) #:configure-flags (list - ;; Client applications must provide their own API-ID and API-HASH, + ;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" ;; Disable WebkitGTK support as it fails to link "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" ;; Use bundled fonts as fallback. -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 04/10] gnu: webrtc-for-telegram-desktop: Use gexp. 2022-09-19 6:11 ` [bug#57675] [PATCH v4 03/10] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via @ 2022-09-19 6:12 ` Hilton Chain via Guix-patches via 2022-09-19 6:12 ` [bug#57675] [PATCH v4 05/10] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (source-for-telegram-desktop, libvpx-for-telegram-desktop,libyuv-for-telegram-desktop): New variables. (webrtc-for-telegram-desktop)[#:phases]: Copy sources with gexp. [inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 116 ++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 60 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index cfa0d1c673..e6766d84eb 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,33 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define* (source-for-telegram-desktop #:key name url revision commit hash) + (let ((name (string-append name "-for-telegram-desktop")) + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url url) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 hash))))) + +(define libvpx-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://chromium.googlesource.com/webm/libvpx" + #:revision "0" + #:commit "5b63f0f821e94f8072eb483014cfc33b05978bb9" + #:hash "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68" + #:name "libvpx")) + +(define libyuv-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://chromium.googlesource.com/libyuv/libyuv" + #:revision "0" + #:commit "ad890067f661dc747a975bc55ba3767fe30d4452" + #:hash "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll" + #:name "libyuv")) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -109,68 +137,36 @@ (define-public webrtc-for-telegram-desktop (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No target - #:configure-flags - (list - "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((libvpx-from (assoc-ref inputs "libvpx")) - (libyuv-from (assoc-ref inputs "libyuv")) - (libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to))))))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-sources + (lambda _ + (let* ((libvpx-to (string-append (getcwd) "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) + (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) (native-inputs (list perl pkg-config python-wrapper yasm)) (inputs - (modify-inputs - `(("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name - "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name - "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) - (append alsa-lib - ffmpeg - libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr - openssl - opus - pipewire - protobuf - pulseaudio - libx11 - libxext - libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 05/10] gnu: telegram-desktop: Use gexp. 2022-09-19 6:12 ` [bug#57675] [PATCH v4 04/10] gnu: webrtc-for-telegram-desktop: Use gexp Hilton Chain via Guix-patches via @ 2022-09-19 6:12 ` Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 06/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop, codegen-for-telegram-desktop,lib-base-for-telegram-desktop, lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop, lib-qr-for-telegram-desktop,lib-rlottie-for-telegram-desktop, lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop, lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop, lib-ui-for-telegram-desktop,lib-waylandshells-for-telegram-desktop, lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop, tgcalls-for-telegram-desktop): New variables. (telegram-desktop)[#:phases]: Copy sources with gexp. [native-inputs,inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 515 +++++++++++++++++--------------------- 1 file changed, 229 insertions(+), 286 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index e6766d84eb..f56cbaf23a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -99,6 +99,134 @@ (define libyuv-for-telegram-desktop #:hash "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll" #:name "libyuv")) +(define cmake-helpers-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/cmake_helpers.git" + #:revision "0" + #:commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72" + #:hash "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5" + #:name "cmake-helpers")) + +(define codegen-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/codegen.git" + #:revision "0" + #:commit "248614b49cd7d5aff69d75a737f2e35b79fbb119" + #:hash "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk" + #:name "codegen")) + +(define lib-base-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_base.git" + #:revision "0" + #:commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6" + #:hash "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78" + #:name "lib-base")) + +(define lib-crl-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_crl.git" + #:revision "0" + #:commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f" + #:hash "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz" + #:name "lib-crl")) + +(define lib-lottie-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_lottie.git" + #:revision "0" + #:commit "0770df009db7928df1d0cad0900dc5110106d229" + #:hash "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb" + #:name "lib-lottie")) + +(define lib-qr-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_qr.git" + #:revision "0" + #:commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189" + #:hash "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0" + #:name "lib-qr")) + +(define lib-rlottie-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_rlottie.git" + #:revision "0" + #:commit "0671bf70547381effcf442ec9618e04502a8adbc" + #:hash "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv" + #:name "lib-rlottie")) + +(define lib-rpl-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_rpl.git" + #:revision "0" + #:commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617" + #:hash "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn" + #:name "lib-rpl")) + +(define lib-spellcheck-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_spellcheck.git" + #:revision "0" + #:commit "68c9b788958904aea7de79f986a0f82ec8c5b094" + #:hash "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn" + #:name "lib-spellcheck")) + +(define lib-storage-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_storage.git" + #:revision "0" + #:commit "403df6c4a29562bd417c92d410e49819f5a48cc1" + #:hash "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5" + #:name "lib-storage")) + +(define lib-tl-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_tl.git" + #:revision "0" + #:commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb" + #:hash "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m" + #:name "lib-tl")) + +(define lib-ui-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_ui.git" + #:revision "0" + #:commit "1b590f9e16eb9571a039f072d6fea66c607e419f" + #:hash "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f" + #:name "lib-ui")) + +(define lib-waylandshells-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_waylandshells.git" + #:revision "0" + #:commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7" + #:hash "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf" + #:name "lib-waylandshells")) + +(define lib-webrtc-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_webrtc.git" + #:revision "0" + #:commit "ef49f953f12b112008a094a719f40939aaf39db4" + #:hash "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw" + #:name "lib-webrtc")) + +(define lib-webview-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/desktop-app/lib_webview.git" + #:revision "0" + #:commit "e06427c624515485774e2e2181d4afeb05ad5a67" + #:hash "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4" + #:name "lib-webview")) + +(define tgcalls-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/TelegramMessenger/tgcalls.git" + #:revision "0" + #:commit "81e97fa52e25b7775b62ce07bb653533d81e91b3" + #:hash "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj" + #:name "tgcalls")) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -292,294 +420,109 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - `(#:tests? #f ; No target - #:imported-modules - (,@%qt-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules - ((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) - (guix build utils) - (ice-9 match)) - #:configure-flags - (list - ;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - "-DTDESKTOP_API_ID=611335" - "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ; No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + ;; see also <https://core.telegram.org/api/obtaining_api_id>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + ;; Disable WebkitGTK support as it fails to link + "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" + ;; Use bundled fonts as fallback. + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-sources + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + '(("cmake" #$cmake-helpers-for-telegram-desktop) + ("Telegram/codegen" #$codegen-for-telegram-desktop) + ("Telegram/lib_base" #$lib-base-for-telegram-desktop) + ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) + ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) + ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) + ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) + ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) + ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) + ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) + ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) + ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) + ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) + ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) + ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-before 'configure 'patch-cxx-flags + (lambda _ + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (modify-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name - "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) - (append cmake-shared - extra-cmake-modules - `(,glib "bin") - `(,gtk+ "bin") - pkg-config - python-wrapper - qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - (modify-inputs - `(("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) - (append alsa-lib - c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt - ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell - jemalloc - kwayland - libdbusmenu-qt - libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration - minizip - nimf - openal - openssl - opus - pulseaudio - qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct - qtimageformats - qtwayland - range-v3 - rlottie-for-telegram-desktop - rnnoise - webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms - xxhash - zlib))) + (list alsa-lib + c++-gsl + catch2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib)) (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 06/10] gnu: Add abseil-cpp-cxxstd17. 2022-09-19 6:12 ` [bug#57675] [PATCH v4 05/10] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-19 6:13 ` Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 07/10] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 07/10] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-19 6:13 ` [bug#57675] [PATCH v4 06/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-19 6:13 ` Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: Update to 5.98.0. 2022-09-19 6:13 ` [bug#57675] [PATCH v4 07/10] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-19 6:13 ` Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 09/10] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via 2022-09-19 17:07 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: Update to 5.98.0 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [#:phases]: Update blocklist for failing tests. Remove unneeded #t. --- gnu/packages/kde-frameworks.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,21 +602,12 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 09/10] gnu: webrtc-for-telegram-desktop: Update to 621f3d. 2022-09-19 6:13 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: " Hilton Chain via Guix-patches via @ 2022-09-19 6:13 ` Hilton Chain via Guix-patches via 2022-09-19 6:14 ` [bug#57675] [PATCH v4 10/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-19 17:07 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: Update to 5.98.0 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3d. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. use system openh264. [#:configure-flags]: Comment out with default values. [native-inputs]: Drop perl. [inputs]: Replace pipewire with pipewire-0.3. Drop alsa-lib, libx11 and pulseaudio. Add abseil-cpp-cxxstd17, libvpx, openh264, libdrm, libglvnd, mesa, libxfixes. [snippet,#:phases,license]: Sync with source tree. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++ gnu/packages/telegram.scm | 103 ++++++++++-------- 3 files changed, 80 insertions(+), 45 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 542c06e221..ddbfe7de30 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1967,6 +1967,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index f56cbaf23a..7542f6cd17 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -83,14 +86,6 @@ (define* (source-for-telegram-desktop #:key name url revision commit hash) (file-name (git-file-name name version)) (sha256 (base32 hash))))) -(define libvpx-for-telegram-desktop - (source-for-telegram-desktop - #:url "https://chromium.googlesource.com/webm/libvpx" - #:revision "0" - #:commit "5b63f0f821e94f8072eb483014cfc33b05978bb9" - #:hash "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68" - #:name "libvpx")) - (define libyuv-for-telegram-desktop (source-for-telegram-desktop #:url "https://chromium.googlesource.com/libyuv/libyuv" @@ -99,6 +94,14 @@ (define libyuv-for-telegram-desktop #:hash "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll" #:name "libyuv")) +(define crc32c-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/google/crc32c" + #:revision "0" + #:commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94" + #:hash "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4" + #:name "crc32c")) + (define cmake-helpers-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/cmake_helpers.git" @@ -228,8 +231,8 @@ (define tgcalls-for-telegram-desktop #:name "tgcalls")) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -245,55 +248,67 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" - ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) - (with-directory-excursion "src/third_party" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '("abseil-cpp" "libsrtp" "rnnoise" + ;; Not available in Guix. + "crc32c" "pffft"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list #:tests? #f ; No target - #:configure-flags - #~`("-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") + (list #:tests? #f ; No target + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + ;; #:configure-flags + ;; #~'("-DTG_OWT_USE_PIPEWIRE=ON" + ;; "-DTG_OWT_USE_X11=ON" + ;; "-DTG_OWT_USE_PROTOBUF=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-sources (lambda _ - (let* ((libvpx-to (string-append (getcwd) "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) - (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -305,13 +320,11 @@ (define-public webrtc-for-telegram-desktop license:asl2.0 ;; LibYuv (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") - ;; OpenH264 - license:bsd-2 ;; PFFFT (license:non-copyleft "file:///src/third_party/pffft/LICENSE") ;; RnNoise license:gpl3 - ;; LibSRTP, LibVPx, UsrSCTP and Others + ;; LibSRTP, Crc32c and Others license:bsd-3)))))) (define-public rlottie-for-telegram-desktop -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 10/10] gnu: telegram-desktop: Update to 4.2.0. 2022-09-19 6:13 ` [bug#57675] [PATCH v4 09/10] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via @ 2022-09-19 6:14 ` Hilton Chain via Guix-patches via 2022-09-19 17:11 ` Liliana Marie Prikler 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 6:14 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop): Update to b9f1b6. (codegen-for-telegram-desktop): Update to 8815d7. (lib-base-for-telegram-desktop): Update to cc5550. (lib-crl-for-telegram-desktop): Update to 4e620b. (lib-lottie-for-telegram-desktop): Update to 6ed1c2. (lib-qr-for-telegram-desktop): Update to 501f4c. (lib-rpl-for-telegram-desktop): Update to fd31f5. (lib-spellcheck-for-telegram-desktop): Update to 0e386e. (lib-storage-for-telegram-desktop): Update to 839609. (lib-tl-for-telegram-desktop): Update to 36fb95. (lib-ui-for-telegram-desktop): Update to f82162. (lib-webrtc-for-telegram-desktop): Update to 9b1159. (lib-webview-for-telegram-desktop): Update to 546df6. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop): Remove variables. (tgcalls-for-telegram-desktop): Update to 82c492. (dispatch-for-telegram-desktop): New variable. (rlottie-for-telegram-desktop): Update to 8c69fc. [snippet]: Switch off werror. [arguments]: Use inherited ones. (libtgvoip-for-telegram-desktop): Update to 78a8e2. Change to source. (telegram-desktop): Update to 4.2.0. [#:configure-flags]: Comment out with default vaules. Use system rlottie [native-inputs]: Add clang-toolchain. Drop cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, qtbase, wayland and webkitgtk. Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, materialdecoration, libdbusmenu-qt, libtgvoip-for-telegram-desktop, nimf, qtbase-5, qt5ct, libx11. [propagated-inputs]: Drop dconf. [snippet,#:phases,license]: Sync with source tree. --- gnu/packages/telegram.scm | 313 +++++++++++++++++--------------------- 1 file changed, 139 insertions(+), 174 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 7542f6cd17..7556513208 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -28,6 +28,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages digest) + #:use-module (gnu packages enchant) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) #:use-module (gnu packages freedesktop) @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,12 +62,14 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -105,131 +109,131 @@ (define crc32c-for-telegram-desktop (define cmake-helpers-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/cmake_helpers.git" - #:revision "0" - #:commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72" - #:hash "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5" + #:revision "1" + #:commit "b9f1b6036329e44ec61f51f0b363fe2319158b84" + #:hash "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3" #:name "cmake-helpers")) (define codegen-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/codegen.git" - #:revision "0" - #:commit "248614b49cd7d5aff69d75a737f2e35b79fbb119" - #:hash "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk" + #:revision "1" + #:commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c" + #:hash "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2" #:name "codegen")) (define lib-base-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_base.git" - #:revision "0" - #:commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6" - #:hash "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78" + #:revision "1" + #:commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5" + #:hash "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27" #:name "lib-base")) (define lib-crl-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_crl.git" - #:revision "0" - #:commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f" - #:hash "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz" + #:revision "1" + #:commit "4e620bc383d032aadea8e6af02661f8c76695cec" + #:hash "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x" #:name "lib-crl")) (define lib-lottie-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_lottie.git" - #:revision "0" - #:commit "0770df009db7928df1d0cad0900dc5110106d229" - #:hash "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb" + #:revision "1" + #:commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904" + #:hash "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4" #:name "lib-lottie")) (define lib-qr-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_qr.git" - #:revision "0" - #:commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189" - #:hash "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0" + #:revision "1" + #:commit "501f4c3502fd872ab4d777df8911bdac32de7c48" + #:hash "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f" #:name "lib-qr")) -(define lib-rlottie-for-telegram-desktop - (source-for-telegram-desktop - #:url "https://github.com/desktop-app/lib_rlottie.git" - #:revision "0" - #:commit "0671bf70547381effcf442ec9618e04502a8adbc" - #:hash "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv" - #:name "lib-rlottie")) - (define lib-rpl-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_rpl.git" - #:revision "0" - #:commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617" - #:hash "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn" + #:revision "1" + #:commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe" + #:hash "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf" #:name "lib-rpl")) (define lib-spellcheck-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_spellcheck.git" - #:revision "0" - #:commit "68c9b788958904aea7de79f986a0f82ec8c5b094" - #:hash "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn" + #:revision "1" + #:commit "0e386e22cb6ba8a114b569840a635e096dcb645e" + #:hash "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw" #:name "lib-spellcheck")) (define lib-storage-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_storage.git" - #:revision "0" - #:commit "403df6c4a29562bd417c92d410e49819f5a48cc1" - #:hash "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5" + #:revision "1" + #:commit "839609369d04615475cb1518636de3619106a917" + #:hash "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm" #:name "lib-storage")) (define lib-tl-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_tl.git" - #:revision "0" - #:commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb" - #:hash "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m" + #:revision "1" + #:commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa" + #:hash "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk" #:name "lib-tl")) (define lib-ui-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_ui.git" - #:revision "0" - #:commit "1b590f9e16eb9571a039f072d6fea66c607e419f" - #:hash "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f" + #:revision "1" + #:commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3" + #:hash "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5" #:name "lib-ui")) -(define lib-waylandshells-for-telegram-desktop - (source-for-telegram-desktop - #:url "https://github.com/desktop-app/lib_waylandshells.git" - #:revision "0" - #:commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7" - #:hash "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf" - #:name "lib-waylandshells")) - (define lib-webrtc-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_webrtc.git" - #:revision "0" - #:commit "ef49f953f12b112008a094a719f40939aaf39db4" - #:hash "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw" + #:revision "1" + #:commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a" + #:hash "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq" #:name "lib-webrtc")) (define lib-webview-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/desktop-app/lib_webview.git" - #:revision "0" - #:commit "e06427c624515485774e2e2181d4afeb05ad5a67" - #:hash "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4" + #:revision "1" + #:commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35" + #:hash "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l" #:name "lib-webview")) (define tgcalls-for-telegram-desktop (source-for-telegram-desktop #:url "https://github.com/TelegramMessenger/tgcalls.git" - #:revision "0" - #:commit "81e97fa52e25b7775b62ce07bb653533d81e91b3" - #:hash "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj" + #:revision "1" + #:commit "82c4921045c440b727c38e464f3a0539708423ff" + #:hash "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk" #:name "tgcalls")) +(define dispatch-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/apple/swift-corelibs-libdispatch.git" + #:revision "0" + #:commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73" + #:hash "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn" + #:name "dispatch")) + +(define libtgvoip-for-telegram-desktop + (source-for-telegram-desktop + #:url "https://github.com/telegramdesktop/libtgvoip.git" + #:revision "0" + #:commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4" + #:hash "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hwki941h" + #:name "libtgvoip")) + (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") (revision "167")) @@ -328,8 +332,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "672")) (hidden-package (package (inherit rlottie) @@ -345,102 +349,52 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) - -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '(;; Own fork, bundled build to avoid an addressing issue. + "libtgvoip" + ;; Not available in Guix. + "dispatch" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags @@ -448,17 +402,31 @@ (define-public telegram-desktop ;; see also <https://core.telegram.org/api/obtaining_api_id>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name) + ;; NOTE: Options commented are default values. + ;; See also: comments in inputs. + ;; "-DDESKTOP_APP_LOTTIE_USE_CACHE=ON" + ;; "-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_DISABLE_X11_INTEGRATION=OFF" + ;; "-DDESKTOP_APP_USE_ALLOCATION_TRACER=OFF" + ;; "-DDESKTOP_APP_USE_PACKAGED=ON" + ;; "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" + ;; "-DDESKTOP_APP_DISABLE_SPELLCHECK=OFF" + ;; "-DDESKTOP_APP_USE_HUNSPELL_ONLY=OFF" + ;; "-DDESKTOP_APP_USE_ENCHANT=OFF" + ;; "-DDESKTOP_APP_NO_PDB=OFF" + ;; "-DDESKTOP_APP_DISABLE_JEMALLOC=OFF" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-sources - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda _ (for-each (match-lambda ((dst src) @@ -470,81 +438,78 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) + ("Telegram/ThirdParty/libtgvoip" #$libtgvoip-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_USE_ENCHANT + ;; enchant + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/libtgvoip + license:unlicense + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 10/10] gnu: telegram-desktop: Update to 4.2.0. 2022-09-19 6:14 ` [bug#57675] [PATCH v4 10/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-19 17:11 ` Liliana Marie Prikler 0 siblings, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-19 17:11 UTC (permalink / raw) To: Hilton Chain, 57675 Am Montag, dem 19.09.2022 um 14:14 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop): > Update to > b9f1b6. > (codegen-for-telegram-desktop): Update to 8815d7. > (lib-base-for-telegram-desktop): Update to cc5550. > (lib-crl-for-telegram-desktop): Update to 4e620b. > (lib-lottie-for-telegram-desktop): Update to 6ed1c2. > (lib-qr-for-telegram-desktop): Update to 501f4c. > (lib-rpl-for-telegram-desktop): Update to fd31f5. > (lib-spellcheck-for-telegram-desktop): Update to 0e386e. > (lib-storage-for-telegram-desktop): Update to 839609. > (lib-tl-for-telegram-desktop): Update to 36fb95. > (lib-ui-for-telegram-desktop): Update to f82162. > (lib-webrtc-for-telegram-desktop): Update to 9b1159. > (lib-webview-for-telegram-desktop): Update to 546df6. > (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram- > desktop): > Remove variables. > (tgcalls-for-telegram-desktop): Update to 82c492. > (dispatch-for-telegram-desktop): New variable. > (rlottie-for-telegram-desktop): Update to 8c69fc. > [snippet]: Switch off werror. > [arguments]: Use inherited ones. > (libtgvoip-for-telegram-desktop): Update to 78a8e2. > Change to source. > (telegram-desktop): Update to 4.2.0. > [#:configure-flags]: Comment out with default vaules. You don't need to add those comments – in fact, I'd posit that the package is more readable without them. > Use system rlottie > [native-inputs]: Add clang-toolchain. > Drop cmake-shared, extra-cmake-modules and qttools-5. > [inputs]: Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, > qtbase, > wayland and webkitgtk. > Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, > materialdecoration, > libdbusmenu-qt, libtgvoip-for-telegram-desktop, nimf, qtbase-5, > qt5ct, libx11. Remember to keep the inputs sorted. Also, are you sure you can drop all of those? > [propagated-inputs]: Drop dconf. > [snippet,#:phases,license]: Sync with source tree. ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: Update to 5.98.0. 2022-09-19 6:13 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: " Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 09/10] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via @ 2022-09-19 17:07 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-19 17:07 UTC (permalink / raw) To: Hilton Chain, 57675 Am Montag, dem 19.09.2022 um 14:13 +0800 schrieb Hilton Chain: > > * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. > [#:phases]: Update blocklist for failing tests. > Remove unneeded #t. Split into two; one for cosmetics, one functional. Also pardon me not replying to the list for the earlier ones, still getting used to the new Evolution UI. ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 00/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (2 preceding siblings ...) 2022-09-19 6:09 ` [bug#57675] [PATCH v4 00/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-19 23:32 ` Hilton Chain via Guix-patches via 2022-09-19 23:33 ` [bug#57675] [PATCH v5 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via 2022-09-20 15:32 ` [bug#57675] [PATCH v6 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via ` (9 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v4 -> v5: 1. Split commits deleting trailing #ts. 2. Change package style in one commit. 3. Use plain origin constructors in favour of a procedure. The program works fine while dropping all those inputs, so as integration with IMEs. Thanks! Hilton Chain (11): gnu: webrtc-for-telegram-desktop: Delete trailing #t. gnu: telegram-desktop: Delete trailing #t. gnu: webrtc-for-telegram-desktop: Use modern package style. gnu: telegram-desktop: Use modern package style. gnu: telegram-desktop: Change Api ID. gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3d. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 1 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 897 +++++++++--------- 5 files changed, 488 insertions(+), 463 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: e58bafcca4f44e058c7e88de73aa6311be7a3b37 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t. 2022-09-19 23:32 ` [bug#57675] [PATCH v5 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-19 23:33 ` Hilton Chain via Guix-patches via 2022-09-19 23:33 ` [bug#57675] [PATCH v5 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:33 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (webrtc-for-telegram-desktop)[source,#:phases]: Delete trailing #t. --- gnu/packages/telegram.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1a22d230d2..ae1b727df7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -106,8 +106,7 @@ (define-public webrtc-for-telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target @@ -126,8 +125,7 @@ (define-public webrtc-for-telegram-desktop (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) + (copy-recursively libyuv-from libyuv-to))))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 02/11] gnu: telegram-desktop: Delete trailing #t. 2022-09-19 23:33 ` [bug#57675] [PATCH v5 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via @ 2022-09-19 23:33 ` Hilton Chain via Guix-patches via 2022-09-19 23:34 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:33 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop)[source,#:phases]: Delete trailing #t. --- gnu/packages/telegram.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ae1b727df7..08a72d2e0f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -292,8 +292,7 @@ (define-public telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -322,8 +321,7 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-inputs (lambda* (#:key inputs outputs #:allow-other-keys) (for-each @@ -350,14 +348,10 @@ (define-public telegram-desktop ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) (add-before 'configure 'patch-cxx-flags (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style. 2022-09-19 23:33 ` [bug#57675] [PATCH v5 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-19 23:34 ` Hilton Chain via Guix-patches via 2022-09-19 23:34 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-20 4:55 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: " Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:34 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop, libyuv-for-telegram-desktop): New variables. (webrtc-for-telegram-desktop)[#:phases]: Copy sources with gexp. [inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 148 +++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 08a72d2e0f..9e68965607 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,36 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define libvpx-for-telegram-desktop + (let* ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") + (revision "0") + (name "libvpx-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + +(define libyuv-for-telegram-desktop + (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "0") + (name "libyuv-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -94,82 +125,53 @@ (define-public webrtc-for-telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" - ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) - (with-directory-excursion "src/third_party" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "openh264" "rnnoise" + ;; Not available in Guix. + "pffft" "usrsctp" + ;; Has cmake support files for libvpx input. + "libvpx"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))))))) (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))))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (let* ((libvpx-to (string-append (getcwd) + "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv"))) + (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) + (native-inputs (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: Use modern package style. 2022-09-19 23:34 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via @ 2022-09-19 23:34 ` Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 05/11] gnu: telegram-desktop: Change Api ID Hilton Chain via Guix-patches via 2022-09-20 4:58 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: Use modern package style Liliana Marie Prikler 2022-09-20 4:55 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: " Liliana Marie Prikler 1 sibling, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:34 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop, codegen-for-telegram-desktop,lib-base-for-telegram-desktop, lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop, lib-qr-for-telegram-desktop,lib-rlottie-for-telegram-desktop, lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop, lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop, lib-ui-for-telegram-desktop,lib-waylandshells-for-telegram-desktop, lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop, tgcalls-for-telegram-desktop): New variables. (telegram-desktop)[#:phases]: Copy sources with gexp. [native-inputs,inputs]: Remove sources in flavor of variables. --- gnu/packages/telegram.scm | 649 +++++++++++++++++++++----------------- 1 file changed, 353 insertions(+), 296 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9e68965607..92c51ffe4b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -102,6 +102,246 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define cmake-helpers-for-telegram-desktop + (let* ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") + (revision "0") + (name "cmake-helpers-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) + +(define codegen-for-telegram-desktop + (let* ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119") + (revision "0") + (name "codegen-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))) + +(define lib-base-for-telegram-desktop + (let* ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6") + (revision "0") + (name "lib-base-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))) + +(define lib-crl-for-telegram-desktop + (let* ((commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f") + (revision "0") + (name "lib-crl-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))) + +(define lib-lottie-for-telegram-desktop + (let* ((commit "0770df009db7928df1d0cad0900dc5110106d229") + (revision "0") + (name "lib-lottie-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))) + +(define lib-qr-for-telegram-desktop + (let* ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189") + (revision "0") + (name "lib-qr-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))) + +(define lib-rlottie-for-telegram-desktop + (let* ((commit "0671bf70547381effcf442ec9618e04502a8adbc") + (revision "0") + (name "lib-rlottie-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) + +(define lib-rpl-for-telegram-desktop + (let* ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617") + (revision "0") + (name "lib-rpl-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))) + +(define lib-spellcheck-for-telegram-desktop + (let* ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094") + (revision "0") + (name "lib-spellcheck-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))) + +(define lib-storage-for-telegram-desktop + (let* ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1") + (revision "0") + (name "lib-storage-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))) + +(define lib-tl-for-telegram-desktop + (let* ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb") + (revision "0") + (name "lib-tl-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))) + +(define lib-ui-for-telegram-desktop + (let* ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f") + (revision "0") + (name "lib-ui-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))) + +(define lib-waylandshells-for-telegram-desktop + (let* ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") + (revision "0") + (name "lib-waylandshells-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandshells.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) + +(define lib-webrtc-for-telegram-desktop + (let* ((commit "ef49f953f12b112008a094a719f40939aaf39db4") + (revision "0") + (name "lib-webrtc-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))) + +(define lib-webview-for-telegram-desktop + (let* ((commit "e06427c624515485774e2e2181d4afeb05ad5a67") + (revision "0") + (name "lib-webview-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))) + +(define tgcalls-for-telegram-desktop + (let* ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") + (revision "0") + (name "tgcalls-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -286,306 +526,123 @@ (define-public telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Not available in Guix. + "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (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 <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ; No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; Client applications must provide their own API-ID and API-HASH, + ;; see also <https://core.telegram.org/api/obtaining_api_id>. + ;; In case, that the credentials below fail to work, contact + ;; Raghav Gururajan <rg@raghavgururajan.name> + "-DTDESKTOP_API_ID=2791056" + "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + ;; Disable WebkitGTK support as it fails to link + "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" + ;; Use bundled fonts as fallback. + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda _ + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + '(("cmake" #$cmake-helpers-for-telegram-desktop) + ("Telegram/codegen" #$codegen-for-telegram-desktop) + ("Telegram/lib_base" #$lib-base-for-telegram-desktop) + ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) + ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) + ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) + ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) + ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) + ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) + ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) + ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) + ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) + ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) + ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) + ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-before 'configure 'patch-cxx-flags + (lambda _ + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("glibmm" ,glibmm-2.64) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("jemalloc" ,jemalloc) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (list alsa-lib + c++-gsl + catch2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib)) + (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 05/11] gnu: telegram-desktop: Change Api ID. 2022-09-19 23:34 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-19 23:35 ` Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-20 4:58 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: Use modern package style Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:35 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop) [#:configure-flags]: Use Api ID from Telegram's official Snap builds. --- gnu/packages/telegram.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 92c51ffe4b..ddc80df9c2 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -548,12 +548,12 @@ (define-public telegram-desktop (guix build utils) (ice-9 match)) #:configure-flags - #~`(;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + #~`(;; Client applications need an API ID and hash, see also: + ;; <https://core.telegram.org/api/obtaining_api_id>. Here, we + ;; use the ones given by the official Snap package, see: + ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" ;; Disable WebkitGTK support as it fails to link "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" ;; Use bundled fonts as fallback. -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 06/11] gnu: Add abseil-cpp-cxxstd17. 2022-09-19 23:35 ` [bug#57675] [PATCH v5 05/11] gnu: telegram-desktop: Change Api ID Hilton Chain via Guix-patches via @ 2022-09-19 23:35 ` Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:35 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 07/11] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-19 23:35 ` [bug#57675] [PATCH v5 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-19 23:35 ` Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:35 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 08/11] gnu: kcoreaddons: Remove trailing #t. 2022-09-19 23:35 ` [bug#57675] [PATCH v5 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-19 23:36 ` Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[#:phases]: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 09/11] gnu: kcoreaddons: Update to 5.98.0. 2022-09-19 23:36 ` [bug#57675] [PATCH v5 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-19 23:36 ` Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [#:phases]: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3d. 2022-09-19 23:36 ` [bug#57675] [PATCH v5 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-19 23:36 ` Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3d. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. use system openh264. [#:configure-flags]: Comment out with default values. [native-inputs]: Drop perl. [inputs]: Replace pipewire with pipewire-0.3. Drop alsa-lib, libx11 and pulseaudio. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. [snippet,#:phases,license]: Sync with source tree. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 89 ++++++++++--------- 3 files changed, 69 insertions(+), 42 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 238fb72bc5..00f8d0adcb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ddc80df9c2..6d9bfd9321 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -72,35 +75,35 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define libvpx-for-telegram-desktop - (let* ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") +(define libyuv-for-telegram-desktop + (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "0") - (name "libvpx-for-telegram-desktop") + (name "libyuv-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") +(define crc32c-for-telegram-desktop + (let* ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") (revision "0") - (name "libyuv-for-telegram-desktop") + (name "crc32c-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (let* ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") @@ -343,8 +346,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "167")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -360,57 +363,61 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list #:tests? #f ; No target - #:configure-flags - #~`("-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") + (list #:tests? #f ; No target #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ - (let* ((libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) - (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -422,13 +429,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-19 23:36 ` [bug#57675] [PATCH v5 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via @ 2022-09-19 23:36 ` Hilton Chain via Guix-patches via 2022-09-20 5:02 ` Liliana Marie Prikler 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-19 23:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop): Update to b9f1b6. (codegen-for-telegram-desktop): Update to 8815d7. (lib-base-for-telegram-desktop): Update to cc5550. (lib-crl-for-telegram-desktop): Update to 4e620b. (lib-lottie-for-telegram-desktop): Update to 6ed1c2. (lib-qr-for-telegram-desktop): Update to 501f4c. (lib-rpl-for-telegram-desktop): Update to fd31f5. (lib-spellcheck-for-telegram-desktop): Update to 0e386e. (lib-storage-for-telegram-desktop): Update to 839609. (lib-tl-for-telegram-desktop): Update to 36fb95. (lib-ui-for-telegram-desktop): Update to f82162. (lib-webrtc-for-telegram-desktop): Update to 9b1159. (lib-webview-for-telegram-desktop): Update to 546df6. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop): Remove variables. (tgcalls-for-telegram-desktop): Update to 82c492. (dispatch-for-telegram-desktop): New variable. (rlottie-for-telegram-desktop): Update to 8c69fc. [snippet]: Switch off werror. [arguments]: Use inherited ones. (libtgvoip-for-telegram-desktop): Update to 78a8e2. Change to source. (telegram-desktop): Update to 4.2.0. [#:configure-flags]: Use system rlottie. [native-inputs]: Add clang-toolchain. Drop cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf, qt5ct. [propagated-inputs]: Drop dconf. [snippet,#:phases,license]: Sync with source tree. --- gnu/packages/telegram.scm | 305 ++++++++++++++++---------------------- 1 file changed, 126 insertions(+), 179 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6d9bfd9321..58d70e2930 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -43,6 +43,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -106,8 +108,8 @@ (define crc32c-for-telegram-desktop "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop - (let* ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") - (revision "0") + (let* ((commit "b9f1b6036329e44ec61f51f0b363fe2319158b84") + (revision "1") (name "cmake-helpers-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -118,11 +120,11 @@ (define cmake-helpers-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3"))))) (define codegen-for-telegram-desktop - (let* ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119") - (revision "0") + (let* ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") + (revision "1") (name "codegen-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -133,11 +135,11 @@ (define codegen-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (let* ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6") - (revision "0") + (let* ((commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5") + (revision "1") (name "lib-base-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -148,11 +150,11 @@ (define lib-base-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27"))))) (define lib-crl-for-telegram-desktop - (let* ((commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f") - (revision "0") + (let* ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") + (revision "1") (name "lib-crl-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -163,11 +165,11 @@ (define lib-crl-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (let* ((commit "0770df009db7928df1d0cad0900dc5110106d229") - (revision "0") + (let* ((commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904") + (revision "1") (name "lib-lottie-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -178,11 +180,11 @@ (define lib-lottie-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4"))))) (define lib-qr-for-telegram-desktop - (let* ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189") - (revision "0") + (let* ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") + (revision "1") (name "lib-qr-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -193,26 +195,11 @@ (define lib-qr-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))) - -(define lib-rlottie-for-telegram-desktop - (let* ((commit "0671bf70547381effcf442ec9618e04502a8adbc") - (revision "0") - (name "lib-rlottie-for-telegram-desktop") - (version (git-version "0" revision commit))) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) (define lib-rpl-for-telegram-desktop - (let* ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617") - (revision "0") + (let* ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") + (revision "1") (name "lib-rpl-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -223,11 +210,11 @@ (define lib-rpl-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (let* ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094") - (revision "0") + (let* ((commit "0e386e22cb6ba8a114b569840a635e096dcb645e") + (revision "1") (name "lib-spellcheck-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -238,11 +225,11 @@ (define lib-spellcheck-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw"))))) (define lib-storage-for-telegram-desktop - (let* ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1") - (revision "0") + (let* ((commit "839609369d04615475cb1518636de3619106a917") + (revision "1") (name "lib-storage-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -253,11 +240,11 @@ (define lib-storage-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (let* ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb") - (revision "0") + (let* ((commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa") + (revision "1") (name "lib-tl-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -268,11 +255,11 @@ (define lib-tl-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk"))))) (define lib-ui-for-telegram-desktop - (let* ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f") - (revision "0") + (let* ((commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3") + (revision "1") (name "lib-ui-for-telegram-desktop") (version (git-version "0" revision commit))) (origin @@ -283,67 +270,82 @@ (define lib-ui-for-telegram-desktop (file-name (git-file-name name version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5"))))) -(define lib-waylandshells-for-telegram-desktop - (let* ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") - (revision "0") - (name "lib-waylandshells-for-telegram-desktop") +(define lib-webrtc-for-telegram-desktop + (let* ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") + (revision "1") + (name "lib-webrtc-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") + (url "https://github.com/desktop-app/lib_webrtc.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq"))))) -(define lib-webrtc-for-telegram-desktop - (let* ((commit "ef49f953f12b112008a094a719f40939aaf39db4") - (revision "0") - (name "lib-webrtc-for-telegram-desktop") +(define lib-webview-for-telegram-desktop + (let* ((commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35") + (revision "1") + (name "lib-webview-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") + (url "https://github.com/desktop-app/lib_webview.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l"))))) -(define lib-webview-for-telegram-desktop - (let* ((commit "e06427c624515485774e2e2181d4afeb05ad5a67") +(define tgcalls-for-telegram-desktop + (let* ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "1") + (name "tgcalls-for-telegram-desktop") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) + +(define dispatch-for-telegram-desktop + (let* ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") (revision "0") - (name "lib-webview-for-telegram-desktop") + (name "dispatch-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") + (url "https://github.com/apple/swift-corelibs-libdispatch.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))) + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) -(define tgcalls-for-telegram-desktop - (let* ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") +(define libtgvoip-for-telegram-desktop + (let* ((commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4") (revision "0") - (name "tgcalls-for-telegram-desktop") + (name "libtgvoip-for-telegram-desktop") (version (git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") + (url "https://github.com/telegramdesktop/libtgvoip.git") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hwki941h"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -437,8 +439,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "672")) (hidden-package (package (inherit rlottie) @@ -454,87 +456,38 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) - -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Own fork, bundled build to avoid an addressing issue. + "libtgvoip" + ;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -542,14 +495,13 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags @@ -559,16 +511,16 @@ (define-public telegram-desktop ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -581,81 +533,76 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) + ("Telegram/ThirdParty/libtgvoip" #$libtgvoip-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/libtgvoip + license:unlicense + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-19 23:36 ` [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-20 5:02 ` Liliana Marie Prikler 2022-09-20 7:27 ` Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-20 5:02 UTC (permalink / raw) To: Hilton Chain, 57675 Am Dienstag, dem 20.09.2022 um 07:36 +0800 schrieb Hilton Chain: > + '(;; Own fork, bundled build to avoid an > addressing issue. > + "libtgvoip" For context, what is this "addressing issue"? ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-20 5:02 ` Liliana Marie Prikler @ 2022-09-20 7:27 ` Hilton Chain via Guix-patches via 2022-09-20 16:54 ` Liliana Marie Prikler 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 7:27 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 On Tue, 20 Sep 2022 13:02:09 +0800, Liliana Marie Prikler wrote: > For context, what is this "addressing issue"? According to their packaging wiki, #+BEGIN_QUOTE "it's recommended to use the bundled copy since it's a legacy library and its upstream build scripts aren't adapted to build with tg_owt, so the calls will crash due to two webrtc libraries being in one address spacey" #+END_QUOTE However I haven't found the exact issue on this yet... Finding there's a patch[1] to disable the lib, maybe we could just apply it? [1]: https://github.com/telegramdesktop/tdesktop/pull/24126 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-20 7:27 ` Hilton Chain via Guix-patches via @ 2022-09-20 16:54 ` Liliana Marie Prikler 0 siblings, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-20 16:54 UTC (permalink / raw) To: Hilton Chain; +Cc: 57675 Am Dienstag, dem 20.09.2022 um 15:27 +0800 schrieb Hilton Chain: > Finding there's a patch[1] to disable the lib, maybe we could just > apply it? > > [1]: https://github.com/telegramdesktop/tdesktop/pull/24126 I think that's a more reasonable approach, provided it actually builds. Did you test that? ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: Use modern package style. 2022-09-19 23:34 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 05/11] gnu: telegram-desktop: Change Api ID Hilton Chain via Guix-patches via @ 2022-09-20 4:58 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-20 4:58 UTC (permalink / raw) To: Hilton Chain, 57675 Am Dienstag, dem 20.09.2022 um 07:34 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop, > codegen-for-telegram-desktop,lib-base-for-telegram-desktop, > lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop, > lib-qr-for-telegram-desktop,lib-rlottie-for-telegram-desktop, > lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop, > lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop, > lib-ui-for-telegram-desktop,lib-waylandshells-for-telegram-desktop, > lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop, > tgcalls-for-telegram-desktop): New variables. Same thing as for the 0003 patch. If you don't find a public version in any of telegram's lib-foo, use telegram's version instead (you might want to introduce a variable %telegram-version at the head of the file below the module definition to do so). > (telegram-desktop)[#:phases]: Copy sources with gexp. > [native-inputs,inputs]: Remove sources in flavor of variables. Nitpick: It's favor, not flavor. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style. 2022-09-19 23:34 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 2022-09-19 23:34 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-20 4:55 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-20 4:55 UTC (permalink / raw) To: Hilton Chain, 57675 Am Dienstag, dem 20.09.2022 um 07:34 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (libvpx-for-telegram-desktop, > libyuv-for-telegram-desktop): New variables. > (webrtc-for-telegram-desktop)[#:phases]: Copy sources with gexp. > [inputs]: Remove sources in flavor of variables. > --- > gnu/packages/telegram.scm | 148 +++++++++++++++++++----------------- > -- > 1 file changed, 75 insertions(+), 73 deletions(-) > > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 08a72d2e0f..9e68965607 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) > #:use-module (gnu packages xorg) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > + #:use-module (guix gexp) > #:use-module (guix git-download) > #:use-module (guix build-system cmake) > #:use-module (guix build-system copy) > @@ -71,6 +72,36 @@ (define-module (gnu packages telegram) > #:use-module (guix build-system python) > #:use-module (guix build-system qt)) > > +(define libvpx-for-telegram-desktop > + (let* ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") > + (revision "0") > + (name "libvpx-for-telegram-desktop") You can inline this into git-file-name, same for the other packages > + (version (git-version "0" revision commit))) You can inline this into git-file-name, also take the approximate upstream version here (not that it matters much since 4.2.0 uses the upstream libvpx). > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://chromium.googlesource.com/webm/libvpx") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) > + > +(define libyuv-for-telegram-desktop > + (let* ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") > + (revision "0") > + (name "libyuv-for-telegram-desktop") > + (version (git-version "0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://chromium.googlesource.com/libyuv/libyuv") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) > + > (define-public webrtc-for-telegram-desktop > (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") > (revision "166")) > @@ -94,82 +125,53 @@ (define-public webrtc-for-telegram-desktop > (ice-9 ftw) > (srfi srfi-1))) > (snippet > - `(begin > - (let ((keep > - '( ;; Custom forks which are incompatible with > the ones in Guix. > - "abseil-cpp" "libsrtp" "openh264" "rnnoise" > - ;; Not available in Guix. > - "pffft" "usrsctp" > - ;; Has cmake support files for libvpx input. > - "libvpx"))) > - (with-directory-excursion "src/third_party" > - (for-each delete-file-recursively > - (lset-difference string=? > - (scandir ".") > - (cons* "." ".." > keep))))))))) > + #~(begin > + (let ((keep > + '( ;; Custom forks which are incompatible with > the ones in Guix. > + "abseil-cpp" "libsrtp" "openh264" "rnnoise" > + ;; Not available in Guix. > + "pffft" "usrsctp" > + ;; Has cmake support files for libvpx input. > + "libvpx"))) > + (with-directory-excursion "src/third_party" > + (for-each delete-file-recursively > + (lset-difference string=? > + (scandir ".") > + (cons* "." ".." > keep))))))))) > (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))))))) > - (native-inputs > - `(("perl" ,perl) > - ("pkg-config" ,pkg-config) > - ("python" ,python-wrapper) > - ("yasm" ,yasm))) > + (list #:tests? #f ; No target > + #:configure-flags > + #~`("-DCMAKE_C_FLAGS=-fPIC" > + "-DCMAKE_CXX_FLAGS=-fPIC") > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'copy-inputs > + (lambda _ > + (let* ((libvpx-to (string-append (getcwd) > + > "/src/third_party/libvpx/source/libvpx")) > + (libyuv-to (string-append (getcwd) > + > "/src/third_party/libyuv"))) > + (copy-recursively #$libvpx-for-telegram- > desktop libvpx-to) > + (copy-recursively #$libyuv-for-telegram- > desktop libyuv-to))))))) > + (native-inputs (list perl pkg-config python-wrapper yasm)) > (inputs > - `(("alsa" ,alsa-lib) > - ("ffmpeg" ,ffmpeg) > - ("libjpeg" ,libjpeg-turbo) > - ("glib" ,glib) > - ("libvpx" > - ,(origin > - (method git-fetch) > - (uri > - (git-reference > - (url > "https://chromium.googlesource.com/webm/libvpx") > - (commit > "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) > - (file-name > - (git-file-name "libvpx-for-webrtc-for-telegram- > desktop" version)) > - (sha256 > - (base32 > "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) > - ("libyuv" > - ,(origin > - (method git-fetch) > - (uri > - (git-reference > - (url > "https://chromium.googlesource.com/libyuv/libyuv") > - (commit > "ad890067f661dc747a975bc55ba3767fe30d4452"))) > - (file-name > - (git-file-name "libyuv-for-webrtc-for-telegram- > desktop" version)) > - (sha256 > - (base32 > "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) > - ("libxcomposite" ,libxcomposite) > - ("libxdamage" ,libxdamage) > - ("libxrender" ,libxrender) > - ("libxrandr" ,libxrandr) > - ("openssl" ,openssl) > - ("opus" ,opus) > - ("pipewire" ,pipewire) > - ("protobuf" ,protobuf) > - ("pulseaudio" ,pulseaudio) > - ("x11" ,libx11) > - ("xext" ,libxext) > - ("xtst" ,libxtst))) > + (list alsa-lib > + ffmpeg > + libjpeg-turbo > + glib > + libxcomposite > + libxdamage > + libxrender > + libxrandr > + openssl > + opus > + pipewire > + protobuf > + pulseaudio > + libx11 > + libxext > + libxtst)) > (synopsis "WebRTC support for Telegram Desktop") > (description "WebRTC-for-Telegram-Desktop is a custom WebRTC > fork by > Telegram project, for its use in telegram desktop client.") > -- > 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 00/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (3 preceding siblings ...) 2022-09-19 23:32 ` [bug#57675] [PATCH v5 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-20 15:32 ` Hilton Chain via Guix-patches via 2022-09-20 15:34 ` [bug#57675] [PATCH v6 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via 2022-09-21 0:10 ` [bug#57675] [PATCH v7 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via ` (8 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v5 -> v6: Corrected versions and revisions. For libtgvoip, See <https://github.com/telegramdesktop/tdesktop/pull/24126>. No text here as I'm not a little stuck now. (ￗ﹏ￗ ) Hilton Chain (11): gnu: webrtc-for-telegram-desktop: Delete trailing #t. gnu: telegram-desktop: Delete trailing #t. gnu: webrtc-for-telegram-desktop: Use modern package style. gnu: telegram-desktop: Use modern package style. gnu: telegram-desktop: Change API ID. gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 1 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 877 +++++++++--------- 5 files changed, 453 insertions(+), 478 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: f6e2ca36515d0c50b4db09ddb0bbfc193ea7fe82 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t. 2022-09-20 15:32 ` [bug#57675] [PATCH v6 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-20 15:34 ` Hilton Chain via Guix-patches via 2022-09-20 15:34 ` [bug#57675] [PATCH v6 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:34 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (webrtc-for-telegram-desktop)[source,#:phases]: Delete trailing #t. --- gnu/packages/telegram.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1a22d230d2..ae1b727df7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -106,8 +106,7 @@ (define-public webrtc-for-telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target @@ -126,8 +125,7 @@ (define-public webrtc-for-telegram-desktop (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) + (copy-recursively libyuv-from libyuv-to))))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 02/11] gnu: telegram-desktop: Delete trailing #t. 2022-09-20 15:34 ` [bug#57675] [PATCH v6 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via @ 2022-09-20 15:34 ` Hilton Chain via Guix-patches via 2022-09-20 15:35 ` [bug#57675] [PATCH v6 03/11] gnu: webrtc-for-telegram-desktop: Use modern package Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:34 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop)[source,#:phases]: Delete trailing #t. --- gnu/packages/telegram.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ae1b727df7..08a72d2e0f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -292,8 +292,7 @@ (define-public telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -322,8 +321,7 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-inputs (lambda* (#:key inputs outputs #:allow-other-keys) (for-each @@ -350,14 +348,10 @@ (define-public telegram-desktop ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) (add-before 'configure 'patch-cxx-flags (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 03/11] gnu: webrtc-for-telegram-desktop: Use modern package 2022-09-20 15:34 ` [bug#57675] [PATCH v6 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-20 15:35 ` Hilton Chain via Guix-patches via 2022-09-20 15:35 ` [bug#57675] [PATCH v6 04/11] gnu: telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:35 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler style. * gnu/packages/telegram.scm (libvpx-for-telegram-desktop, libyuv-for-telegram-desktop): New variables. (webrtc-for-telegram-desktop)[#:phases]: Copy sources with gexp. [inputs]: Remove sources in favor of variables. --- gnu/packages/telegram.scm | 148 +++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 08a72d2e0f..b9844c75f4 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,36 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define libvpx-for-telegram-desktop + (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") + (revision "112")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit commit))) + (file-name (git-file-name + "libvpx-for-telegram-desktop" + (git-version "1.9.0" revision commit))) + (sha256 + (base32 + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit commit))) + (file-name (git-file-name + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -94,82 +125,53 @@ (define-public webrtc-for-telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" - ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) - (with-directory-excursion "src/third_party" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "openh264" "rnnoise" + ;; Not available in Guix. + "pffft" "usrsctp" + ;; Has cmake support files for libvpx input. + "libvpx"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))))))) (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))))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (let* ((libvpx-to (string-append (getcwd) + "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv"))) + (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) + (native-inputs (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 04/11] gnu: telegram-desktop: Use modern package style. 2022-09-20 15:35 ` [bug#57675] [PATCH v6 03/11] gnu: webrtc-for-telegram-desktop: Use modern package Hilton Chain via Guix-patches via @ 2022-09-20 15:35 ` Hilton Chain via Guix-patches via 2022-09-20 15:35 ` [bug#57675] [PATCH v6 05/11] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:35 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (%telegram-version, cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop, lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop, lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop, lib-rlottie-for-telegram-desktop,lib-rpl-for-telegram-desktop, lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop, lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop, lib-waylandshells-for-telegram-desktop,lib-webrtc-for-telegram-desktop, lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): New variables. (telegram-desktop)[#:phases]: Copy sources with gexp. [native-inputs,inputs]: Remove sources in favor of variables. --- gnu/packages/telegram.scm | 605 +++++++++++++++++++------------------- 1 file changed, 308 insertions(+), 297 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index b9844c75f4..41d12161f0 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -72,6 +72,8 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define %telegram-version "2.9.3") + (define libvpx-for-telegram-desktop (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") (revision "112")) @@ -102,6 +104,198 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define cmake-helpers-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (file-name + (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + +(define codegen-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (file-name + (git-file-name "codegen-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + +(define lib-base-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (file-name + (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + +(define lib-crl-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (file-name + (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + +(define lib-lottie-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (file-name + (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + +(define lib-qr-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (file-name + (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + +(define lib-rlottie-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) + (file-name + (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + +(define lib-rpl-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (file-name + (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + +(define lib-spellcheck-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + +(define lib-storage-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (file-name + (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + +(define lib-tl-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (file-name + (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + +(define lib-ui-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (file-name + (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + +(define lib-waylandshells-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandshells.git") + (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) + (file-name + (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + +(define lib-webrtc-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (file-name + (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + +(define lib-webview-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (file-name + (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + +(define tgcalls-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (file-name + (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -269,7 +463,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version %telegram-version) (source (origin (method git-fetch) @@ -286,306 +480,123 @@ (define-public telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Not available in Guix. + "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (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 <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ; No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; Client applications must provide their own API-ID and API-HASH, + ;; see also <https://core.telegram.org/api/obtaining_api_id>. + ;; In case, that the credentials below fail to work, contact + ;; Raghav Gururajan <rg@raghavgururajan.name> + "-DTDESKTOP_API_ID=2791056" + "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + ;; Disable WebkitGTK support as it fails to link + "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" + ;; Use bundled fonts as fallback. + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda _ + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + '(("cmake" #$cmake-helpers-for-telegram-desktop) + ("Telegram/codegen" #$codegen-for-telegram-desktop) + ("Telegram/lib_base" #$lib-base-for-telegram-desktop) + ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) + ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) + ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) + ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) + ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) + ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) + ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) + ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) + ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) + ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) + ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) + ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-before 'configure 'patch-cxx-flags + (lambda _ + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("glibmm" ,glibmm-2.64) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("jemalloc" ,jemalloc) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (list alsa-lib + c++-gsl + catch2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib)) + (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 05/11] gnu: telegram-desktop: Change API ID. 2022-09-20 15:35 ` [bug#57675] [PATCH v6 04/11] gnu: telegram-desktop: Use modern package style Hilton Chain via Guix-patches via @ 2022-09-20 15:35 ` Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:35 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop) [#:configure-flags]: Use API ID from Telegram's official Snap builds. --- gnu/packages/telegram.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 41d12161f0..8eea3297c7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -502,12 +502,12 @@ (define-public telegram-desktop (guix build utils) (ice-9 match)) #:configure-flags - #~`(;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + #~`(;; Client applications need an API ID and hash, see also: + ;; <https://core.telegram.org/api/obtaining_api_id>. Here, we + ;; use the ones given by the official Snap package, see: + ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" ;; Disable WebkitGTK support as it fails to link "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" ;; Use bundled fonts as fallback. -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 06/11] gnu: Add abseil-cpp-cxxstd17. 2022-09-20 15:35 ` [bug#57675] [PATCH v6 05/11] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via @ 2022-09-20 15:36 ` Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 07/11] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-20 15:36 ` [bug#57675] [PATCH v6 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-20 15:36 ` Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 08/11] gnu: kcoreaddons: Remove trailing #t. 2022-09-20 15:36 ` [bug#57675] [PATCH v6 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-20 15:36 ` Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[#:phases]: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 09/11] gnu: kcoreaddons: Update to 5.98.0. 2022-09-20 15:36 ` [bug#57675] [PATCH v6 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-20 15:36 ` Hilton Chain via Guix-patches via 2022-09-20 15:37 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:36 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [#:phases]: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-20 15:36 ` [bug#57675] [PATCH v6 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-20 15:37 ` Hilton Chain via Guix-patches via 2022-09-20 15:37 ` [bug#57675] [PATCH v6 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-20 17:03 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:37 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: use system libvpx and openh264. [native-inputs]: Drop perl. [inputs]: Replace pipewire with pipewire-0.3. Drop alsa-lib, libx11 and pulseaudio. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. [snippet,#:phases,license]: Sync with source tree. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++ gnu/packages/telegram.scm | 95 ++++++++++--------- 3 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 238fb72bc5..00f8d0adcb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 8eea3297c7..d1b89fd268 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -74,35 +77,35 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") - (revision "2211")) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name - "libyuv-for-telegram-desktop" + "crc32c-for-telegram-desktop" (git-version "0" revision commit))) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (origin @@ -297,8 +300,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,57 +317,61 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list #:tests? #f ; No target - #:configure-flags - #~`("-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") + (list #:tests? #f ; No target #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ - (let* ((libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) - (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -376,13 +383,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-20 15:37 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-20 15:37 ` Hilton Chain via Guix-patches via 2022-09-20 17:15 ` Liliana Marie Prikler 2022-09-20 17:03 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-20 15:37 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop, codegen-for-telegram-desktop,lib-base-for-telegram-desktop, lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop, lib-qr-for-telegram-desktop,lib-rpl-for-telegram-desktop, lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop, lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop, lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop, tgcalls-for-telegram-desktop): Bump to submodule checkout. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop): Remove variables. (libtgvoip-for-telegram-desktop): Change to source. Use %telegram-version for version. (rlottie-for-telegram-desktop): Use %telegram-version for version. [snippet]: Switch off werror. [arguments]: Use inherited ones. (dispatch-for-telegram-desktop): New variable. (telegram-desktop): Update to 4.2.0. [#:configure-flags]: Use system rlottie. [native-inputs]: Add clang-toolchain. Drop cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Drop dconf. [snippet,#:phases,license]: Sync with source tree. --- gnu/packages/telegram.scm | 295 +++++++++++++++----------------------- 1 file changed, 119 insertions(+), 176 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d1b89fd268..c1cbfda9ad 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -43,6 +43,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,7 +77,7 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") +(define %telegram-version "4.2.0") (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") @@ -107,197 +109,199 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (commit "b9f1b6036329e44ec61f51f0b363fe2319158b84"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) (define lib-rpl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (commit "839609369d04615475cb1518636de3619106a917"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (commit "82c4921045c440b727c38e464f3a0539708423ff"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) + +(define libtgvoip-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telegramdesktop/libtgvoip.git") + (commit "78a8e22bedb0d06004da8bafeba88b7474cb89a4"))) + (file-name + (git-file-name "libtgvoip-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 "1y1jvm4i0i4fkl6c0bgcv2cpzziyyn1pywxqz726q008hwki941h")))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -391,79 +395,24 @@ (define-public webrtc-for-telegram-desktop 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")) - (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)))))) + (hidden-package + (package + (inherit rlottie) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/rlottie.git") + (commit "8c69fc20cf2e150db304311f1233a4b55a8892d7"))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false"))))))))) (define-public telegram-desktop (package @@ -475,20 +424,22 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Own fork, bundled build for it's build scripts are + ;; abandoned. + "libtgvoip" + ;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -496,14 +447,13 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags @@ -513,16 +463,16 @@ (define-public telegram-desktop ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -535,81 +485,74 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) + ("Telegram/ThirdParty/libtgvoip" #$libtgvoip-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-20 15:37 ` [bug#57675] [PATCH v6 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-20 17:15 ` Liliana Marie Prikler 0 siblings, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-20 17:15 UTC (permalink / raw) To: Hilton Chain, 57675 Am Dienstag, dem 20.09.2022 um 23:37 +0800 schrieb Hilton Chain: > > * gnu/packages/telegram.scm (cmake-helpers-for-telegram-desktop, > codegen-for-telegram-desktop,lib-base-for-telegram-desktop, > lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop, > lib-qr-for-telegram-desktop,lib-rpl-for-telegram-desktop, > lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop, > lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop, > lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop, > tgcalls-for-telegram-desktop): Bump to submodule checkout. > (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram- > desktop): Note that ChangeLog style requires closing brackets, i.e. (cmake-helpers-for-telegram-desktop) (codegen-for-telegram-desktop, lib-base-for-telegram-desktop) (...) > Remove variables. > (libtgvoip-for-telegram-desktop): Change to source. > Use %telegram-version for version. > (rlottie-for-telegram-desktop): Use %telegram-version for version. > [snippet]: Switch off werror. > [arguments]: Use inherited ones. > (dispatch-for-telegram-desktop): New variable. > (telegram-desktop): Update to 4.2.0. > [#:configure-flags]: Use system rlottie. [arguments]<#:configure-flags>, plus <#:phases> from below. Also spell out the flags added or removed. > [native-inputs]: Add clang-toolchain. > Drop cmake-shared, extra-cmake-modules and qttools-5. > [inputs]: Replace qtbase-5 with qtbase > Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, > webkitgtk. > Drop catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu- > qt, > libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and > qt5ct. > [propagated-inputs]: Drop dconf. s/Drop/Remove. > [snippet,#:phases,license]: Sync with source tree. These are just cosmetic fixes to the ChangeLog to add after checking whether we can build telegram without tgcalls. I'll do more thorough checks afterwards. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-20 15:37 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-20 15:37 ` [bug#57675] [PATCH v6 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-20 17:03 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-20 17:03 UTC (permalink / raw) To: Hilton Chain, 57675 Am Dienstag, dem 20.09.2022 um 23:37 +0800 schrieb Hilton Chain: > > * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12- > cstdint.patch: > New file. > * gnu/local.mk (dist_patch_DATA): Add patch. > * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove > variable. > (crc32c-for-telegram-desktop): New variable. > (webrtc-for-telegram-desktop): Update to 621f3da5. > [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. > [snippet]: use system libvpx and openh264. Should be "Unbundle libvpx and openh264." > [native-inputs]: Drop perl. > [inputs]: Replace pipewire with pipewire-0.3. > Drop alsa-lib, libx11 and pulseaudio. > Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, > openh264. List additions before removals. Also, from a cursory look at git log, we prefer "Remove" with inputs. > [snippet,#:phases,license]: Sync with source tree. Repeated snippet. For #:phases, you should probably write [arguments]<#:phases> and a more detailed change description. For [license] simply write "Adjusted accordingly" or "Adjusted according to unbundled packages". Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 00/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (4 preceding siblings ...) 2022-09-20 15:32 ` [bug#57675] [PATCH v6 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-21 0:10 ` Hilton Chain via Guix-patches via 2022-09-21 0:10 ` [bug#57675] [PATCH v7 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via 2022-09-21 8:23 ` [bug#57675] [PATCH 0/7] " Hilton Chain via Guix-patches via ` (7 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:10 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v6 -> v7: Unbundle libtgvoip. Hilton Chain (11): gnu: webrtc-for-telegram-desktop: Delete trailing #t. gnu: telegram-desktop: Delete trailing #t. gnu: webrtc-for-telegram-desktop: Use modern package style. gnu: telegram-desktop: Use modern package style. gnu: telegram-desktop: Change API ID. gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 868 ++++++++---------- 6 files changed, 570 insertions(+), 478 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: f256614891335e250207edab129bdf8601c22774 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t. 2022-09-21 0:10 ` [bug#57675] [PATCH v7 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-21 0:10 ` Hilton Chain via Guix-patches via 2022-09-21 0:11 ` [bug#57675] [PATCH v7 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:10 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Delete trailing #t. --- gnu/packages/telegram.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1a22d230d2..ae1b727df7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -106,8 +106,7 @@ (define-public webrtc-for-telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target @@ -126,8 +125,7 @@ (define-public webrtc-for-telegram-desktop (libyuv-to (string-append (getcwd) "/src/third_party/libyuv"))) (copy-recursively libvpx-from libvpx-to) - (copy-recursively libyuv-from libyuv-to)) - #t))))) + (copy-recursively libyuv-from libyuv-to))))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 02/11] gnu: telegram-desktop: Delete trailing #t. 2022-09-21 0:10 ` [bug#57675] [PATCH v7 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via @ 2022-09-21 0:11 ` Hilton Chain via Guix-patches via 2022-09-21 0:11 ` [bug#57675] [PATCH v7 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop): Delete trailing #t. --- gnu/packages/telegram.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ae1b727df7..08a72d2e0f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -292,8 +292,7 @@ (define-public telegram-desktop (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep)))) - #t))))) + (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments `(#:tests? #f ; No target @@ -322,8 +321,7 @@ (define-public telegram-desktop (modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'make-writable 'copy-inputs (lambda* (#:key inputs outputs #:allow-other-keys) (for-each @@ -350,14 +348,10 @@ (define-public telegram-desktop ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) + ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) (add-before 'configure 'patch-cxx-flags (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style. 2022-09-21 0:11 ` [bug#57675] [PATCH v7 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-21 0:11 ` Hilton Chain via Guix-patches via 2022-09-21 0:11 ` [bug#57675] [PATCH v7 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop) (libyuv-for-telegram-desktop): New variables. (webrtc-for-telegram-desktop): Use modern package style. [inputs]: Remove sources in favor of variables. [arguments]<#:phases>: Copy sources with gexp. --- gnu/packages/telegram.scm | 148 +++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 08a72d2e0f..b9844c75f4 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -62,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -71,6 +72,36 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define libvpx-for-telegram-desktop + (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") + (revision "112")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit commit))) + (file-name (git-file-name + "libvpx-for-telegram-desktop" + (git-version "1.9.0" revision commit))) + (sha256 + (base32 + "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/libyuv/libyuv") + (commit commit))) + (file-name (git-file-name + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -94,82 +125,53 @@ (define-public webrtc-for-telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" - ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) - (with-directory-excursion "src/third_party" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Custom forks which are incompatible with the ones in Guix. + "abseil-cpp" "libsrtp" "openh264" "rnnoise" + ;; Not available in Guix. + "pffft" "usrsctp" + ;; Has cmake support files for libvpx input. + "libvpx"))) + (with-directory-excursion "src/third_party" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))))))) (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))))))) - (native-inputs - `(("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("yasm" ,yasm))) + (list #:tests? #f ; No target + #:configure-flags + #~`("-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (let* ((libvpx-to (string-append (getcwd) + "/src/third_party/libvpx/source/libvpx")) + (libyuv-to (string-append (getcwd) + "/src/third_party/libyuv"))) + (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) + (native-inputs (list perl pkg-config python-wrapper yasm)) (inputs - `(("alsa" ,alsa-lib) - ("ffmpeg" ,ffmpeg) - ("libjpeg" ,libjpeg-turbo) - ("glib" ,glib) - ("libvpx" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit "5b63f0f821e94f8072eb483014cfc33b05978bb9"))) - (file-name - (git-file-name "libvpx-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68")))) - ("libyuv" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") - (commit "ad890067f661dc747a975bc55ba3767fe30d4452"))) - (file-name - (git-file-name "libyuv-for-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("opus" ,opus) - ("pipewire" ,pipewire) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("x11" ,libx11) - ("xext" ,libxext) - ("xtst" ,libxtst))) + (list alsa-lib + ffmpeg + libjpeg-turbo + glib + libxcomposite + libxdamage + libxrender + libxrandr + openssl + opus + pipewire + protobuf + pulseaudio + libx11 + libxext + libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 04/11] gnu: telegram-desktop: Use modern package style. 2022-09-21 0:11 ` [bug#57675] [PATCH v7 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via @ 2022-09-21 0:11 ` Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 05/11] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (%telegram-version) (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rlottie-for-telegram-desktop,lib-rpl-for-telegram-desktop) (lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop) (lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): New variables (rlottie-for-telegram-desktop,libtgvoip-for-telegram-desktop): Use %telegram-version for version. (telegram-desktop): Use modern package style. Use %telegram-version for version. [native-inputs,inputs]: Remove sources in favor of variables. [arguments]<#:phases>: Copy sources with gexp. --- gnu/packages/telegram.scm | 738 +++++++++++++++++++------------------- 1 file changed, 370 insertions(+), 368 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index b9844c75f4..8cb6739979 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -72,6 +72,8 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) +(define %telegram-version "2.9.3") + (define libvpx-for-telegram-desktop (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") (revision "112")) @@ -102,6 +104,198 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define cmake-helpers-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (file-name + (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + +(define codegen-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (file-name + (git-file-name "codegen-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + +(define lib-base-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (file-name + (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + +(define lib-crl-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (file-name + (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + +(define lib-lottie-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (file-name + (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + +(define lib-qr-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (file-name + (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + +(define lib-rlottie-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) + (file-name + (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + +(define lib-rpl-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (file-name + (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + +(define lib-spellcheck-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (file-name + (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + +(define lib-storage-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (file-name + (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + +(define lib-tl-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (file-name + (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + +(define lib-ui-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (file-name + (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + +(define lib-waylandshells-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandshells.git") + (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) + (file-name + (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + +(define lib-webrtc-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (file-name + (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + +(define lib-webview-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (file-name + (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + +(define tgcalls-for-telegram-desktop + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (file-name + (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") (revision "166")) @@ -192,84 +386,75 @@ (define-public webrtc-for-telegram-desktop 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))))))))) + (hidden-package + (package + (inherit rlottie) + (version %telegram-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/rlottie.git") + (commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b"))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) + (arguments + `(#:configure-flags + (list + "-Dlog=true" + "-Ddumptree=true" + "-Dtest=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cxx-flags + (lambda _ + (substitute* "meson.build" + (("werror=true") + "werror=false")) + #t)))))))) (define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) + (hidden-package + (package + (inherit libtgvoip) + (version %telegram-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telegramdesktop/libtgvoip.git") + (commit "13a5fcb16b04472d808ce122abd695dbf5d206cd"))) + (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") - (version "2.9.3") + (version %telegram-version) (source (origin (method git-fetch) @@ -286,306 +471,123 @@ (define-public telegram-desktop (ice-9 ftw) (srfi srfi-1))) (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep))))))))) + #~(begin + (let ((keep + '( ;; Not available in Guix. + "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + (with-directory-excursion "Telegram/ThirdParty" + (for-each delete-file-recursively + (lset-difference string=? + (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 <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_waylandshells" ,(assoc-ref inputs "lib-waylandshells-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-source")) - ("Telegram/lib_webview" ,(assoc-ref inputs "lib-webview-source")) - ("Telegram/ThirdParty/tgcalls" ,(assoc-ref inputs "tgcalls-source")))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:tests? #f ; No target + #:imported-modules + `(,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + '((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils) + (ice-9 match)) + #:configure-flags + #~`(;; Client applications must provide their own API-ID and API-HASH, + ;; see also <https://core.telegram.org/api/obtaining_api_id>. + ;; In case, that the credentials below fail to work, contact + ;; Raghav Gururajan <rg@raghavgururajan.name> + "-DTDESKTOP_API_ID=2791056" + "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + ;; Disable WebkitGTK support as it fails to link + "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" + ;; Use bundled fonts as fallback. + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'make-writable 'copy-inputs + (lambda _ + (for-each + (match-lambda + ((dst src) + (copy-recursively src dst) + (for-each make-file-writable (find-files dst)))) + '(("cmake" #$cmake-helpers-for-telegram-desktop) + ("Telegram/codegen" #$codegen-for-telegram-desktop) + ("Telegram/lib_base" #$lib-base-for-telegram-desktop) + ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) + ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) + ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) + ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) + ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) + ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) + ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) + ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) + ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) + ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) + ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) + ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + (add-before 'configure 'patch-cxx-flags + (lambda _ + (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list cmake-shared + extra-cmake-modules + `(,glib "bin") + `(,gtk+ "bin") + pkg-config + python-wrapper + qttools-5)) (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("glibmm" ,glibmm-2.64) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("jemalloc" ,jemalloc) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - ("lib-waylandshells-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" version)) - (sha256 - (base32 "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - ("lib-webview-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" version)) - (sha256 - (base32 "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase-5) - ("qtsvg-5" ,qtsvg-5) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("rnnoise" ,rnnoise) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - (list dconf)) + (list alsa-lib + c++-gsl + catch2 + libexpected + fcitx-qt5 + fcitx5-qt + ffmpeg + glib + glibmm-2.64 + gtk+ + hime + hunspell + jemalloc + kwayland + libdbusmenu-qt + libjpeg-turbo + libtgvoip-for-telegram-desktop + lz4 + materialdecoration + minizip + nimf + openal + openssl + opus + pulseaudio + qrcodegen-cpp + qtbase-5 + qtsvg-5 + qt5ct + qtimageformats + qtwayland + range-v3 + rlottie-for-telegram-desktop + rnnoise + webrtc-for-telegram-desktop + libx11 + libxcb + xcb-util-keysyms + xxhash + zlib)) + (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 05/11] gnu: telegram-desktop: Change API ID. 2022-09-21 0:11 ` [bug#57675] [PATCH v7 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via @ 2022-09-21 0:12 ` Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop)[arguments]<#:configure-flags>: Use API ID from Telegram's official Snap builds. --- gnu/packages/telegram.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 8cb6739979..b67f0358a7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -493,12 +493,12 @@ (define-public telegram-desktop (guix build utils) (ice-9 match)) #:configure-flags - #~`(;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan <rg@raghavgururajan.name> - "-DTDESKTOP_API_ID=2791056" - "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + #~`(;; Client applications need an API ID and hash, see also: + ;; <https://core.telegram.org/api/obtaining_api_id>. Here, we + ;; use the ones given by the official Snap package, see: + ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" ;; Disable WebkitGTK support as it fails to link "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" ;; Use bundled fonts as fallback. -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 06/11] gnu: Add abseil-cpp-cxxstd17. 2022-09-21 0:12 ` [bug#57675] [PATCH v7 05/11] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via @ 2022-09-21 0:12 ` Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 07/11] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-21 0:12 ` [bug#57675] [PATCH v7 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-21 0:12 ` Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 08/11] gnu: kcoreaddons: Remove trailing #t. 2022-09-21 0:12 ` [bug#57675] [PATCH v7 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-21 0:12 ` Hilton Chain via Guix-patches via 2022-09-21 0:13 ` [bug#57675] [PATCH v7 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 09/11] gnu: kcoreaddons: Update to 5.98.0. 2022-09-21 0:12 ` [bug#57675] [PATCH v7 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-21 0:13 ` Hilton Chain via Guix-patches via 2022-09-21 0:13 ` [bug#57675] [PATCH v7 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-21 0:13 ` [bug#57675] [PATCH v7 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-21 0:13 ` Hilton Chain via Guix-patches via 2022-09-21 0:13 ` [bug#57675] [PATCH v7 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (libvpx-for-telegram-desktop): Remove variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Drop perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments]<#:phases>: Adjusted according to unbundled packages. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++ gnu/packages/telegram.scm | 95 ++++++++++--------- 3 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index b67f0358a7..6ae7311cfa 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -74,35 +77,35 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") - (revision "2211")) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name - "libyuv-for-telegram-desktop" + "crc32c-for-telegram-desktop" (git-version "0" revision commit))) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (origin @@ -297,8 +300,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,57 +317,61 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list #:tests? #f ; No target - #:configure-flags - #~`("-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") + (list #:tests? #f ; No target #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ - (let* ((libvpx-to (string-append (getcwd) - "/src/third_party/libvpx/source/libvpx")) - (libyuv-to (string-append (getcwd) - "/src/third_party/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) - (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -376,13 +383,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-21 0:13 ` [bug#57675] [PATCH v7 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-21 0:13 ` Hilton Chain via Guix-patches via 2022-09-21 4:46 ` Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 0:13 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop) (libtgvoip-for-telegram-desktop): Remove variables. (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.0. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++++++ gnu/packages/telegram.scm | 253 +++++++----------- 3 files changed, 224 insertions(+), 155 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6ae7311cfa..e7d716461a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -43,6 +43,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,7 +77,7 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") +(define %telegram-version "4.2.0") (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") @@ -107,197 +109,188 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (commit "b9f1b6036329e44ec61f51f0b363fe2319158b84"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) (define lib-rpl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (commit "839609369d04615475cb1518636de3619106a917"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (commit "82c4921045c440b727c38e464f3a0539708423ff"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -400,61 +393,16 @@ (define-public rlottie-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/rlottie.git") - (commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b"))) + (commit "8c69fc20cf2e150db304311f1233a4b55a8892d7"))) (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 - (hidden-package - (package - (inherit libtgvoip) - (version %telegram-version) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit "13a5fcb16b04472d808ce122abd695dbf5d206cd"))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs (list autoconf automake libtool pkg-config))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false"))))))))) (define-public telegram-desktop (package @@ -466,20 +414,23 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -487,14 +438,13 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags @@ -504,16 +454,17 @@ (define-public telegram-desktop ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -526,81 +477,73 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v7 11/11] gnu: telegram-desktop: Update to 4.2.0. 2022-09-21 0:13 ` [bug#57675] [PATCH v7 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-21 4:46 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 4:46 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler I'm told that these patches would go to staging branch for the update of cmake-extra-modules, so I'll add telegram-desktop 4.1.1 in the coming versions of this patchset. Thanks. ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 0/7] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (5 preceding siblings ...) 2022-09-21 0:10 ` [bug#57675] [PATCH v7 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-21 8:23 ` Hilton Chain via Guix-patches via 2022-09-21 8:24 ` [bug#57675] [PATCH v8 " Hilton Chain via Guix-patches via ` (6 subsequent siblings) 13 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 8:23 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v7 -> v8: 1. Add telegram-desktop 4.1.1, which does not require an updated cmake-extra-modules. 2. Remove %telegram-version, to avoid downloading all the sources each time updating telegram. Hilton Chain (7): gnu: Add abseil-cpp-cxxstd17. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: telegram-desktop: Update to 4.1.1. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 606 +++++++++--------- 6 files changed, 460 insertions(+), 326 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 344405475aebd6bcad60f29fc4ac0b7122a78fd0 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 0/7] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (6 preceding siblings ...) 2022-09-21 8:23 ` [bug#57675] [PATCH 0/7] " Hilton Chain via Guix-patches via @ 2022-09-21 8:24 ` Hilton Chain via Guix-patches via 2022-09-21 8:24 ` [bug#57675] [PATCH v8 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-21 14:15 ` [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via ` (5 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 8:24 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v7 -> v8: 1. Add telegram-desktop 4.1.1, which does not require an updated cmake-extra-modules. 2. Remove %telegram-version, to avoid downloading all the sources each time updating telegram. Hilton Chain (7): gnu: Add abseil-cpp-cxxstd17. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: telegram-desktop: Update to 4.1.1. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 606 +++++++++--------- 6 files changed, 460 insertions(+), 326 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 344405475aebd6bcad60f29fc4ac0b7122a78fd0 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 1/7] gnu: Add abseil-cpp-cxxstd17. 2022-09-21 8:24 ` [bug#57675] [PATCH v8 " Hilton Chain via Guix-patches via @ 2022-09-21 8:24 ` Hilton Chain via Guix-patches via 2022-09-21 8:24 ` [bug#57675] [PATCH v8 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 8:24 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-21 8:24 ` [bug#57675] [PATCH v8 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-21 8:24 ` Hilton Chain via Guix-patches via 2022-09-21 8:25 ` [bug#57675] [PATCH v8 3/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 8:24 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (libvpx-for-telegram-desktop): Remove variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments]<#:phases>: Adjusted according to unbundled packages. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 85 ++++++++++--------- 3 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..79086d845c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -74,35 +77,35 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") - (revision "2211")) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name - "libyuv-for-telegram-desktop" + "crc32c-for-telegram-desktop" (git-version "0" revision commit))) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (origin @@ -297,8 +300,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,58 +317,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -377,13 +384,11 @@ (define-public webrtc-for-telegram-desktop license:asl2.0 ;; LibYuv (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") - ;; OpenH264 - license:bsd-2 ;; PFFFT (license:non-copyleft "file:///src/third_party/pffft/LICENSE") ;; RnNoise license:gpl3 - ;; LibSRTP, LibVPx, UsrSCTP and Others + ;; LibSRTP, Crc32c and Others license:bsd-3)))))) (define-public rlottie-for-telegram-desktop -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 3/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-21 8:24 ` [bug#57675] [PATCH v8 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-21 8:25 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 8:25 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop) (libtgvoip-for-telegram-desktop,%telegram-desktop): Remove variables. (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.1.1. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++ gnu/packages/telegram.scm | 520 +++++++++--------- 3 files changed, 376 insertions(+), 270 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 79086d845c..d75c057251 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,8 +78,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) @@ -107,197 +108,230 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + (let ((commit "0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69") + (revision "430")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit commit))) + (file-name (git-file-name + "cmake-helpers-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa281zk1"))))) (define codegen-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + (let ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") + (revision "54")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit commit))) + (file-name (git-file-name + "codegen-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + (let ((commit "37fab6b4da32c91bc5d049baad2e9ad51cfcd195") + (revision "380")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit commit))) + (file-name (git-file-name + "lib-base-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq6l10k5"))))) (define lib-crl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") + (revision "21")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit commit))) + (file-name (git-file-name + "lib-crl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + (let ((commit "f3563bc6b0e042095d4d667d013f62cb8ae62b65") + (revision "57")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit commit))) + (file-name (git-file-name + "lib-lottie-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard76cgvsg"))))) (define lib-qr-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + (let ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") + (revision "10")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit commit))) + (file-name (git-file-name + "lib-qr-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) (define lib-rpl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + (let ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") + (revision "19")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit commit))) + (file-name (git-file-name + "lib-rpl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + (let ((commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060") + (revision "197")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit commit))) + (file-name (git-file-name + "lib-spellcheck-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vhyjhbwh"))))) (define lib-storage-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + (let ((commit "839609369d04615475cb1518636de3619106a917") + (revision "22")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit commit))) + (file-name (git-file-name + "lib-storage-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + (let ((commit "0d234b5aabf43d598e0cb0867566ee570d9e2755") + (revision "39")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit commit))) + (file-name (git-file-name + "lib-tl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7sxcd96"))))) (define lib-ui-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + (let ((commit "2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a") + (revision "883")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit commit))) + (file-name (git-file-name + "lib-ui-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05hbybfcn"))))) (define lib-webrtc-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + (let ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") + (revision "83")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit commit))) + (file-name (git-file-name + "lib-webrtc-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq"))))) (define lib-webview-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + (let ((commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35") + (revision "76")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit commit))) + (file-name (git-file-name + "lib-webview-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l"))))) (define tgcalls-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (let ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "921")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name + "tgcalls-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -392,8 +426,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "678")) (hidden-package (package (inherit rlottie) @@ -409,67 +443,17 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) - -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public telegram-desktop (package (name "telegram-desktop") - (version %telegram-version) + (version "4.1.1") (source (origin (method git-fetch) @@ -481,15 +465,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "0zhwaql1fk0nqr1x2lchcswz61x7sb2297qdxiysgqamr0fk9ppn")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -515,16 +503,17 @@ (define-public telegram-desktop ;; also stored in <#$source/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + (string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -537,81 +526,72 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (7 preceding siblings ...) 2022-09-21 8:24 ` [bug#57675] [PATCH v8 " Hilton Chain via Guix-patches via @ 2022-09-21 14:15 ` Hilton Chain via Guix-patches via 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-21 16:58 ` [bug#57675] [PATCH v8 RESEND 0/7] " Liliana Marie Prikler 2022-09-22 2:25 ` [bug#57675] [PATCH v9 0/8] " Hilton Chain via Guix-patches via ` (4 subsequent siblings) 13 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:15 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v7 -> v8: 1. Add telegram-desktop 4.1.1, which does not require an updated cmake-extra-modules. 2. Remove %telegram-version, to avoid downloading all the sources each time updating telegram. v8 -> v8 RESEND: Finally figured out mime stuff..... Hilton Chain (7): gnu: Add abseil-cpp-cxxstd17. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: telegram-desktop: Update to 4.1.1. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: telegram-desktop: Update to 4.2.0. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 606 +++++++++--------- 6 files changed, 460 insertions(+), 326 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 344405475aebd6bcad60f29fc4ac0b7122a78fd0 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 1/7] gnu: Add abseil-cpp-cxxstd17. 2022-09-21 14:15 ` [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-21 14:16 ` Hilton Chain via Guix-patches via 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-21 16:58 ` [bug#57675] [PATCH v8 RESEND 0/7] " Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:16 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-21 14:16 ` Hilton Chain via Guix-patches via 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 3/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:16 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (libvpx-for-telegram-desktop): Remove variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments]<#:phases>: Adjusted according to unbundled packages. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 85 ++++++++++--------- 3 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..79086d845c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -74,35 +77,35 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) +(define libyuv-for-telegram-desktop + (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") + (revision "2211")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") + (url "https://chromium.googlesource.com/libyuv/libyuv") (commit commit))) (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) + "libyuv-for-telegram-desktop" + (git-version "0" revision commit))) (sha256 (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) + "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define libyuv-for-telegram-desktop - (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") - (revision "2211")) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) (origin (method git-fetch) (uri (git-reference - (url "https://chromium.googlesource.com/libyuv/libyuv") + (url "https://github.com/google/crc32c") (commit commit))) (file-name (git-file-name - "libyuv-for-telegram-desktop" + "crc32c-for-telegram-desktop" (git-version "0" revision commit))) (sha256 (base32 - "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) (define cmake-helpers-for-telegram-desktop (origin @@ -297,8 +300,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,58 +317,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -377,13 +384,11 @@ (define-public webrtc-for-telegram-desktop license:asl2.0 ;; LibYuv (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") - ;; OpenH264 - license:bsd-2 ;; PFFFT (license:non-copyleft "file:///src/third_party/pffft/LICENSE") ;; RnNoise license:gpl3 - ;; LibSRTP, LibVPx, UsrSCTP and Others + ;; LibSRTP, Crc32c and Others license:bsd-3)))))) (define-public rlottie-for-telegram-desktop -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 3/7] gnu: telegram-desktop: Update to 4.1.1. 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-21 14:17 ` Hilton Chain via Guix-patches via 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 4/7] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (lib-rlottie-for-telegram-desktop,lib-waylandshells-for-telegram-desktop) (libtgvoip-for-telegram-desktop,%telegram-desktop): Remove variables. (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.1.1. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++ gnu/packages/telegram.scm | 520 +++++++++--------- 3 files changed, 376 insertions(+), 270 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 79086d845c..d75c057251 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,8 +78,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) @@ -107,197 +108,230 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + (let ((commit "0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69") + (revision "430")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit commit))) + (file-name (git-file-name + "cmake-helpers-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa281zk1"))))) (define codegen-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + (let ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") + (revision "54")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit commit))) + (file-name (git-file-name + "codegen-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + (let ((commit "37fab6b4da32c91bc5d049baad2e9ad51cfcd195") + (revision "380")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit commit))) + (file-name (git-file-name + "lib-base-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq6l10k5"))))) (define lib-crl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") + (revision "21")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit commit))) + (file-name (git-file-name + "lib-crl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + (let ((commit "f3563bc6b0e042095d4d667d013f62cb8ae62b65") + (revision "57")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit commit))) + (file-name (git-file-name + "lib-lottie-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard76cgvsg"))))) (define lib-qr-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + (let ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") + (revision "10")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit commit))) + (file-name (git-file-name + "lib-qr-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) (define lib-rpl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + (let ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") + (revision "19")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit commit))) + (file-name (git-file-name + "lib-rpl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + (let ((commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060") + (revision "197")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit commit))) + (file-name (git-file-name + "lib-spellcheck-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vhyjhbwh"))))) (define lib-storage-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + (let ((commit "839609369d04615475cb1518636de3619106a917") + (revision "22")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit commit))) + (file-name (git-file-name + "lib-storage-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + (let ((commit "0d234b5aabf43d598e0cb0867566ee570d9e2755") + (revision "39")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit commit))) + (file-name (git-file-name + "lib-tl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7sxcd96"))))) (define lib-ui-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + (let ((commit "2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a") + (revision "883")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit commit))) + (file-name (git-file-name + "lib-ui-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05hbybfcn"))))) (define lib-webrtc-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + (let ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") + (revision "83")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit commit))) + (file-name (git-file-name + "lib-webrtc-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq"))))) (define lib-webview-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + (let ((commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35") + (revision "76")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit commit))) + (file-name (git-file-name + "lib-webview-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l"))))) (define tgcalls-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (let ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "921")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name + "tgcalls-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -392,8 +426,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "678")) (hidden-package (package (inherit rlottie) @@ -409,67 +443,17 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) - -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public telegram-desktop (package (name "telegram-desktop") - (version %telegram-version) + (version "4.1.1") (source (origin (method git-fetch) @@ -481,15 +465,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "0zhwaql1fk0nqr1x2lchcswz61x7sb2297qdxiysgqamr0fk9ppn")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -515,16 +503,17 @@ (define-public telegram-desktop ;; also stored in <#$source/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + (string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -537,81 +526,72 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 4/7] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 3/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via @ 2022-09-21 14:17 ` Hilton Chain via Guix-patches via 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 5/7] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 5/7] gnu: kcoreaddons: Remove trailing #t. 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 4/7] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-21 14:17 ` Hilton Chain via Guix-patches via 2022-09-21 14:18 ` [bug#57675] [PATCH v8 RESEND 6/7] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 6/7] gnu: kcoreaddons: Update to 5.98.0. 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 5/7] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-21 14:18 ` Hilton Chain via Guix-patches via 2022-09-21 14:18 ` [bug#57675] [PATCH v8 RESEND 7/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:18 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 7/7] gnu: telegram-desktop: Update to 4.2.0. 2022-09-21 14:18 ` [bug#57675] [PATCH v8 RESEND 6/7] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-21 14:18 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 14:18 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop): Update to 4.2.0. [inputs]: Add kcoreaddons. (cmake-helpers-for-telegram-desktop,lib-base-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop) (tgcalls-for-telegram-desktop): Bump to submodule checkout. --- gnu/packages/telegram.scm | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d75c057251..9734f6cfe3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -124,8 +124,8 @@ (define dispatch-for-telegram-desktop "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) (define cmake-helpers-for-telegram-desktop - (let ((commit "0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69") - (revision "430")) + (let ((commit "b9f1b6036329e44ec61f51f0b363fe2319158b84") + (revision "444")) (origin (method git-fetch) (uri (git-reference @@ -136,7 +136,7 @@ (define cmake-helpers-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "16lsm3pb8md4ksr2ps3bnkvr0jygdamkxyirxgz214n6wa281zk1"))))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3"))))) (define codegen-for-telegram-desktop (let ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") @@ -154,8 +154,8 @@ (define codegen-for-telegram-desktop "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (let ((commit "37fab6b4da32c91bc5d049baad2e9ad51cfcd195") - (revision "380")) + (let ((commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5") + (revision "383")) (origin (method git-fetch) (uri (git-reference @@ -166,7 +166,7 @@ (define lib-base-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1b2zc0ag5w46vwjz2240yj9aniyv09yjyrwif32994drfq6l10k5"))))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27"))))) (define lib-crl-for-telegram-desktop (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") @@ -184,8 +184,8 @@ (define lib-crl-for-telegram-desktop "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (let ((commit "f3563bc6b0e042095d4d667d013f62cb8ae62b65") - (revision "57")) + (let ((commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904") + (revision "61")) (origin (method git-fetch) (uri (git-reference @@ -196,7 +196,7 @@ (define lib-lottie-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0i0w6lcrmqln7axnlazcqkaj4z0lzn0gl3z59hng40ard76cgvsg"))))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4"))))) (define lib-qr-for-telegram-desktop (let ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") @@ -229,8 +229,8 @@ (define lib-rpl-for-telegram-desktop "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (let ((commit "b2f2b7b6bce60bc1c6429a6b5ec4bc5891baa060") - (revision "197")) + (let ((commit "0e386e22cb6ba8a114b569840a635e096dcb645e") + (revision "198")) (origin (method git-fetch) (uri (git-reference @@ -241,7 +241,7 @@ (define lib-spellcheck-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1v8xdbwza457wmjkfmpys46g5g1aw7yabjab6knxd4p4vhyjhbwh"))))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw"))))) (define lib-storage-for-telegram-desktop (let ((commit "839609369d04615475cb1518636de3619106a917") @@ -259,8 +259,8 @@ (define lib-storage-for-telegram-desktop "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (let ((commit "0d234b5aabf43d598e0cb0867566ee570d9e2755") - (revision "39")) + (let ((commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa") + (revision "42")) (origin (method git-fetch) (uri (git-reference @@ -271,11 +271,11 @@ (define lib-tl-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1wc8d94h4ga36yl9g8h67j914xwpwv7rmkrrvvslgbgxb7sxcd96"))))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk"))))) (define lib-ui-for-telegram-desktop - (let ((commit "2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a") - (revision "883")) + (let ((commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3") + (revision "917")) (origin (method git-fetch) (uri (git-reference @@ -286,7 +286,7 @@ (define lib-ui-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "09kmc1igh37wafngwk6raqx2wrlxg10lf9p72j84sxs05hbybfcn"))))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5"))))) (define lib-webrtc-for-telegram-desktop (let ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") @@ -453,7 +453,7 @@ (define-public rlottie-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "4.1.1") + (version "4.2.0") (source (origin (method git-fetch) @@ -465,7 +465,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0zhwaql1fk0nqr1x2lchcswz61x7sb2297qdxiysgqamr0fk9ppn")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) (patches (search-patches ;; https://github.com/telegramdesktop/tdesktop/pull/24126 @@ -551,6 +551,7 @@ (define-public telegram-desktop c++-gsl ffmpeg jemalloc + kcoreaddons libexpected libjpeg-turbo libvpx -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0. 2022-09-21 14:15 ` [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-21 16:58 ` Liliana Marie Prikler 2022-09-21 23:42 ` Hilton Chain via Guix-patches via 1 sibling, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-21 16:58 UTC (permalink / raw) To: Hilton Chain, 57675 Am Mittwoch, dem 21.09.2022 um 22:15 +0800 schrieb Hilton Chain: > v7 -> v8: > 1. Add telegram-desktop 4.1.1, which does not require an updated > cmake-extra-modules. > 2. Remove %telegram-version, to avoid downloading all the sources > each time updating > telegram. > > v8 -> v8 RESEND: Finally figured out mime stuff..... > > Hilton Chain (7): > gnu: Add abseil-cpp-cxxstd17. > gnu: webrtc-for-telegram-desktop: Update to 621f3da5. > gnu: telegram-desktop: Update to 4.1.1. > gnu: extra-cmake-modules: Update to 5.98.0. > gnu: kcoreaddons: Remove trailing #t. > gnu: kcoreaddons: Update to 5.98.0. > gnu: telegram-desktop: Update to 4.2.0. Is there a *good* reason for the intermediate step? Also, the %telegram-version was so that we can update the submodules (whose hashes I assume change with updated telegrams) more easily. Is there a better versioning scheme for those? Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0. 2022-09-21 16:58 ` [bug#57675] [PATCH v8 RESEND 0/7] " Liliana Marie Prikler @ 2022-09-21 23:42 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-21 23:42 UTC (permalink / raw) To: Liliana Marie Prikler, 57675 >Is there a *good* reason for the intermediate step? No.... >Also, the %telegram-version was so that we can update the submodules >(whose hashes I assume change with updated telegrams) more easily. Is >there a better versioning scheme for those? Not all submodules need updating when new releases out. Another approach is just cloning recursively and remove all sources within ThirdParty folder via snippet, then only tracking version changes of these removed ones (or unbundle them when applicable). ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 0/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (8 preceding siblings ...) 2022-09-21 14:15 ` [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:25 ` Hilton Chain via Guix-patches via 2022-09-22 2:25 ` [bug#57675] [PATCH v9 1/8] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 0/9] " Hilton Chain via Guix-patches via ` (3 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:25 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v8 (ver. w/o 4.1.1) -> v9: Split out removings. Hilton Chain (8): gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: Remove libvpx-for-telegram-desktop. gnu: telegram-desktop: Update to 4.2.0. gnu: telegram: Remove unneeded variables. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 403 ++++++++---------- 6 files changed, 334 insertions(+), 249 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 1a1ff7ed8fdaae58aff0e8625399cd7354038ca3 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 1/8] gnu: Add abseil-cpp-cxxstd17. 2022-09-22 2:25 ` [bug#57675] [PATCH v9 0/8] " Hilton Chain via Guix-patches via @ 2022-09-22 2:25 ` Hilton Chain via Guix-patches via 2022-09-22 2:25 ` [bug#57675] [PATCH v9 2/8] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:25 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 2/8] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-22 2:25 ` [bug#57675] [PATCH v9 1/8] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-22 2:25 ` Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 3/8] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:25 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 3/8] gnu: kcoreaddons: Remove trailing #t. 2022-09-22 2:25 ` [bug#57675] [PATCH v9 2/8] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:26 ` Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 4/8] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:26 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 4/8] gnu: kcoreaddons: Update to 5.98.0. 2022-09-22 2:26 ` [bug#57675] [PATCH v9 3/8] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-22 2:26 ` Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:26 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-22 2:26 ` [bug#57675] [PATCH v9 4/8] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:26 ` Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:26 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments<#:phases>,license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++++ gnu/packages/telegram.scm | 74 ++++++++++++------- 3 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..a9e1cc1ff7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -104,6 +107,21 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit commit))) + (file-name (git-file-name + "crc32c-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -297,8 +315,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,58 +332,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -377,13 +399,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 6/8] gnu: Remove libvpx-for-telegram-desktop. 2022-09-22 2:26 ` [bug#57675] [PATCH v9 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-22 2:26 ` Hilton Chain via Guix-patches via 2022-09-22 2:27 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:26 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. --- gnu/packages/telegram.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index a9e1cc1ff7..79086d845c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -77,21 +77,6 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit commit))) - (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-22 2:26 ` [bug#57675] [PATCH v9 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-22 2:27 ` Hilton Chain via Guix-patches via 2022-09-22 2:27 ` [bug#57675] [PATCH v9 8/8] gnu: telegram: Remove unneeded variables Hilton Chain via Guix-patches via 2022-09-22 20:08 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:27 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.0. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++++++ gnu/packages/telegram.scm | 257 +++++++++--------- 3 files changed, 253 insertions(+), 130 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 79086d845c..2157988b07 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -43,6 +43,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,7 +77,7 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") +(define %telegram-version "4.2.0") (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") @@ -107,77 +109,92 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (commit "b9f1b6036329e44ec61f51f0b363fe2319158b84"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) (define lib-rlottie-for-telegram-desktop (origin @@ -196,60 +213,60 @@ (define lib-rpl-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (commit "839609369d04615475cb1518636de3619106a917"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) (define lib-waylandshells-for-telegram-desktop (origin @@ -268,36 +285,36 @@ (define lib-webrtc-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (commit "82c4921045c440b727c38e464f3a0539708423ff"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -341,18 +358,17 @@ (define-public webrtc-for-telegram-desktop (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list - #:tests? #f ; No target - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'copy-inputs - (lambda _ - (let* ((third-party (string-append (getcwd) "/src/third_party")) - (crc32c-to (string-append third-party "/crc32c/src")) - (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) - (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + (list #:tests? #f ; No target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 @@ -392,38 +408,25 @@ (define-public webrtc-for-telegram-desktop 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))))))))) + (hidden-package + (package + (inherit rlottie) + (version %telegram-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/rlottie.git") + (commit "8c69fc20cf2e150db304311f1233a4b55a8892d7"))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false"))))))))) (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") @@ -476,20 +479,23 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -497,34 +503,33 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags - #~(list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; Here, we snarf the keys from the official Snaps, which are - ;; also stored in <#$source/snap/snapcraft.yaml>. - "-DTDESKTOP_API_ID=611335" - "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #~`(;; Client applications need an API ID and hash, see also: + ;; <https://core.telegram.org/api/obtaining_api_id>. Here, we + ;; use the ones given by the official Snap package, see: + ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -537,81 +542,73 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 8/8] gnu: telegram: Remove unneeded variables. 2022-09-22 2:27 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:27 ` Hilton Chain via Guix-patches via 2022-09-22 20:08 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:27 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (lib-rlottie-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,libtgvoip-for-telegram-desktop): Remove variables. --- gnu/packages/telegram.scm | 65 --------------------------------------- 1 file changed, 65 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 2157988b07..e7d716461a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -196,18 +196,6 @@ (define lib-qr-for-telegram-desktop (base32 "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - (define lib-rpl-for-telegram-desktop (origin (method git-fetch) @@ -268,18 +256,6 @@ (define lib-ui-for-telegram-desktop (base32 "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) @@ -428,47 +404,6 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false"))))))))) -(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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-22 2:27 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-22 2:27 ` [bug#57675] [PATCH v9 8/8] gnu: telegram: Remove unneeded variables Hilton Chain via Guix-patches via @ 2022-09-22 20:08 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-22 20:08 UTC (permalink / raw) To: Hilton Chain, 57675 Am Donnerstag, dem 22.09.2022 um 10:27 +0800 schrieb Hilton Chain: > - (list #:tests? #f ; No target > + (list #:tests? #f ;No target Refrain from making gratuitous changes like this one... > - #~(list > - ;; Client applications must provide their own API-ID > and API-HASH, > - ;; see also > <https://core.telegram.org/api/obtaining_api_id>. > - ;; Here, we snarf the keys from the official Snaps, > which are > - ;; also stored in <#$source/snap/snapcraft.yaml>. > - "-DTDESKTOP_API_ID=611335" > - "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" > - ;; Disable WebkitGTK support as it fails to link > - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" > - ;; Use bundled fonts as fallback. > - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") > + #~`(;; Client applications need an API ID and hash, see > also: > + ;; <https://core.telegram.org/api/obtaining_api_id>. > Here, we > + ;; use the ones given by the official Snap package, > see: > + ;; > <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft. > yaml>. > + "-DTDESKTOP_API_ID=611335" > + "- > DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" > + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" > + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" > + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" > + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" > + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" ... or this one. Neither improve the package. > - ((guix build glib-or-gtk-build-system) > - #:prefix glib-or-gtk:) > + ((guix build glib-or-gtk-build-system) #:prefix glib- > or-gtk:) This change is dubious too – while it fits in 80 characters, it just as well fits in two lines, plus it's a cosmetic change mixed with functional ones. > > #$name)) > #:phases > #~(modify-phases %standard-phases > (add-after 'unpack 'make-writable > (lambda _ > (for-each make-file-writable (find-files ".")))) > - (add-after 'make-writable 'copy-inputs > + (add-after 'make-writable 'copy-sources Maybe we should make this an after unpack 'unpack-additional-sources. As for the submodule suggestion, explicit is better than implicit. #:recursive? #t might be nice for personal testing, but on a distro scale it's asking for trouble, especially with upgrades as you never know what additional sources get pulled in or not and whether your cleanup still does what it should. Thus, we typically discourage its use and Telegram is one of the prime examples of why *not* to apply it. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 0/9] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (9 preceding siblings ...) 2022-09-22 2:25 ` [bug#57675] [PATCH v9 0/8] " Hilton Chain via Guix-patches via @ 2022-09-22 2:30 ` Hilton Chain via Guix-patches via 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 1/9] gnu: telegram-desktop: Fetch submodules recursively Hilton Chain via Guix-patches via 2022-09-23 9:15 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via ` (2 subsequent siblings) 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:30 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v8 (ver. w/o 4.1.1) -> v9 RESCURSIVE CLONE: Aforementioned approach. Hilton Chain (9): gnu: telegram-desktop: Fetch submodules recursively. gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: Remove libvpx-for-telegram-desktop. gnu: telegram-desktop: Update to 4.2.0. gnu: Remove libtgvoip-for-telegram-desktop. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 483 +++++------------- 6 files changed, 294 insertions(+), 369 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 1a1ff7ed8fdaae58aff0e8625399cd7354038ca3 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 1/9] gnu: telegram-desktop: Fetch submodules recursively. 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 0/9] " Hilton Chain via Guix-patches via @ 2022-09-22 2:30 ` Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 2/9] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:30 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (%telegram-version) (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rlottie-for-telegram-desktop,lib-rpl-for-telegram-desktop) (lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop) (lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop): Remove variables. (tgcalls-for-telegram-desktop): Use git revision rather than telegram version. (telegram-desktop): Fetch submodules recursively. [arguments]<#:phases>: Adjust accordingly. --- gnu/packages/telegram.scm | 235 ++++---------------------------------- 1 file changed, 20 insertions(+), 215 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..eb94f3b995 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -72,8 +72,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") - (define libvpx-for-telegram-desktop (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") (revision "112")) @@ -104,197 +102,20 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define cmake-helpers-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) - -(define codegen-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) - -(define lib-base-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) - -(define lib-crl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) - -(define lib-lottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) - -(define lib-qr-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) - -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - -(define lib-rpl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) - -(define lib-spellcheck-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) - -(define lib-storage-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) - -(define lib-tl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) - -(define lib-ui-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) - -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - -(define lib-webrtc-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) - -(define lib-webview-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) - (define tgcalls-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") + (revision "738")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name + "tgcalls-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") @@ -464,19 +285,18 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version %telegram-version) + (version "2.9.3") (source (origin (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (uri (git-reference + (url "https://github.com/telegramdesktop/tdesktop.git") + (commit (string-append "v" version)) + (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -526,22 +346,7 @@ (define-public telegram-desktop ((dst src) (copy-recursively src dst) (for-each make-file-writable (find-files dst)))) - '(("cmake" #$cmake-helpers-for-telegram-desktop) - ("Telegram/codegen" #$codegen-for-telegram-desktop) - ("Telegram/lib_base" #$lib-base-for-telegram-desktop) - ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) - ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) - ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) - ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) - ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) - ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) - ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) - ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) - ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) - ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) - ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) + '(("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) (add-before 'configure 'patch-cxx-flags (lambda _ (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 2/9] gnu: Add abseil-cpp-cxxstd17. 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 1/9] gnu: telegram-desktop: Fetch submodules recursively Hilton Chain via Guix-patches via @ 2022-09-22 2:31 ` Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 3/9] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:31 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 3/9] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 2/9] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-22 2:31 ` Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 4/9] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:31 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 4/9] gnu: kcoreaddons: Remove trailing #t. 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 3/9] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:31 ` Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 5/9] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:31 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 5/9] gnu: kcoreaddons: Update to 5.98.0. 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 4/9] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-22 2:31 ` Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:31 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 5/9] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:32 ` Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 7/9] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments<#:phases>,license]: Adjust accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++++ gnu/packages/telegram.scm | 74 ++++++++++++------- 3 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index eb94f3b995..fde273f254 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -102,6 +105,21 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit commit))) + (file-name (git-file-name + "crc32c-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) + (define tgcalls-for-telegram-desktop (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") (revision "738")) @@ -118,8 +136,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -135,58 +153,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -198,13 +220,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 7/9] gnu: Remove libvpx-for-telegram-desktop. 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-22 2:32 ` Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 8/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. --- gnu/packages/telegram.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index fde273f254..fc0b50e1c1 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -75,21 +75,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit commit))) - (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 8/9] gnu: telegram-desktop: Update to 4.2.0. 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 7/9] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-22 2:32 ` Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 9/9] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.0. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++++++++++++++ gnu/packages/telegram.scm | 138 +++++++++--------- 3 files changed, 199 insertions(+), 65 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index fc0b50e1c1..85108c4278 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -105,9 +108,24 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define tgcalls-for-telegram-desktop - (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") - (revision "738")) + (let ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "921")) (origin (method git-fetch) (uri (git-reference @@ -118,7 +136,7 @@ (define tgcalls-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -213,8 +231,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "678")) (hidden-package (package (inherit rlottie) @@ -230,21 +248,12 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") @@ -290,7 +299,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.2.0") (source (origin (method git-fetch) @@ -301,15 +310,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "07mw09gmxy2pcga856wbsqmbgl2l5a3ix0hr5p6hlvk7pq260s36")) + (base32 "1wpqn79pbarz48kmrh6gciw4a9y5hiki5qczlvj8smvx9is6yrf8")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -335,88 +348,83 @@ (define-public telegram-desktop ;; also stored in <#$source/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + (string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda ((dst src) (copy-recursively src dst) (for-each make-file-writable (find-files dst)))) - '(("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) + '(("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) + ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v9 RECURSIVE CLONE 9/9] gnu: Remove libtgvoip-for-telegram-desktop. 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 8/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-22 2:32 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-22 2:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libtgvoip-for-telegram-desktop): Remove variable. --- gnu/packages/telegram.scm | 41 --------------------------------------- 1 file changed, 41 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 85108c4278..8c6298309f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -255,47 +255,6 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false")))))))))) -(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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (10 preceding siblings ...) 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 0/9] " Hilton Chain via Guix-patches via @ 2022-09-23 9:15 ` Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 1/9] gnu: telegram: Revision-based version for additional sources Hilton Chain via Guix-patches via 2022-09-23 14:54 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 2022-09-24 7:07 ` [bug#57675] [PATCH v11 0/8] " Hilton Chain via Guix-patches via 2022-09-26 13:28 ` [bug#57675] [PATCH 00/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via 13 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:15 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v9 -> v10: Use revision rather than %telegram-version. Hilton Chain (9): gnu: telegram: Revision-based version for additional sources. gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: Remove libvpx-for-telegram-desktop. gnu: telegram-desktop: Update to 4.2.0. gnu: telegram: Remove unused variables. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 + gnu/packages/telegram.scm | 642 +++++++++--------- 6 files changed, 486 insertions(+), 336 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: a57c4eff6bbdcff79294fa15ecb95ab2b3c55bb4 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 1/9] gnu: telegram: Revision-based version for additional sources. 2022-09-23 9:15 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-23 9:16 ` Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 2/9] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-23 14:54 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:16 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (%telegram-desktop): Remove variable. (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rlottie-for-telegram-desktop,lib-rpl-for-telegram-desktop) (lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop) (lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Use revision-based versions. --- gnu/packages/telegram.scm | 394 ++++++++++++++++++++++---------------- 1 file changed, 229 insertions(+), 165 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..08cf04fc47 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -72,8 +72,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") - (define libvpx-for-telegram-desktop (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") (revision "112")) @@ -104,197 +102,263 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) -(define cmake-helpers-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) +;; NOTE: +;; TDESKTOP_KEEP=(tgcalls) +;; git checkout v2.9.3 +;; git submodule init +;; git submodule deinit --force Telegram/ThirdParty +;; +;; for source in ${TDESKTOP_KEEP} +;; do +;; git submodule init "Telegram/ThirdParty/${source}" +;; done +;; +;; git submodule update --checkout +;; git submodule foreach "git rev-parse HEAD \ +;; && git rev-list HEAD | wc -l \ +;; && guix hash -rx . \ +;; && echo ------" \ +;; | less + +(define tgcalls-for-telegram-desktop + (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") + (revision "738")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TelegramMessenger/tgcalls.git") + (commit commit))) + (file-name (git-file-name + "tgcalls-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) (define codegen-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) - (file-name - (git-file-name "codegen-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + (let ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119") + (revision "35")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/codegen.git") + (commit commit))) + (file-name (git-file-name + "codegen-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))) (define lib-base-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + (let ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6") + (revision "265")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_base.git") + (commit commit))) + (file-name (git-file-name + "lib-base-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))) (define lib-crl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") + (revision "16")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_crl.git") + (commit commit))) + (file-name (git-file-name + "lib-crl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + (let ((commit "0770df009db7928df1d0cad0900dc5110106d229") + (revision "26")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_lottie.git") + (commit commit))) + (file-name (git-file-name + "lib-lottie-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))) (define lib-qr-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + (let ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189") + (revision "7")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_qr.git") + (commit commit))) + (file-name (git-file-name + "lib-qr-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))) (define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) + (let ((commit "0671bf70547381effcf442ec9618e04502a8adbc") + (revision "2")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rlottie.git") + (commit commit))) + (file-name (git-file-name + "lib-rlottie-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) (define lib-rpl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + (let ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617") + (revision "15")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_rpl.git") + (commit commit))) + (file-name (git-file-name + "lib-rpl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))) (define lib-spellcheck-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + (let ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094") + (revision "187")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_spellcheck.git") + (commit commit))) + (file-name (git-file-name + "lib-spellcheck-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))) (define lib-storage-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + (let ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1") + (revision "20")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_storage.git") + (commit commit))) + (file-name (git-file-name + "lib-storage-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))) (define lib-tl-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + (let ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb") + (revision "24")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_tl.git") + (commit commit))) + (file-name (git-file-name + "lib-tl-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))) (define lib-ui-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + (let ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f") + (revision "508")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_ui.git") + (commit commit))) + (file-name (git-file-name + "lib-ui-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))) (define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) + (let ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") + (revision "6")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_waylandshells.git") + (commit commit))) + (file-name (git-file-name + "lib-waylandshells-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) (define lib-webrtc-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + (let ((commit "ef49f953f12b112008a094a719f40939aaf39db4") + (revision "72")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webrtc.git") + (commit commit))) + (file-name (git-file-name + "lib-webrtc-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))) (define lib-webview-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) - (file-name - (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + (let ((commit "e06427c624515485774e2e2181d4afeb05ad5a67") + (revision "40")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/lib_webview.git") + (commit commit))) + (file-name (git-file-name + "lib-webview-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))) -(define tgcalls-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) +(define cmake-helpers-for-telegram-desktop + (let ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") + (revision "261")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/cmake_helpers.git") + (commit commit))) + (file-name (git-file-name + "cmake-helpers-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) (define-public webrtc-for-telegram-desktop (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") @@ -464,7 +528,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version %telegram-version) + (version "2.9.3") (source (origin (method git-fetch) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 2/9] gnu: Add abseil-cpp-cxxstd17. 2022-09-23 9:16 ` [bug#57675] [PATCH v10 1/9] gnu: telegram: Revision-based version for additional sources Hilton Chain via Guix-patches via @ 2022-09-23 9:16 ` Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 3/9] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:16 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 3/9] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-23 9:16 ` [bug#57675] [PATCH v10 2/9] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-23 9:16 ` Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 4/9] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:16 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 4/9] gnu: kcoreaddons: Remove trailing #t. 2022-09-23 9:16 ` [bug#57675] [PATCH v10 3/9] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-23 9:17 ` Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 5/9] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 5/9] gnu: kcoreaddons: Update to 5.98.0. 2022-09-23 9:17 ` [bug#57675] [PATCH v10 4/9] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-23 9:17 ` Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-23 9:17 ` [bug#57675] [PATCH v10 5/9] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-23 9:17 ` Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 7/9] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments<#:phases>,license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 76 ++++++++++++------- 3 files changed, 70 insertions(+), 28 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 08cf04fc47..23aeae78e9 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -102,6 +105,21 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit commit))) + (file-name (git-file-name + "crc32c-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) + ;; NOTE: ;; TDESKTOP_KEEP=(tgcalls) ;; git checkout v2.9.3 @@ -361,8 +379,8 @@ (define cmake-helpers-for-telegram-desktop "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -378,58 +396,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'copy-inputs + (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -441,13 +463,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 7/9] gnu: Remove libvpx-for-telegram-desktop. 2022-09-23 9:17 ` [bug#57675] [PATCH v10 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-23 9:17 ` Hilton Chain via Guix-patches via 2022-09-23 9:18 ` [bug#57675] [PATCH v10 8/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:17 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. --- gnu/packages/telegram.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 23aeae78e9..595a649017 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -75,21 +75,6 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit commit))) - (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 8/9] gnu: telegram-desktop: Update to 4.2.0. 2022-09-23 9:17 ` [bug#57675] [PATCH v10 7/9] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-23 9:18 ` Hilton Chain via Guix-patches via 2022-09-23 9:18 ` [bug#57675] [PATCH v10 9/9] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:18 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (tgcalls-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,cmake-helpers-for-telegram-desktop): Bump to source checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.0. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted accordingly. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++++++++ gnu/packages/telegram.scm | 226 +++++++++--------- 3 files changed, 241 insertions(+), 111 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 595a649017..397bd43534 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -105,9 +108,24 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + ;; NOTE: ;; TDESKTOP_KEEP=(tgcalls) -;; git checkout v2.9.3 +;; git checkout v4.2.0 ;; git submodule init ;; git submodule deinit --force Telegram/ThirdParty ;; @@ -124,8 +142,8 @@ (define crc32c-for-telegram-desktop ;; | less (define tgcalls-for-telegram-desktop - (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3") - (revision "738")) + (let ((commit "82c4921045c440b727c38e464f3a0539708423ff") + (revision "921")) (origin (method git-fetch) (uri (git-reference @@ -136,11 +154,11 @@ (define tgcalls-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk"))))) (define codegen-for-telegram-desktop - (let ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119") - (revision "35")) + (let ((commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c") + (revision "54")) (origin (method git-fetch) (uri (git-reference @@ -151,11 +169,11 @@ (define codegen-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2"))))) (define lib-base-for-telegram-desktop - (let ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6") - (revision "265")) + (let ((commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5") + (revision "383")) (origin (method git-fetch) (uri (git-reference @@ -166,11 +184,11 @@ (define lib-base-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27"))))) (define lib-crl-for-telegram-desktop (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec") - (revision "16")) + (revision "21")) (origin (method git-fetch) (uri (git-reference @@ -184,8 +202,8 @@ (define lib-crl-for-telegram-desktop "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x"))))) (define lib-lottie-for-telegram-desktop - (let ((commit "0770df009db7928df1d0cad0900dc5110106d229") - (revision "26")) + (let ((commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904") + (revision "61")) (origin (method git-fetch) (uri (git-reference @@ -196,11 +214,11 @@ (define lib-lottie-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4"))))) (define lib-qr-for-telegram-desktop - (let ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189") - (revision "7")) + (let ((commit "501f4c3502fd872ab4d777df8911bdac32de7c48") + (revision "10")) (origin (method git-fetch) (uri (git-reference @@ -211,7 +229,7 @@ (define lib-qr-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) (define lib-rlottie-for-telegram-desktop (let ((commit "0671bf70547381effcf442ec9618e04502a8adbc") @@ -229,8 +247,8 @@ (define lib-rlottie-for-telegram-desktop "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) (define lib-rpl-for-telegram-desktop - (let ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617") - (revision "15")) + (let ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") + (revision "19")) (origin (method git-fetch) (uri (git-reference @@ -241,11 +259,11 @@ (define lib-rpl-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf"))))) (define lib-spellcheck-for-telegram-desktop - (let ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094") - (revision "187")) + (let ((commit "0e386e22cb6ba8a114b569840a635e096dcb645e") + (revision "198")) (origin (method git-fetch) (uri (git-reference @@ -256,11 +274,11 @@ (define lib-spellcheck-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw"))))) (define lib-storage-for-telegram-desktop - (let ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1") - (revision "20")) + (let ((commit "839609369d04615475cb1518636de3619106a917") + (revision "22")) (origin (method git-fetch) (uri (git-reference @@ -271,11 +289,11 @@ (define lib-storage-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm"))))) (define lib-tl-for-telegram-desktop - (let ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb") - (revision "24")) + (let ((commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa") + (revision "42")) (origin (method git-fetch) (uri (git-reference @@ -286,11 +304,11 @@ (define lib-tl-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk"))))) (define lib-ui-for-telegram-desktop - (let ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f") - (revision "508")) + (let ((commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3") + (revision "917")) (origin (method git-fetch) (uri (git-reference @@ -301,7 +319,7 @@ (define lib-ui-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5"))))) (define lib-waylandshells-for-telegram-desktop (let ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") @@ -319,8 +337,8 @@ (define lib-waylandshells-for-telegram-desktop "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) (define lib-webrtc-for-telegram-desktop - (let ((commit "ef49f953f12b112008a094a719f40939aaf39db4") - (revision "72")) + (let ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") + (revision "83")) (origin (method git-fetch) (uri (git-reference @@ -331,11 +349,11 @@ (define lib-webrtc-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq"))))) (define lib-webview-for-telegram-desktop - (let ((commit "e06427c624515485774e2e2181d4afeb05ad5a67") - (revision "40")) + (let ((commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35") + (revision "76")) (origin (method git-fetch) (uri (git-reference @@ -346,11 +364,11 @@ (define lib-webview-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l"))))) (define cmake-helpers-for-telegram-desktop - (let ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72") - (revision "261")) + (let ((commit "b9f1b6036329e44ec61f51f0b363fe2319158b84") + (revision "444")) (origin (method git-fetch) (uri (git-reference @@ -361,7 +379,7 @@ (define cmake-helpers-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3"))))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -456,8 +474,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "678")) (hidden-package (package (inherit rlottie) @@ -473,21 +491,12 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") @@ -533,7 +542,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.9.3") + (version "4.2.0") (source (origin (method git-fetch) @@ -545,15 +554,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -573,23 +586,22 @@ (define-public telegram-desktop (ice-9 match)) #:configure-flags #~(list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; Here, we snarf the keys from the official Snaps, which are - ;; also stored in <#$source/snap/snapcraft.yaml>. + ;; Client applications need an API ID and hash, see also: + ;; <https://core.telegram.org/api/obtaining_api_id>. Here, we + ;; use the ones given by the official Snap package, see: + ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + (string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'unpack 'unpack-additional-sources (lambda _ + (for-each make-file-writable (find-files ".")) (for-each (match-lambda ((dst src) @@ -601,81 +613,73 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 9/9] gnu: telegram: Remove unused variables. 2022-09-23 9:18 ` [bug#57675] [PATCH v10 8/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-23 9:18 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-23 9:18 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (lib-rlottie-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,libtgvoip-for-telegram-desktop): Remove variables. --- gnu/packages/telegram.scm | 71 --------------------------------------- 1 file changed, 71 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 397bd43534..bef462e819 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -231,21 +231,6 @@ (define lib-qr-for-telegram-desktop (base32 "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f"))))) -(define lib-rlottie-for-telegram-desktop - (let ((commit "0671bf70547381effcf442ec9618e04502a8adbc") - (revision "2")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit commit))) - (file-name (git-file-name - "lib-rlottie-for-telegram-desktop" - (git-version "0" revision commit))) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))) - (define lib-rpl-for-telegram-desktop (let ((commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe") (revision "19")) @@ -321,21 +306,6 @@ (define lib-ui-for-telegram-desktop (base32 "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5"))))) -(define lib-waylandshells-for-telegram-desktop - (let ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7") - (revision "6")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit commit))) - (file-name (git-file-name - "lib-waylandshells-for-telegram-desktop" - (git-version "0" revision commit))) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))) - (define lib-webrtc-for-telegram-desktop (let ((commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a") (revision "83")) @@ -498,47 +468,6 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false")))))))))) -(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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0. 2022-09-23 9:15 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 1/9] gnu: telegram: Revision-based version for additional sources Hilton Chain via Guix-patches via @ 2022-09-23 14:54 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-23 14:54 UTC (permalink / raw) To: Hilton Chain, 57675 Am Freitag, dem 23.09.2022 um 17:15 +0800 schrieb Hilton Chain: > v9 -> v10: Use revision rather than %telegram-version. > > Hilton Chain (9): > gnu: telegram: Revision-based version for additional sources. I don't think you're improving anything here really. These variables are already labeled "for-telegram-desktop", so using the telegram- desktop version here makes natural sense. We can still use Guix revisions if some component needs updating and we find out later (through bug reports etc.) The origin rebuilds are not a big deal whatsoever. For one, we have store deduplication, for the other, the huge cost is the actual building of telegram-desktop, which we cannot abstract away with while only half-ass unbundling stuff. Thus, as long as these packages have no use outside of building Telegram, I'd very much prefer a scheme that lets us update them all easily by just changing one version and a bunch of hashes. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 0/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (11 preceding siblings ...) 2022-09-23 9:15 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-24 7:07 ` Hilton Chain via Guix-patches via 2022-09-24 7:08 ` [bug#57675] [PATCH v11 1/8] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-26 13:28 ` [bug#57675] [PATCH 00/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:07 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler Hilton Chain (8): gnu: Add abseil-cpp-cxxstd17. gnu: extra-cmake-modules: Update to 5.98.0. gnu: kcoreaddons: Remove trailing #t. gnu: kcoreaddons: Update to 5.98.0. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: Remove libvpx-for-telegram-desktop. gnu: telegram-desktop: Update to 4.2.0. gnu: telegram: Remove unused variables. gnu/local.mk | 2 + gnu/packages/cpp.scm | 9 + gnu/packages/kde-frameworks.scm | 23 +- ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++ gnu/packages/telegram.scm | 337 +++++++----------- 6 files changed, 297 insertions(+), 220 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: a5c876cdb2d9ab79ba5027ffad7893dafbece50b -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 1/8] gnu: Add abseil-cpp-cxxstd17. 2022-09-24 7:07 ` [bug#57675] [PATCH v11 0/8] " Hilton Chain via Guix-patches via @ 2022-09-24 7:08 ` Hilton Chain via Guix-patches via 2022-09-24 7:09 ` [bug#57675] [PATCH v11 2/8] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:08 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 2/8] gnu: extra-cmake-modules: Update to 5.98.0. 2022-09-24 7:08 ` [bug#57675] [PATCH v11 1/8] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-24 7:09 ` Hilton Chain via Guix-patches via 2022-09-24 7:09 ` [bug#57675] [PATCH v11 3/8] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:09 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 3/8] gnu: kcoreaddons: Remove trailing #t. 2022-09-24 7:09 ` [bug#57675] [PATCH v11 2/8] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-24 7:09 ` Hilton Chain via Guix-patches via 2022-09-24 7:10 ` [bug#57675] [PATCH v11 4/8] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:09 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 4/8] gnu: kcoreaddons: Update to 5.98.0. 2022-09-24 7:09 ` [bug#57675] [PATCH v11 3/8] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via @ 2022-09-24 7:10 ` Hilton Chain via Guix-patches via 2022-09-24 7:10 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:10 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-24 7:10 ` [bug#57675] [PATCH v11 4/8] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-24 7:10 ` Hilton Chain via Guix-patches via 2022-09-24 7:11 ` [bug#57675] [PATCH v11 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-24 7:46 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:10 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments<#:phases>,license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 +++++ gnu/packages/telegram.scm | 76 ++++++++++++------- 3 files changed, 70 insertions(+), 28 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index d99c650d1a..84246dbdef 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1968,6 +1968,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..f3cbf642a3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -104,6 +107,21 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit commit))) + (file-name (git-file-name + "crc32c-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -297,8 +315,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,58 +332,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'copy-inputs + (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -377,13 +399,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 6/8] gnu: Remove libvpx-for-telegram-desktop. 2022-09-24 7:10 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-24 7:11 ` Hilton Chain via Guix-patches via 2022-09-24 7:11 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-24 7:46 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. --- gnu/packages/telegram.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index f3cbf642a3..17b60b1484 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -77,21 +77,6 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit commit))) - (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-24 7:11 ` [bug#57675] [PATCH v11 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-24 7:11 ` Hilton Chain via Guix-patches via 2022-09-24 7:12 ` [bug#57675] [PATCH v11 8/8] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via 2022-09-24 7:58 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:11 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New variable. (tgcalls-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,cmake-helpers-for-telegram-desktop): Bump to source checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.0. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted accordingly. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++++++++++ gnu/packages/telegram.scm | 185 ++++++++---------- 3 files changed, 213 insertions(+), 98 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84246dbdef..6f3ab36db9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1870,6 +1870,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 17b60b1484..d0954f83a4 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +62,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,7 +78,7 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") +(define %telegram-version "4.2.0") (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") @@ -112,72 +115,72 @@ (define cmake-helpers-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (commit "b9f1b6036329e44ec61f51f0b363fe2319158b84"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) (define lib-rlottie-for-telegram-desktop (origin @@ -196,60 +199,60 @@ (define lib-rpl-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (commit "839609369d04615475cb1518636de3619106a917"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) (define lib-waylandshells-for-telegram-desktop (origin @@ -268,36 +271,36 @@ (define lib-webrtc-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (commit "82c4921045c440b727c38e464f3a0539708423ff"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -392,8 +395,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "678")) (hidden-package (package (inherit rlottie) @@ -409,21 +412,12 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") @@ -481,15 +475,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -509,23 +507,22 @@ (define-public telegram-desktop (ice-9 match)) #:configure-flags #~(list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also <https://core.telegram.org/api/obtaining_api_id>. - ;; Here, we snarf the keys from the official Snaps, which are - ;; also stored in <#$source/snap/snapcraft.yaml>. + ;; Client applications need an API ID and hash, see also: + ;; <https://core.telegram.org/api/obtaining_api_id>. Here, we + ;; use the ones given by the official Snap package, see: + ;; <https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + (string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'unpack 'unpack-additional-sources (lambda _ + (for-each make-file-writable (find-files ".")) (for-each (match-lambda ((dst src) @@ -537,81 +534,73 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 8/8] gnu: telegram: Remove unused variables. 2022-09-24 7:11 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via @ 2022-09-24 7:12 ` Hilton Chain via Guix-patches via 2022-09-24 7:58 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 7:12 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (lib-rlottie-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,libtgvoip-for-telegram-desktop): Remove variables. --- gnu/packages/telegram.scm | 65 --------------------------------------- 1 file changed, 65 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d0954f83a4..3b74a9f38f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -182,18 +182,6 @@ (define lib-qr-for-telegram-desktop (base32 "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - (define lib-rpl-for-telegram-desktop (origin (method git-fetch) @@ -254,18 +242,6 @@ (define lib-ui-for-telegram-desktop (base32 "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) @@ -419,47 +395,6 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false")))))))))) -(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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-24 7:11 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-24 7:12 ` [bug#57675] [PATCH v11 8/8] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via @ 2022-09-24 7:58 ` Liliana Marie Prikler 2022-09-24 23:52 ` Hilton Chain via Guix-patches via 1 sibling, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-24 7:58 UTC (permalink / raw) To: Hilton Chain, 57675 Am Samstag, dem 24.09.2022 um 15:11 +0800 schrieb Hilton Chain: > * gnu/packages/telegram.scm (dispatch-for-telegram-desktop): New > variable. Please introduce this in an earlier commit. Also, since this is a third-party package, not a telegram-owned one, it'd be nice if we could use upstream versioning, but that seems tied to another package too (swift in particular). Alternatively, you could simply use "1.3" as per CMakeLists as a base point. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-24 7:58 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler @ 2022-09-24 23:52 ` Hilton Chain via Guix-patches via 2022-09-25 5:54 ` Liliana Marie Prikler 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-24 23:52 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 On Sat, 24 Sep 2022 15:58:33 +0800, Liliana Marie Prikler wrote: > Please introduce this in an earlier commit. Also, since this is a > third-party package, not a telegram-owned one, it'd be nice if we could > use upstream versioning, but that seems tied to another package too > (swift in particular). Alternatively, you could simply use "1.3" as > per CMakeLists as a base point. I'd tried packaging both crc32c and libdispatch, are those two names suitable? And then, what's the proper place to place libdispatch in? Applied Gentoo's patch (for unbundling crc32c) to webrtc-for-telegram-desktop, however when configuring telegram-desktop with this, it errors out as follows, what should I do next? #+BEGIN_QUOTE CMake Error at Telegram/CMakeLists.txt:7 (add_executable): Target "Telegram" links to target "Crc32c::crc32c" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? CMake Error at Telegram/cmake/lib_tgcalls.cmake:7 (add_library): Target "lib_tgcalls" links to target "Crc32c::crc32c" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Call Stack (most recent call first): Telegram/CMakeLists.txt:34 (include) CMake Error at Telegram/cmake/td_ui.cmake:7 (add_library): Target "td_ui" links to target "Crc32c::crc32c" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Call Stack (most recent call first): Telegram/CMakeLists.txt:39 (include) #+END_QUOTE Thanks ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-24 23:52 ` Hilton Chain via Guix-patches via @ 2022-09-25 5:54 ` Liliana Marie Prikler 2022-09-25 6:15 ` Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-25 5:54 UTC (permalink / raw) To: Hilton Chain; +Cc: 57675 Am Sonntag, dem 25.09.2022 um 07:52 +0800 schrieb Hilton Chain: > On Sat, 24 Sep 2022 15:58:33 +0800, > Liliana Marie Prikler wrote: > > Please introduce this in an earlier commit. Also, since this is a > > third-party package, not a telegram-owned one, it'd be nice if we > > could use upstream versioning, but that seems tied to another > > package too (swift in particular). Alternatively, you could simply > > use "1.3" as per CMakeLists as a base point. > > I'd tried packaging both crc32c and libdispatch, are those two names > suitable? And then, what's the proper place to place libdispatch in? Probably maybe. I'm not aware of any other project taking their name (apart from forks, obviously), and they're more than 3 letters each, so I think it'll be fine. As for the location of libdispatch, if we had a swift.scm (which we probably won't until someone packages swift), it'd go there, but for now c.scm is fine imho. > Applied Gentoo's patch (for unbundling crc32c) to webrtc-for- > telegram-desktop, however when > configuring telegram-desktop with this, it errors out as follows, > what should I do next? Uhm... which patch is "Gentoo's patch"? I don't see anything relevant here [1]. > #+BEGIN_QUOTE > CMake Error at Telegram/CMakeLists.txt:7 (add_executable): > Target "Telegram" links to target "Crc32c::crc32c" but the target > was not > found. Perhaps a find_package() call is missing for an IMPORTED > target, or > an ALIAS target is missing? > > CMake Error at Telegram/cmake/lib_tgcalls.cmake:7 (add_library): > Target "lib_tgcalls" links to target "Crc32c::crc32c" but the > target was > not found. Perhaps a find_package() call is missing for an > IMPORTED > target, or an ALIAS target is missing? > Call Stack (most recent call first): > Telegram/CMakeLists.txt:34 (include) > > > CMake Error at Telegram/cmake/td_ui.cmake:7 (add_library): > Target "td_ui" links to target "Crc32c::crc32c" but the target was > not > found. Perhaps a find_package() call is missing for an IMPORTED > target, or > an ALIAS target is missing? > Call Stack (most recent call first): > Telegram/CMakeLists.txt:39 (include) > #+END_QUOTE Hmm, I think you'll have to patch the CMakeLists, which expect a slightly different version. You could also try packaging a second crc32c, which inherits from upstream, but uses the Telegram-blessed commit. Cheers [1] https://gitweb.gentoo.org/repo/gentoo.git/tree/net-im/telegram-desktop/files ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-25 5:54 ` Liliana Marie Prikler @ 2022-09-25 6:15 ` Hilton Chain via Guix-patches via 2022-09-25 6:31 ` Liliana Marie Prikler 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-25 6:15 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 On Sun, 25 Sep 2022 13:54:18 +0800, Liliana Marie Prikler wrote: > Uhm... which patch is "Gentoo's patch"? I don't see anything relevant > here [1]. It's here: https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/tg_owt/files ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-25 6:15 ` Hilton Chain via Guix-patches via @ 2022-09-25 6:31 ` Liliana Marie Prikler 2022-09-25 6:43 ` Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-25 6:31 UTC (permalink / raw) To: Hilton Chain; +Cc: 57675 Am Sonntag, dem 25.09.2022 um 14:15 +0800 schrieb Hilton Chain: > On Sun, 25 Sep 2022 13:54:18 +0800, > Liliana Marie Prikler wrote: > > Uhm... which patch is "Gentoo's patch"? I don't see anything > > relevant > > here [1]. > > It's here: > https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/tg_owt/files This hunk > function(link_crc32c target_name) > if (TG_OWT_PACKAGED_BUILD) > find_package(Crc32c) > set(Crc32c_FOUND ${Crc32c_FOUND} PARENT_SCOPE) > if (Crc32c_FOUND) > target_link_libraries(${target_name} PRIVATE > Crc32c::crc32c) > endif() > endif() > if (NOT Crc32c_FOUND) > target_link_libraries(${target_name} PRIVATE > tg_owt::libcrc32c) > endif() > endfunction() looks like the culprit, but also sane; maybe your Crc32c "package" according to CMake is missing the crc32c library? Are you actually building it as a package and using it as regular input? Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-25 6:31 ` Liliana Marie Prikler @ 2022-09-25 6:43 ` Hilton Chain via Guix-patches via 2022-09-25 13:11 ` Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-25 6:43 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 On Sun, 25 Sep 2022 14:31:47 +0800, Liliana Marie Prikler wrote: > looks like the culprit, but also sane; maybe your Crc32c "package" > according to CMake is missing the crc32c library? Are you actually > building it as a package and using it as regular input? Just found out I built it as a static library... Orz ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0. 2022-09-25 6:43 ` Hilton Chain via Guix-patches via @ 2022-09-25 13:11 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-25 13:11 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 It turns out that static or dynamic is actually unrelated. >+if (NOT Crc32c_FOUND) >+ list(APPEND export_targets libcrc32c) >+endif() Don't know why but Crc32c_FOUND seems to be false here. ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-24 7:10 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-24 7:11 ` [bug#57675] [PATCH v11 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-24 7:46 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-24 7:46 UTC (permalink / raw) To: Hilton Chain, 57675 Am Samstag, dem 24.09.2022 um 15:10 +0800 schrieb Hilton Chain: > * gnu/packages/telegram.scm (crc32c-for-telegram-desktop): New > variable. Please isolate this change into a separate commit. Also, try to use upstream's 1.1.2 release, which IIUC has the same code with some typos in the comments/documentation. (Note that this package should probably go to cpp.scm) Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 00/10] gnu: telegram-desktop: Update to 4.2.2. 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via ` (12 preceding siblings ...) 2022-09-24 7:07 ` [bug#57675] [PATCH v11 0/8] " Hilton Chain via Guix-patches via @ 2022-09-26 13:28 ` Hilton Chain via Guix-patches via 2022-09-26 13:29 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 13 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:28 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler v11 -> v12: 1. Update telegram-desktop to 4.2.2. 2. Package crc32c and libdispatch, unbundle the latter one. Hilton Chain (10): gnu: kcoreaddons: Update to 5.98.0. gnu: Add abseil-cpp-cxxstd17. gnu: Add crc32c. gnu: webrtc-for-telegram-desktop: Update to 621f3da5. gnu: webrtc-for-telegram-desktop: Order inputs alphabetically. gnu: Remove libvpx-for-telegram-desktop. gnu: Add libdispatch. gnu: telegram-desktop: Update to 4.2.2. gnu: telegram-desktop: Order inputs alphabetically. gnu: telegram: Remove unused variables. gnu/local.mk | 3 + gnu/packages/c.scm | 26 ++ gnu/packages/cpp.scm | 39 +++ gnu/packages/kde-frameworks.scm | 23 +- .../patches/crc32c-unbundle-googletest.patch | 21 ++ ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++++++ ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++ gnu/packages/telegram.scm | 290 ++++++------------ 8 files changed, 344 insertions(+), 204 deletions(-) create mode 100644 gnu/packages/patches/crc32c-unbundle-googletest.patch create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch base-commit: 9e4164c6ffaa8e39e9a15a0cffa9293bfe28e4b9 -- 2.37.3 ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0. 2022-09-26 13:28 ` [bug#57675] [PATCH 00/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via @ 2022-09-26 13:29 ` Hilton Chain via Guix-patches via 2022-09-26 13:30 ` [bug#57675] [PATCH 02/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-26 18:26 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:29 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. [arguments]<#:phases>: Update blocklist for failing tests. --- gnu/packages/kde-frameworks.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,21 +602,12 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 02/10] gnu: Add abseil-cpp-cxxstd17. 2022-09-26 13:29 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via @ 2022-09-26 13:30 ` Hilton Chain via Guix-patches via 2022-09-26 13:30 ` [bug#57675] [PATCH 03/10] gnu: Add crc32c Hilton Chain via Guix-patches via 2022-09-26 18:26 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:30 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 03/10] gnu: Add crc32c. 2022-09-26 13:30 ` [bug#57675] [PATCH 02/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-26 13:30 ` Hilton Chain via Guix-patches via 2022-09-26 13:31 ` [bug#57675] [PATCH 04/10] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:30 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/cpp.scm (crc32c): New variable. * gnu/packages/patches/crc32c-unbundle-googletest.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 30 +++++++++++++++++++ .../patches/crc32c-unbundle-googletest.patch | 21 +++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 gnu/packages/patches/crc32c-unbundle-googletest.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4e982dc6e3..44c13c4744 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -997,6 +997,7 @@ dist_patch_DATA = \ %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ + %D%/packages/patches/crc32c-unbundle-googletest.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5e0646444c..f8b3cd2f23 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1916,3 +1916,33 @@ (define-public cpp-mustache templated string type for compatibility with any STL-like string (std::string, std::wstring, etc).") (license license:boost1.0))) + +(define-public crc32c + (package + (name "crc32c") + (version "1.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0966lyy3w5cnrs0c0fkma4hga51k54hns72l4n76944awqssap7j")) + (patches (search-patches "crc32c-unbundle-googletest.patch")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + "-DCRC32C_BUILD_BENCHMARKS=OFF" + "-DCRC32C_USE_GLOG=OFF"))) + (native-inputs (list googletest)) + (home-page "https://github.com/google/crc32c") + (synopsis + "CRC32C implementation with support for CPU-specific acceleration + instructions") + (description + "This project collects a few CRC32C implementations under an umbrella +that dispatches to a suitable implementation based on the host computer's +hardware capabilities.") + (license license:bsd-3))) diff --git a/gnu/packages/patches/crc32c-unbundle-googletest.patch b/gnu/packages/patches/crc32c-unbundle-googletest.patch new file mode 100644 index 0000000000..da513c5d4e --- /dev/null +++ b/gnu/packages/patches/crc32c-unbundle-googletest.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8490728..c7f0952 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,15 +315,7 @@ if(CRC32C_BUILD_TESTS) + set(install_gmock OFF) + + # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") +- +- # GoogleTest triggers a missing field initializers warning. +- if(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS) ++ find_package(GTest REQUIRED) + + add_executable(crc32c_tests "") + target_sources(crc32c_tests -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 04/10] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. 2022-09-26 13:30 ` [bug#57675] [PATCH 03/10] gnu: Add crc32c Hilton Chain via Guix-patches via @ 2022-09-26 13:31 ` Hilton Chain via Guix-patches via 2022-09-26 13:32 ` [bug#57675] [PATCH 05/10] gnu: webrtc-for-telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:31 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments<#:phases>,license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++++++ gnu/packages/telegram.scm | 52 +++++++++++-------- 3 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index 44c13c4744..ccb77b50b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1974,6 +1974,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza <xiretza@xiretza.xyz> +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 <cstdint> + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..e7beab5c51 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -297,8 +300,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,57 +317,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Unbundle openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'copy-inputs + (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$(package-source crc32c) crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo glib + libdrm + libglvnd + libvpx libxcomposite libxdamage libxrender libxrandr + libxfixes + mesa + openh264 openssl opus - pipewire + pipewire-0.3 protobuf - pulseaudio - libx11 libxext libxtst)) (synopsis "WebRTC support for Telegram Desktop") @@ -377,13 +385,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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 05/10] gnu: webrtc-for-telegram-desktop: Order inputs alphabetically. 2022-09-26 13:31 ` [bug#57675] [PATCH 04/10] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via @ 2022-09-26 13:32 ` Hilton Chain via Guix-patches via 2022-09-26 13:32 ` [bug#57675] [PATCH 06/10] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (webrtc-for-telegram-desktop)[inputs]: Order inputs alphabetically. --- gnu/packages/telegram.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index e7beab5c51..17bb168b50 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -357,24 +357,24 @@ (define-public webrtc-for-telegram-desktop (inputs (list abseil-cpp-cxxstd17 ffmpeg - libjpeg-turbo glib libdrm libglvnd + libjpeg-turbo libvpx libxcomposite libxdamage - libxrender - libxrandr + libxext libxfixes + libxrandr + libxrender + libxtst mesa openh264 openssl opus pipewire-0.3 - protobuf - libxext - libxtst)) + protobuf)) (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.") -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 06/10] gnu: Remove libvpx-for-telegram-desktop. 2022-09-26 13:32 ` [bug#57675] [PATCH 05/10] gnu: webrtc-for-telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via @ 2022-09-26 13:32 ` Hilton Chain via Guix-patches via 2022-09-26 13:32 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (libvpx-for-telegram-desktop): Remove variable. --- gnu/packages/telegram.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 17bb168b50..9bdde49754 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -77,21 +77,6 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit commit))) - (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 07/10] gnu: Add libdispatch. 2022-09-26 13:32 ` [bug#57675] [PATCH 06/10] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via @ 2022-09-26 13:32 ` Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via 2022-09-27 18:45 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Liliana Marie Prikler 0 siblings, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:32 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/c.scm (libdispatch): New variable. --- gnu/packages/c.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 10275970b1..4c183e3b95 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -55,6 +55,7 @@ (define-module (gnu packages c) #:use-module (gnu packages perl) #:use-module (gnu packages texinfo) #:use-module (gnu packages guile) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pcre) @@ -1258,3 +1259,28 @@ (define-public utest-h (description "This package provides a header-only unit testing library for C/C++.") (license license:unlicense)))) + +(define-public libdispatch + (package + (name "libdispatch") + (version "5.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch") + (commit (string-append "swift-" version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0skg1azbhbg7y0ql2a5sx6lmfip8l1rajqm95zzf9xv45n4dg9nn")))) + (build-system cmake-build-system) + (native-inputs (list clang-toolchain)) + (home-page "https://apple.github.io/swift-corelibs-libdispatch/") + (synopsis + "Comprehensive support for concurrent code execution on multicore +hardware") + (description + "Grand Central Dispatch (GCD or libdispatch) provides comprehensive +support for concurrent code execution on multicore hardware.") + (license license:asl2.0))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2. 2022-09-26 13:32 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Hilton Chain via Guix-patches via @ 2022-09-26 13:33 ` Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 09/10] gnu: telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via 2022-09-27 19:13 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Liliana Marie Prikler 2022-09-27 18:45 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Liliana Marie Prikler 1 sibling, 2 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:33 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (tgcalls-for-telegram-desktop) (codegen-for-telegram-desktop,lib-base-for-telegram-desktop) (lib-crl-for-telegram-desktop,lib-lottie-for-telegram-desktop) (lib-qr-for-telegram-desktop,lib-rpl-for-telegram-desktop) (lib-spellcheck-for-telegram-desktop,lib-storage-for-telegram-desktop) (lib-tl-for-telegram-desktop,lib-ui-for-telegram-desktop) (lib-webrtc-for-telegram-desktop,lib-webview-for-telegram-desktop) (cmake-helpers-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.2. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted accordingly. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Add abseil-cpp-cxxstd17, kcoreaddons, libdispatch, libvpx, wayland, webkitgtk. Remove catch2, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 ++++++++++++++++ gnu/packages/telegram.scm | 140 ++++++++---------- 3 files changed, 190 insertions(+), 76 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index ccb77b50b5..9252782930 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1876,6 +1876,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni <klemens@posteo.de> +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register<tgcalls::InstanceImpl>(); + const auto RegisterV2 = tgcalls::Register<tgcalls::InstanceV2Impl>(); + const auto RegV2Ref = tgcalls::Register<tgcalls::InstanceV2ReferenceImpl>(); + const auto RegisterV240 = tgcalls::Register<tgcalls::InstanceV2_4_0_0Impl>(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register<tgcalls::InstanceImplLegacy>(); ++#endif + + [[nodiscard]] base::flat_set<int64> CollectEndpointIds( + const QVector<MTPPhoneConnection> &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9bdde49754..1f0d6f3056 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> +;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages c) #:use-module (gnu packages cpp) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) @@ -43,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 perl) @@ -60,6 +63,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,7 +79,7 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") +(define %telegram-version "4.2.2") (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") @@ -97,72 +101,72 @@ (define cmake-helpers-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (commit "f49e254d8c5287752b5ed7b86bd84073f584768e"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + "0yqib2ndhpaj69z603knpcfga0ni978janb5i8rvhslqddvbzfjv")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (commit "d932f5048317b05dd414116741d995c82a528542"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + "1fnirqxj4qq1gzx52rydrc5r6clw3316bh51dfg652jr8hj6wkp2")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) (define lib-rlottie-for-telegram-desktop (origin @@ -181,60 +185,60 @@ (define lib-rpl-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (commit "839609369d04615475cb1518636de3619106a917"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (commit "1ceaa0bbcfccb83dbf7f51d7f80a733ff2aa8c22"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + "0kyrgxi202xwy14mnx62h1kny0434f5fxqns1ydp24q2c2cr1cxn")))) (define lib-waylandshells-for-telegram-desktop (origin @@ -253,36 +257,36 @@ (define lib-webrtc-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (commit "82c4921045c440b727c38e464f3a0539708423ff"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -378,8 +382,8 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) + (let ((commit "8c69fc20cf2e150db304311f1233a4b55a8892d7") + (revision "678")) (hidden-package (package (inherit rlottie) @@ -395,21 +399,12 @@ (define-public rlottie-for-telegram-desktop (file-name (git-file-name "rlottie-for-telegram-desktop" version)) (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false")))))))))) (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") @@ -467,15 +462,19 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16mcx4gwkl8s70a8gppxczmjsww1a3vmdrz3snfh986nvid64mq7")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -501,17 +500,15 @@ (define-public telegram-desktop ;; also stored in <#$source/snap/snapcraft.yaml>. "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'unpack 'unpack-additional-sources (lambda _ + (for-each make-file-writable (find-files ".")) (for-each (match-lambda ((dst src) @@ -523,35 +520,28 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs (list alsa-lib + abseil-cpp-cxxstd17 c++-gsl - catch2 libexpected fcitx-qt5 fcitx5-qt @@ -562,12 +552,11 @@ (define-public telegram-desktop hime hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libdispatch libjpeg-turbo - libtgvoip-for-telegram-desktop + libvpx lz4 - materialdecoration minizip nimf openal @@ -577,19 +566,18 @@ (define-public telegram-desktop qrcodegen-cpp qtbase-5 qtsvg-5 - qt5ct qtimageformats qtwayland range-v3 rlottie-for-telegram-desktop rnnoise + wayland + webkitgtk webrtc-for-telegram-desktop - libx11 libxcb xcb-util-keysyms xxhash zlib)) - (propagated-inputs (list dconf)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") @@ -597,7 +585,7 @@ (define-public telegram-desktop (license (list ;; ThirdParty - license:lgpl2.1+ + license:lgpl3 ;; Others license:gpl3+)))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 09/10] gnu: telegram-desktop: Order inputs alphabetically. 2022-09-26 13:33 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via @ 2022-09-26 13:33 ` Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 10/10] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via 2022-09-27 19:13 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:33 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (telegram-desktop)[inputs]: Order inputs alphabetically. --- gnu/packages/telegram.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 1f0d6f3056..f55f2c446f 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -539,10 +539,9 @@ (define-public telegram-desktop pkg-config python-wrapper)) (inputs - (list alsa-lib - abseil-cpp-cxxstd17 + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - libexpected fcitx-qt5 fcitx5-qt ffmpeg @@ -554,8 +553,10 @@ (define-public telegram-desktop jemalloc kcoreaddons libdispatch + libexpected libjpeg-turbo libvpx + libxcb lz4 minizip nimf @@ -565,8 +566,8 @@ (define-public telegram-desktop pulseaudio qrcodegen-cpp qtbase-5 - qtsvg-5 qtimageformats + qtsvg-5 qtwayland range-v3 rlottie-for-telegram-desktop @@ -574,7 +575,6 @@ (define-public telegram-desktop wayland webkitgtk webrtc-for-telegram-desktop - libxcb xcb-util-keysyms xxhash zlib)) -- 2.37.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 10/10] gnu: telegram: Remove unused variables. 2022-09-26 13:33 ` [bug#57675] [PATCH 09/10] gnu: telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via @ 2022-09-26 13:33 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-26 13:33 UTC (permalink / raw) To: 57675; +Cc: Liliana Marie Prikler * gnu/packages/telegram.scm (lib-rlottie-for-telegram-desktop) (lib-waylandshells-for-telegram-desktop,libtgvoip-for-telegram-desktop): Remove variables. --- gnu/packages/telegram.scm | 65 --------------------------------------- 1 file changed, 65 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index f55f2c446f..3f612e902b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -168,18 +168,6 @@ (define lib-qr-for-telegram-desktop (base32 "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - (define lib-rpl-for-telegram-desktop (origin (method git-fetch) @@ -240,18 +228,6 @@ (define lib-ui-for-telegram-desktop (base32 "0kyrgxi202xwy14mnx62h1kny0434f5fxqns1ydp24q2c2cr1cxn")))) -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) @@ -406,47 +382,6 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false")))))))))) -(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.3 ^ permalink raw reply related [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2. 2022-09-26 13:33 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 09/10] gnu: telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via @ 2022-09-27 19:13 ` Liliana Marie Prikler 2022-09-28 19:00 ` bug#57675: " Liliana Marie Prikler 1 sibling, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-27 19:13 UTC (permalink / raw) To: Hilton Chain, 57675 Am Montag, dem 26.09.2022 um 21:33 +0800 schrieb Hilton Chain: > (native-inputs > - (list cmake-shared > - extra-cmake-modules > - `(,glib "bin") > + (list `(,glib "bin") > `(,gtk+ "bin") > + clang-toolchain > pkg-config > - python-wrapper > - qttools-5)) > + python-wrapper)) I'm fairly certain you shouldn't need to add clang-toolchain here. However, verifying this will take some time on my machine, so please be patient. ^ permalink raw reply [flat|nested] 155+ messages in thread
* bug#57675: [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2. 2022-09-27 19:13 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Liliana Marie Prikler @ 2022-09-28 19:00 ` Liliana Marie Prikler 2022-09-29 9:47 ` [bug#57675] " Hilton Chain via Guix-patches via 0 siblings, 1 reply; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-28 19:00 UTC (permalink / raw) To: Hilton Chain, 57675-done Am Dienstag, dem 27.09.2022 um 21:13 +0200 schrieb Liliana Marie Prikler: > I'm fairly certain you shouldn't need to add clang-toolchain here. > However, verifying this will take some time on my machine, so please > be patient. It is done and pushed. Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2. 2022-09-28 19:00 ` bug#57675: " Liliana Marie Prikler @ 2022-09-29 9:47 ` Hilton Chain via Guix-patches via 0 siblings, 0 replies; 155+ messages in thread From: Hilton Chain via Guix-patches via @ 2022-09-29 9:47 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: 57675 Thank you! ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 07/10] gnu: Add libdispatch. 2022-09-26 13:32 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via @ 2022-09-27 18:45 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-27 18:45 UTC (permalink / raw) To: Hilton Chain, 57675 Am Montag, dem 26.09.2022 um 21:32 +0800 schrieb Hilton Chain: > * gnu/packages/c.scm (libdispatch): New variable. > --- > gnu/packages/c.scm | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm > index 10275970b1..4c183e3b95 100644 > --- a/gnu/packages/c.scm > +++ b/gnu/packages/c.scm > @@ -55,6 +55,7 @@ (define-module (gnu packages c) > #:use-module (gnu packages perl) > #:use-module (gnu packages texinfo) > #:use-module (gnu packages guile) > + #:use-module (gnu packages llvm) > #:use-module (gnu packages lua) > #:use-module (gnu packages multiprecision) > #:use-module (gnu packages pcre) > @@ -1258,3 +1259,28 @@ (define-public utest-h > (description > "This package provides a header-only unit testing library for > C/C++.") > (license license:unlicense)))) > + > +(define-public libdispatch > + (package > + (name "libdispatch") > + (version "5.7") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url > "https://github.com/apple/swift-corelibs-libdispatch") > + (commit (string-append "swift-" version "-RELEASE")))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0skg1azbhbg7y0ql2a5sx6lmfip8l1rajqm95zzf9xv45n4dg9nn")))) > + (build-system cmake-build-system) > + (native-inputs (list clang-toolchain)) Note: the *-toolchain packages are meant for users, not for packagers. Since this package fails to compile with GCC, I'll replace this with the following: (arguments (list #:phases #~(modify-phases %standard-phases ;; Use Clang instead of GCC. (add-before 'configure 'prepare-build-environment (lambda _ (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") (setenv "CC" "clang") (setenv "CXX" "clang++")))))) (native-inputs (list clang llvm)) > + (home-page > "https://apple.github.io/swift-corelibs-libdispatch/") > + (synopsis > + "Comprehensive support for concurrent code execution on > multicore > +hardware") > + (description > + "Grand Central Dispatch (GCD or libdispatch) provides > comprehensive > +support for concurrent code execution on multicore hardware.") > + (license license:asl2.0))) Cheers ^ permalink raw reply [flat|nested] 155+ messages in thread
* [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0. 2022-09-26 13:29 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-26 13:30 ` [bug#57675] [PATCH 02/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via @ 2022-09-26 18:26 ` Liliana Marie Prikler 1 sibling, 0 replies; 155+ messages in thread From: Liliana Marie Prikler @ 2022-09-26 18:26 UTC (permalink / raw) To: Hilton Chain, 57675 Am Montag, dem 26.09.2022 um 21:29 +0800 schrieb Hilton Chain: > * gnu/packages/kde-frameworks.scm (kcoreaddons): Update to 5.98.0. > [arguments]<#:phases>: Update blocklist for failing tests. It seems the extra-cmake-modules got mixed in here. I'll try cherry- picking this one from v11. ^ permalink raw reply [flat|nested] 155+ messages in thread
end of thread, other threads:[~2022-09-29 10:08 UTC | newest] Thread overview: 155+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-09-08 12:38 [bug#57675] [PATCH v2 0/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-08 12:40 ` [bug#57675] [PATCH v2 1/5] gnu: Add abseil-cpp-for-webrtc-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-08 12:41 ` [bug#57675] [PATCH v2 2/5] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via 2022-09-08 12:42 ` [bug#57675] [PATCH v2 3/5] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-08 12:42 ` [bug#57675] [PATCH v2 4/5] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-08 12:42 ` [bug#57675] [PATCH v2 5/5] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-11 10:10 ` [bug#57675] [PATCH v3 0/7] " Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 1/7] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 2/7] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-11 10:11 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 4/7] gnu: webrtc-for-telegram-desktop: Update to a5fbc9 Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-11 10:12 ` [bug#57675] [PATCH v3 6/7] gnu: Remove rlottie-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-11 10:13 ` [bug#57675] [PATCH v3 7/7] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-11 11:17 ` [bug#57675] [PATCH v3 5/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler 2022-09-11 11:13 ` [bug#57675] [PATCH v3 3/7] gnu: Add abseil-cpp-cxxstd17 Liliana Marie Prikler 2022-09-11 11:10 ` [bug#57675] [PATCH v3 0/7] gnu: telegram-desktop: Update to 4.1.1 Liliana Marie Prikler 2022-09-11 13:41 ` Hilton Chain via Guix-patches via 2022-09-11 14:08 ` Liliana Marie Prikler 2022-09-19 6:09 ` [bug#57675] [PATCH v4 00/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-19 6:10 ` [bug#57675] [PATCH v4 01/10] gnu: webrtc-for-telegram-desktop: Simplify inputs Hilton Chain via Guix-patches via 2022-09-19 6:11 ` [bug#57675] [PATCH v4 02/10] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-19 6:11 ` [bug#57675] [PATCH v4 03/10] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via 2022-09-19 6:12 ` [bug#57675] [PATCH v4 04/10] gnu: webrtc-for-telegram-desktop: Use gexp Hilton Chain via Guix-patches via 2022-09-19 6:12 ` [bug#57675] [PATCH v4 05/10] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 06/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 07/10] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: " Hilton Chain via Guix-patches via 2022-09-19 6:13 ` [bug#57675] [PATCH v4 09/10] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via 2022-09-19 6:14 ` [bug#57675] [PATCH v4 10/10] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-19 17:11 ` Liliana Marie Prikler 2022-09-19 17:07 ` [bug#57675] [PATCH v4 08/10] gnu: kcoreaddons: Update to 5.98.0 Liliana Marie Prikler 2022-09-19 23:32 ` [bug#57675] [PATCH v5 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-19 23:33 ` [bug#57675] [PATCH v5 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via 2022-09-19 23:33 ` [bug#57675] [PATCH v5 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-19 23:34 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 2022-09-19 23:34 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 05/11] gnu: telegram-desktop: Change Api ID Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-19 23:35 ` [bug#57675] [PATCH v5 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3d Hilton Chain via Guix-patches via 2022-09-19 23:36 ` [bug#57675] [PATCH v5 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-20 5:02 ` Liliana Marie Prikler 2022-09-20 7:27 ` Hilton Chain via Guix-patches via 2022-09-20 16:54 ` Liliana Marie Prikler 2022-09-20 4:58 ` [bug#57675] [PATCH v5 04/11] gnu: telegram-desktop: Use modern package style Liliana Marie Prikler 2022-09-20 4:55 ` [bug#57675] [PATCH v5 03/11] gnu: webrtc-for-telegram-desktop: " Liliana Marie Prikler 2022-09-20 15:32 ` [bug#57675] [PATCH v6 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-20 15:34 ` [bug#57675] [PATCH v6 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via 2022-09-20 15:34 ` [bug#57675] [PATCH v6 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-20 15:35 ` [bug#57675] [PATCH v6 03/11] gnu: webrtc-for-telegram-desktop: Use modern package Hilton Chain via Guix-patches via 2022-09-20 15:35 ` [bug#57675] [PATCH v6 04/11] gnu: telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 2022-09-20 15:35 ` [bug#57675] [PATCH v6 05/11] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-20 15:36 ` [bug#57675] [PATCH v6 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-20 15:37 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-20 15:37 ` [bug#57675] [PATCH v6 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-20 17:15 ` Liliana Marie Prikler 2022-09-20 17:03 ` [bug#57675] [PATCH v6 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Liliana Marie Prikler 2022-09-21 0:10 ` [bug#57675] [PATCH v7 00/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-21 0:10 ` [bug#57675] [PATCH v7 01/11] gnu: webrtc-for-telegram-desktop: Delete trailing #t Hilton Chain via Guix-patches via 2022-09-21 0:11 ` [bug#57675] [PATCH v7 02/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-21 0:11 ` [bug#57675] [PATCH v7 03/11] gnu: webrtc-for-telegram-desktop: Use modern package style Hilton Chain via Guix-patches via 2022-09-21 0:11 ` [bug#57675] [PATCH v7 04/11] gnu: telegram-desktop: " Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 05/11] gnu: telegram-desktop: Change API ID Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 06/11] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 07/11] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-21 0:12 ` [bug#57675] [PATCH v7 08/11] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-21 0:13 ` [bug#57675] [PATCH v7 09/11] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-21 0:13 ` [bug#57675] [PATCH v7 10/11] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-21 0:13 ` [bug#57675] [PATCH v7 11/11] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-21 4:46 ` Hilton Chain via Guix-patches via 2022-09-21 8:23 ` [bug#57675] [PATCH 0/7] " Hilton Chain via Guix-patches via 2022-09-21 8:24 ` [bug#57675] [PATCH v8 " Hilton Chain via Guix-patches via 2022-09-21 8:24 ` [bug#57675] [PATCH v8 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-21 8:24 ` [bug#57675] [PATCH v8 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-21 8:25 ` [bug#57675] [PATCH v8 3/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-21 14:15 ` [bug#57675] [PATCH v8 RESEND 0/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 1/7] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-21 14:16 ` [bug#57675] [PATCH v8 RESEND 2/7] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 3/7] gnu: telegram-desktop: Update to 4.1.1 Hilton Chain via Guix-patches via 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 4/7] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-21 14:17 ` [bug#57675] [PATCH v8 RESEND 5/7] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-21 14:18 ` [bug#57675] [PATCH v8 RESEND 6/7] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-21 14:18 ` [bug#57675] [PATCH v8 RESEND 7/7] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-21 16:58 ` [bug#57675] [PATCH v8 RESEND 0/7] " Liliana Marie Prikler 2022-09-21 23:42 ` Hilton Chain via Guix-patches via 2022-09-22 2:25 ` [bug#57675] [PATCH v9 0/8] " Hilton Chain via Guix-patches via 2022-09-22 2:25 ` [bug#57675] [PATCH v9 1/8] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-22 2:25 ` [bug#57675] [PATCH v9 2/8] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 3/8] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 4/8] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-22 2:26 ` [bug#57675] [PATCH v9 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-22 2:27 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-22 2:27 ` [bug#57675] [PATCH v9 8/8] gnu: telegram: Remove unneeded variables Hilton Chain via Guix-patches via 2022-09-22 20:08 ` [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 0/9] " Hilton Chain via Guix-patches via 2022-09-22 2:30 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 1/9] gnu: telegram-desktop: Fetch submodules recursively Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 2/9] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 3/9] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 4/9] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-22 2:31 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 5/9] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 7/9] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 8/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-22 2:32 ` [bug#57675] [PATCH v9 RECURSIVE CLONE 9/9] gnu: Remove libtgvoip-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-23 9:15 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 1/9] gnu: telegram: Revision-based version for additional sources Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 2/9] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-23 9:16 ` [bug#57675] [PATCH v10 3/9] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 4/9] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 5/9] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 6/9] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-23 9:17 ` [bug#57675] [PATCH v10 7/9] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-23 9:18 ` [bug#57675] [PATCH v10 8/9] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-23 9:18 ` [bug#57675] [PATCH v10 9/9] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via 2022-09-23 14:54 ` [bug#57675] [PATCH v10 0/9] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 2022-09-24 7:07 ` [bug#57675] [PATCH v11 0/8] " Hilton Chain via Guix-patches via 2022-09-24 7:08 ` [bug#57675] [PATCH v11 1/8] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-24 7:09 ` [bug#57675] [PATCH v11 2/8] gnu: extra-cmake-modules: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-24 7:09 ` [bug#57675] [PATCH v11 3/8] gnu: kcoreaddons: Remove trailing #t Hilton Chain via Guix-patches via 2022-09-24 7:10 ` [bug#57675] [PATCH v11 4/8] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-24 7:10 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-24 7:11 ` [bug#57675] [PATCH v11 6/8] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-24 7:11 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Hilton Chain via Guix-patches via 2022-09-24 7:12 ` [bug#57675] [PATCH v11 8/8] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via 2022-09-24 7:58 ` [bug#57675] [PATCH v11 7/8] gnu: telegram-desktop: Update to 4.2.0 Liliana Marie Prikler 2022-09-24 23:52 ` Hilton Chain via Guix-patches via 2022-09-25 5:54 ` Liliana Marie Prikler 2022-09-25 6:15 ` Hilton Chain via Guix-patches via 2022-09-25 6:31 ` Liliana Marie Prikler 2022-09-25 6:43 ` Hilton Chain via Guix-patches via 2022-09-25 13:11 ` Hilton Chain via Guix-patches via 2022-09-24 7:46 ` [bug#57675] [PATCH v11 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Liliana Marie Prikler 2022-09-26 13:28 ` [bug#57675] [PATCH 00/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via 2022-09-26 13:29 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Hilton Chain via Guix-patches via 2022-09-26 13:30 ` [bug#57675] [PATCH 02/10] gnu: Add abseil-cpp-cxxstd17 Hilton Chain via Guix-patches via 2022-09-26 13:30 ` [bug#57675] [PATCH 03/10] gnu: Add crc32c Hilton Chain via Guix-patches via 2022-09-26 13:31 ` [bug#57675] [PATCH 04/10] gnu: webrtc-for-telegram-desktop: Update to 621f3da5 Hilton Chain via Guix-patches via 2022-09-26 13:32 ` [bug#57675] [PATCH 05/10] gnu: webrtc-for-telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via 2022-09-26 13:32 ` [bug#57675] [PATCH 06/10] gnu: Remove libvpx-for-telegram-desktop Hilton Chain via Guix-patches via 2022-09-26 13:32 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 09/10] gnu: telegram-desktop: Order inputs alphabetically Hilton Chain via Guix-patches via 2022-09-26 13:33 ` [bug#57675] [PATCH 10/10] gnu: telegram: Remove unused variables Hilton Chain via Guix-patches via 2022-09-27 19:13 ` [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2 Liliana Marie Prikler 2022-09-28 19:00 ` bug#57675: " Liliana Marie Prikler 2022-09-29 9:47 ` [bug#57675] " Hilton Chain via Guix-patches via 2022-09-27 18:45 ` [bug#57675] [PATCH 07/10] gnu: Add libdispatch Liliana Marie Prikler 2022-09-26 18:26 ` [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0 Liliana Marie Prikler
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).