From patchwork Sat Dec 4 17:05:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 35139 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0754127BBEA; Sun, 12 Dec 2021 00:46:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C032827BBE9 for ; Sun, 12 Dec 2021 00:46:18 +0000 (GMT) Received: from localhost ([::1]:43680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwD0L-0002tu-P0 for patchwork@mira.cbaines.net; Sat, 11 Dec 2021 19:46:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwCzA-0002Po-I8 for guix-patches@gnu.org; Sat, 11 Dec 2021 19:45:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwCz8-00067P-Ud for guix-patches@gnu.org; Sat, 11 Dec 2021 19:45:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwCz8-00079q-Sf for guix-patches@gnu.org; Sat, 11 Dec 2021 19:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52278] [PATCH v2 3/3] gnu: telegram-desktop: Update to 2.9.3. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 00:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52278 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52278@debbugs.gnu.org Received: via spool by 52278-submit@debbugs.gnu.org id=B52278.163926985227420 (code B ref 52278); Sun, 12 Dec 2021 00:45:02 +0000 Received: (at 52278) by debbugs.gnu.org; 12 Dec 2021 00:44:12 +0000 Received: from localhost ([127.0.0.1]:50314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwCyJ-00078B-Fi for submit@debbugs.gnu.org; Sat, 11 Dec 2021 19:44:12 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:43907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwCyA-00076r-4k for 52278@debbugs.gnu.org; Sat, 11 Dec 2021 19:44:03 -0500 Received: by mail-wm1-f67.google.com with SMTP id o19-20020a1c7513000000b0033a93202467so9296750wmc.2 for <52278@debbugs.gnu.org>; Sat, 11 Dec 2021 16:44:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=2QOxKrOW1Bfh6n8NQaG91r8HPGjdcaPTFGWrmO9J8XA=; b=KMrcuY7rjy4l3QdgHTjhPWJ5DQ/UNt8zhpcN3BABWLB79Tc8IuXHbvkalG87uRxpRE ZNhg7lzlHd5z+RZgutr79Nsmpq5yPVvuzPgC//BTbIrY0YgAJE5IGc6JoGI7Z2k91Jnp xctyAwsmkkHd/eNcIRxQUHQlWs7d0sBbhlgx38TzIyTmPvWfQih588SCZ/qL1PY+j+dO ad7fxxcnLr0RMlvhBR2Y9hJ5vJinjPDvBQsIJZo6KOpea5nAYKEAv6DAM1mHqWIfqWva G8j4yHN6WBcVL4O1VpvghF44D4OsRtdfVCzlcCSq3frHhsPUpDyWbuZS9Z1qb+UPbCpg 1G7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=2QOxKrOW1Bfh6n8NQaG91r8HPGjdcaPTFGWrmO9J8XA=; b=ei7GWRyL74R05OocjWAYsUkhdUr+Hn1seKvSnCeo/0+zhYeAzqQx2DTCogtwsvNP3W QyLXhIZwRj0oPkoX8fxI+1wbA82Dgq5v6/df/8ILCj39T+wXvl7Hpldmhc8v6yDkVwAT zHooZSBlU2rVGe7cMaUxD5xvvxcfyfjR2Rj32SSAppQ8hzkSfT3oKAkQ8UvFYWJl+cpS glGmswiwxW6/4bS7Xvat8SIYP5V6/lGWVQViy4hVOI4fO1PjLEGj/s3itV8fngZeDOKt wiQEB957NZ7oThj7eKQJreKHpvemsqNNpon6QCWeAvPWyNxq49DUT8MjTJLF1PqvnTRI RQMw== X-Gm-Message-State: AOAM5325WJpADuZjw9HnCazAs6v74YnwxYWSYRFcBd+fCvr1YxFeZAFa au36Of1c1/kytNlmIime6TSA6yJfIGU= X-Google-Smtp-Source: ABdhPJzaBhUvPxExl7aeztEZYr868w6pQSss3TVMnfWvjVY04NG6fFtMgu+1hu1GwtW0pZFm1Ykh2A== X-Received: by 2002:a7b:c452:: with SMTP id l18mr27489714wmi.46.1639269836440; Sat, 11 Dec 2021 16:43:56 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id p27sm2613658wmi.28.2021.12.11.16.43.55 for <52278@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Dec 2021 16:43:56 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 4 Dec 2021 18:05:36 +0100 Message-ID: <89ee896e9cf12e4ac1444c21b7f6e47c352c4523.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telegram.scm (telegram-desktop): Update to 2.9.3. [#:configure-flags]: Add "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON". [#:phases]: Copy lib_waylandshells and lib_webview. [native-inputs]: Bump cmake_helpers to a bespoke commit. [inputs]: Add glibmm, jemalloc, qtsvg, and rnnoise. Add sources for lib_waylandshells and lib_webview. Bump lib_base, lib_crl, lib_lottie, lib_qr, lib_rpl, lib_spellcheck, lib_storage, lib_tl, and lib_webrtc to bespoke commits that would otherwise be used by recursive checkout. --- gnu/packages/telegram.scm | 87 ++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 28 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 5d5400b363..d1707a11ea 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -37,6 +37,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -274,7 +275,7 @@ (define-public libtgvoip-for-telegram-desktop (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.5.9") + (version "2.9.3") (source (origin (method git-fetch) @@ -286,7 +287,7 @@ (define-public telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lqs06scqvzg37a2py8jk7nnlvk42jjifcpnhdd5rgd5biw70nyx")) + (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -321,6 +322,8 @@ (define-public telegram-desktop ;; Raghav Gururajan "-DTDESKTOP_API_ID=2791056" "-DTDESKTOP_API_HASH=582d6d0b44f7a2de949e99271fd8b3f2" + ;; Disable WebkitGTK support as it fails to link + "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" ;; Use bundled fonts as fallback. "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") #:phases @@ -352,7 +355,9 @@ (define-public telegram-desktop ,(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)) @@ -372,11 +377,11 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "695fabda6830b58bdc02d09db70531d5dececcd0"))) + (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" version)) (sha256 - (base32 "1j3ppgfmihcjl22w5jk8jhwif10i9wbycq5zqnssn6pnhnj7di5i")))) + (base32 "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) ("cmake-shared" ,cmake-shared) ("extra-cmake-modules" ,extra-cmake-modules) ("gcc" ,gcc-9) @@ -396,20 +401,22 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "127968de8129e8ccfa6ac50721c70415a5a087c3"))) + (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) (file-name (git-file-name "codegen" version)) (sha256 - (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2")))) + (base32 "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) ("expected" ,libexpected) ("fcitx-qt5" ,fcitx-qt5) ("fcitx5-qt" ,fcitx5-qt) ("ffmpeg" ,ffmpeg) ("glib" ,glib) + ("glibmm" ,glibmm) ("gtk+" ,gtk+) ("hime" ,hime) ("hunspell" ,hunspell) ("iconv" ,libiconv) + ("jemalloc" ,jemalloc) ("kwayland" ,kwayland) ("lib-base-source" ,(origin @@ -417,44 +424,44 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "f1e4168081428fa451d2f50eee7b1c448268c43a"))) + (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) (file-name (git-file-name "lib-base-for-telegram-desktop" version)) (sha256 - (base32 "0piqp7llwi7sfy4c15g0p8ihr90rz1qps6q5fkl1iasrf5ysw8qc")))) + (base32 "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) ("lib-crl-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "16150bf71d79382738114b913f137ec1a1a7630c"))) + (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" version)) (sha256 - (base32 "0qhagdr26aqb9w7wnchcmk1j7ln28x3wbkkkm06b8h0mybksbj7q")))) + (base32 "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) ("lib-lottie-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "fb40f379d82ffa1fc7506e9a8dddcf48847715ae"))) + (commit "0770df009db7928df1d0cad0900dc5110106d229"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" version)) (sha256 - (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw")))) + (base32 "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) ("lib-qr-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "92ce41a690a463eb462089a4eb1e51e019308018"))) + (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" version)) (sha256 - (base32 "182939nv7xs9b3bgah3gl5y9hx5r59mabd2jw3z6717vc96qi2pj")))) + (base32 "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) ("lib-rlottie-source" ,(origin (method git-fetch) @@ -472,66 +479,88 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "e1b96399d9031c4ef0354631e6bb375029d29d9f"))) + (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" version)) (sha256 - (base32 "1wvqazljd2kq1fxlj250jhjrig529499bym9p81dx33kh1l9dgss")))) + (base32 "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) ("lib-spellcheck-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "1b540b38ed78e9a3cba93e9ba4ce4525ab692277"))) + (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" version)) (sha256 - (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7")))) + (base32 "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) ("lib-storage-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "cbe51722b73cfa9ff27bd59294b08aa5ee33c936"))) + (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" version)) (sha256 - (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87")))) + (base32 "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) ("lib-tl-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "404c83d77e5edb8a39f8e9f56a6340960fe5070e"))) + (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" version)) (sha256 - (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f")))) + (base32 "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) ("lib-ui-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "e14bc4681d69c1b538b8c5af51501077ae5a8a86"))) + (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" version)) (sha256 - (base32 "04b1x4bswk3bxqrwpv5g7w4frkprrwf0px6aibh6z4drinv08wsv")))) + (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 "60d5c43daf882a6c03944a3e6198b5f35b654a0e"))) + (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" version)) (sha256 - (base32 "0mxmbw8i37axllg9h976p6np2gcfyci6xwwl9hc9mhs49vwwsw5s")))) + (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) @@ -545,22 +574,24 @@ (define-public telegram-desktop ("pulseaudio" ,pulseaudio) ("qrcodegen" ,qrcodegen-cpp) ("qt" ,qtbase-5) + ("qtsvg" ,qtsvg) ("qt5ct" ,qt5ct) ("qtimageformats" ,qtimageformats) ("qtwayland" ,qtwayland) ("range-v3" ,range-v3) ("rlottie" ,rlottie-for-telegram-desktop) + ("rnnoise" ,xiph-rnnoise) ("tgcalls-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "71addf5b41cb6bb6844f75e977edae0020938930"))) + (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" version)) (sha256 - (base32 "1zrjxf03n3ad8b95gwjarmq4gj5i5cwhlg93qcjv2232kksh29iy")))) + (base32 "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) ("webrtc" ,webrtc-for-telegram-desktop) ("x11" ,libx11) ("xcb" ,libxcb)