From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8KPsFdCN72YdzAAAe85BDQ:P1 (envelope-from ) for ; Sun, 22 Sep 2024 03:24:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8KPsFdCN72YdzAAAe85BDQ (envelope-from ) for ; Sun, 22 Sep 2024 05:24:00 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="DWS5Ws/S"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=IFi91aw9; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726975440; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=9dRWbWTXZAfJGqFt9vlh+ACaNRx/XpcG7LcmhQgSmVE=; b=IxefvlzpN4NAfFIiOTi91AamEuHx+J1Jtl4YHSxgo7WQRNo/5FlwNy2lZwUVwSPMtAxQjo cVRBIpzp4l67QV2Gpsqu86iWBgoudfIG7NJ8rifH8GF5e7pjIdjj0LuXnFiprurnRO1O7B xzKWxe4AQSqCXRs6W1segtGEenmsdBYKMH1Nn7KYp5d31ClMF0Qr4JPmXiZO9xqg/9EHgr aXlbNV8/D1NnBaia8iqYM0PAotTtNKM+V923GbdY0O0fYfIwPKQGhIITCiztldorV2PGvy QcP2w8wsvX4v0Ygprz7pdtSCn7yhy09DPsbkS2VFtPnlA0l53g6HQA/a9lXbZw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726975440; a=rsa-sha256; cv=none; b=oNXsoigaWJc4apl9+jAqMYMYxse2zua+S3uYP6ezCcvlbdg4/1unzhX5TTs5Kgb8COgbpu eFbnkpm7yM6tX8tOdzv02JBbg5/dP1oYCd21poXKFjR2/BvlxvZQ+1mDLyNWdjJxgXyrZc yOLP3BmOJGaEviIfKo6ap2Odve++ErGHYhVSr/q6t6Io98SMqwyqf6aQufbsbpaHlsdAdd aNLWi53x6bZo8iKQ84laAramWxeStNe5fhGfV/YMR++wqbsDClWgzIrkADw1ew7+OL7MtD BF0gSmKIHZfrCMeVOIasV1h0hNi9EqtjwSi0r/m3xmu7xWQszpSe4eqPGBsKRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="DWS5Ws/S"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=IFi91aw9; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 231BB63087 for ; Sun, 22 Sep 2024 05:24:00 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssDCJ-0004Ey-1H; Sat, 21 Sep 2024 23:23:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ssDCH-0004Eb-8d for guix-patches@gnu.org; Sat, 21 Sep 2024 23:23:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ssDCG-0008QH-Vu for guix-patches@gnu.org; Sat, 21 Sep 2024 23:23:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=9dRWbWTXZAfJGqFt9vlh+ACaNRx/XpcG7LcmhQgSmVE=; b=DWS5Ws/SJnhVFZYIYmdsdduOIybl7aiKWq5r7yA4GUfvK3fIYDhGFFA3526upidSBOo2WiA8UgT3NvYnoG5IEjpR9LzPg+6NSKXQVB6von6RBhcgcW9XwFTLYfy/0RC8MLKoELW4BhsxhXfR9sJDERzKU7H+zKeqSXE4c3OgRtEM5hMM/E+MDfNfTZtvtHKWm976DPypDIb/QpsFV4WbiMo+vMK9NL04qzcwAXluM6Ks7DauDduQRIXf6bXePo6/stPfdjJ+qPSHfPoHgOTgureZxoz5Bx8W2EZm6fOqCQUNDOBKEEzLgCuQkwyOV4DPfrW4AV47zOozgHZwP2bTBw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssDCb-0002qk-UD for guix-patches@gnu.org; Sat, 21 Sep 2024 23:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 8/8] gnu: telegram-desktop: Update to 5.5.5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Sep 2024 03:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: dan Cc: Sharlatan Hellseher , Liliana Marie Prikler , 71897@debbugs.gnu.org Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172697543910946 (code B ref 71897); Sun, 22 Sep 2024 03:24:01 +0000 Received: (at 71897) by debbugs.gnu.org; 22 Sep 2024 03:23:59 +0000 Received: from localhost ([127.0.0.1]:40569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDCY-0002qT-KL for submit@debbugs.gnu.org; Sat, 21 Sep 2024 23:23:59 -0400 Received: from mail-pl1-f170.google.com ([209.85.214.170]:47374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssDCV-0002qG-Si for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 23:23:56 -0400 Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2053a0bd0a6so33104365ad.3 for <71897@debbugs.gnu.org>; Sat, 21 Sep 2024 20:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726975349; x=1727580149; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=9dRWbWTXZAfJGqFt9vlh+ACaNRx/XpcG7LcmhQgSmVE=; b=IFi91aw9Ms2/MFyYUq/5+OKLzgxeS/jF0qiObVHQYf0IvOAadTH08FvNxBNnQe4cxY 4W0oSDQ5m/yVqt72Ge0AnRQIZEq4ihT+OKUtZMv2tSnfqqeQM8USkLhuz1k+FjTFZzKn LXx9O5zMUyVhTueo3Lr4V8PhHus2ykbwXI30Ifo8H2rhVGgEO7wtkzQrtw2uxNS6QJcg lH3v4royKvanaLSWMK8eEknAXE73G+0SyWPq28+0wLtP3jAeqmmGmPUh0ts6cKE5XDKQ TnDfS5gCtTph/JZ9s4Cgm+ghpmCSuyYDr2/NhqanVWXrDhT0mJxmwPHf9BYsMvfq8GXt h+zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726975349; x=1727580149; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9dRWbWTXZAfJGqFt9vlh+ACaNRx/XpcG7LcmhQgSmVE=; b=WDasaUWkt2iikoB8RDS4VitiOio7GnNgqmUBozcC5YqPAg9u9W8RPQj3kEYL/dye1T b6AflDBN2H+QmJ47I5/QZJABPfro2n2rPwunHvPuqFb7pRpjnbeoI7d8E3oQWSHiUTBa eNN5t4UWg9NT2P4wvcykk9N3GFfLVGSBjhxerJ2x9Ad+RdezkhUCZB9bq+ZCc60yZget mMzaAnAmWRR5Fj93FmGpN89B6Q6fItmCU4h9LlGXMpo2G/o82t4GSgAbJXHvux6WPY8/ HqVtoiL3i5+McL07w4L1eJi6AqJ0xbZrM2ypXbuTlG6ViXTFRvjfgqsG1spaVEE+CoFI tO4g== X-Gm-Message-State: AOJu0Yzy/rZxORUt3Fs6QH7rODf6+/FHpM7i4QREUkPpqONzmt97VpNQ fENiBwDrjP6eR7XvqrbLDYaxziAgRS/hyWphFsaz7thT34vxZ9N+t4f21Q== X-Google-Smtp-Source: AGHT+IFAlmFqh72erxLHUG/0++BMgzV9WJC4dzv/+NqGU0bc6Ep5FkVnJwl2xpI8pjuU3EpEkhWY+w== X-Received: by 2002:a17:902:d492:b0:206:dc3e:6914 with SMTP id d9443c01a7336-208d83b95dbmr95731115ad.36.1726975349055; Sat, 21 Sep 2024 20:22:29 -0700 (PDT) Received: from hurd ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-207946fb724sm114389615ad.200.2024.09.21.20.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2024 20:22:28 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: (dan's message of "Sat, 21 Sep 2024 22:53:14 +0800") References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> Date: Sun, 22 Sep 2024 12:22:26 +0900 Message-ID: <87o74gl6dp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -8.96 X-Migadu-Queue-Id: 231BB63087 X-Spam-Score: -8.96 X-TUID: swQT6CFhYIys Hi, dan writes: > * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: > Update patch file to match upstream changes. > * > gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: > Update patch file to match upstream changes. > * gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch: New file. > * gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: New file. I suppose these patches are from upstream? For extra origin tracking, I like to add a URL to the upstream URL they were fetched from, or at least a comment mentioning this is committed but unreleased in the main repo. [...] > (define-public webrtc-for-telegram-desktop > - (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") > - (revision "389")) > + (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") > + (revision "456")) > (hidden-package > (package > (name "webrtc-for-telegram-desktop") > @@ -285,7 +291,7 @@ (define-public webrtc-for-telegram-desktop > (file-name > (git-file-name name version)) > (sha256 > - (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) > + (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) > (patches > (search-patches > ;; https://github.com/desktop-app/tg_owt/pull/123 > @@ -407,7 +413,7 @@ (define libprisma-for-telegram-desktop > (url "https://github.com/desktop-app/libprisma") > (commit "23b0d70f9709da9b38561d5706891a134d18df76"))) > (file-name > - (git-file-name "libprisma-for-telegram-desktop" "5.3.2")) > + (git-file-name "libprisma-for-telegram-desktop" %telegram-version)) > (sha256 > (base32 > "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) > @@ -427,7 +433,7 @@ (define-public telegram-desktop > (file-name > (git-file-name name version)) > (sha256 > - (base32 "0g47ffamh1csp79yzkv28v3qjkhjacj0c7pjf53n1ks80j5hc2j0")) > + (base32 "12fdybn085s3i3a8hwi0bmdns7jxvg0k662n04jgffirgsz8n54m")) > (patches > (search-patches > ;; https://github.com/telegramdesktop/tdesktop/pull/24126 > @@ -468,7 +474,10 @@ (define-public telegram-desktop > "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" > "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" > "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" > - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON") > + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" > + ;; enabling jemalloc causes SIGSEGV. this probably happened > + ;; after upgrading to glibc 2.39. > + "-DDESKTOP_APP_DISABLE_JEMALLOC=ON") Nitpick: Please use fully punctuated complete sentences for stand alone comments (the ones on their own lines -- inline comments (trailing at the end of line are OK to be incomplete sentence)) > #:phases > #~(modify-phases %standard-phases > (add-after 'unpack 'unpack-additional-sources > @@ -493,21 +502,45 @@ (define-public telegram-desktop > ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) > ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) > ("Telegram/ThirdParty/cld3" #$cld3-for-telegram-desktop) > + ("Telegram/ThirdParty/libprisma" #$libprisma-for-telegram-desktop) > ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) > + (add-after 'unpack-additional-sources 'patch-gir-ignore-paths > + (lambda _ > + (substitute* "cmake/external/glib/generate_cppgir.cmake" > + (("\\$\\{cmake_helpers_loc\\}/external/glib/cppgir/data") > + (string-append #$(this-package-input "cppgir") "/share/cppgir"))))) > + (add-after 'unpack-additional-sources 'use-system-xdg-desktop-portal > + (lambda _ > + (substitute* (list "Telegram/CMakeLists.txt" > + "Telegram/lib_base/CMakeLists.txt") > + (("\\$\\{third_party_loc\\}/xdg-desktop-portal/data") > + (string-append #$(this-package-native-input "xdg-desktop-portal") > + "/share/dbus-1/interfaces"))))) > + ;; has to remove this constexpr otherwise cannot compile with gcc-final Ditto (same comment as above). > + (add-after 'use-system-xdg-desktop-portal 'patch-libwebview > + (lambda _ > + (substitute* "Telegram/lib_webview/webview/webview_interface.h" > + (("constexpr ") "")))) GCC should know about constexpr; perhaps the wrong C++ standard (can be provided via a CMake flag) is being selected, or alternatively you could provide a newer gcc compiler native inputs? > (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 `(,glib "bin") > + (list cpp-ada-url-parser > + `(,glib "bin") > + gobject-introspection > `(,gtk+ "bin") > pkg-config > - python-wrapper)) > + python-wrapper > + xdg-desktop-portal)) > (inputs > (list abseil-cpp-cxxstd17 > alsa-lib > + boost > c++-gsl > + cppgir-for-telegram-desktop > crc32c > + expected-lite > fcitx-qt5 > fcitx5-qt > ffmpeg > @@ -516,7 +549,6 @@ (define-public telegram-desktop > gtk+ No GTK 4 support yet? > hime > hunspell > - jemalloc > kcoreaddons-5 > kimageformats-5 > libdispatch Thanks for this undertaking. It looks nearly good to go, with my little comments/concerns ideally addressed. -- Thanks, Maxim