From patchwork Mon Sep 26 13:29:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42940 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 DBF3227BBEA; Mon, 26 Sep 2022 14:41:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8BE0C27BBE9 for ; Mon, 26 Sep 2022 14:41:36 +0100 (BST) Received: from localhost ([::1]:44652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoMZ-0004VD-Ot for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:41:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoCR-0002bo-AY for guix-patches@gnu.org; Mon, 26 Sep 2022 09:31:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoCL-0004JC-U9 for guix-patches@gnu.org; Mon, 26 Sep 2022 09:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoCL-0005i7-Pw for guix-patches@gnu.org; Mon, 26 Sep 2022 09:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 01/10] gnu: kcoreaddons: Update to 5.98.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419902016621 (code B ref 57675); Mon, 26 Sep 2022 13:31:01 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:30:20 +0000 Received: from localhost ([127.0.0.1]:49649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoBf-0004IQ-2S for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:30:19 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoBd-0003vX-En for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:30:18 -0400 Date: Mon, 26 Sep 2022 21:29:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CZcDoAZI+g3ROrEUip5J9nuX3nyQ1O5Qy5926oMGSj4=; b=mAopYMsxKfo9K0oe33Dh8foZRWJ1WUzt/AADxyxLYuj0SgBWPUE1H8xJaQN8k1LqSVfUdR dc9DNEWkrd0qbOOzt9ponvtoD/bf4ScTmlD7U0T5nlQ5NdZRCCo+B4REvXHw2c7gBVUaXR ewrvD9D5BACylmjwfLITN1DiICz8DFcQzIISVt1JE6XD8qAvfPYYLZnXlz2RDDWJjRfq18 9VYL3PGGokNWEx7Q/B0ef53vYw2gs4cj0/NZxoIlFC3LaO5HeofDvsu0iMAya5sgAFzw1P L0qNeKb/8tHZQGrRAIHmiJAYk7C0g6GT1nBh5Vd7TigupDvre/y8SI8Zk4mxOg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 From patchwork Mon Sep 26 13:30:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42942 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 1A0A427BBEA; Mon, 26 Sep 2022 14:42:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D424627BBE9 for ; Mon, 26 Sep 2022 14:42:01 +0100 (BST) Received: from localhost ([::1]:40096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoMz-00056v-0R for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:42:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoCS-0002c5-2c for guix-patches@gnu.org; Mon, 26 Sep 2022 09:31:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoCM-0004JE-Cd for guix-patches@gnu.org; Mon, 26 Sep 2022 09:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoCM-0005iE-7L for guix-patches@gnu.org; Mon, 26 Sep 2022 09:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 02/10] gnu: Add abseil-cpp-cxxstd17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419905221709 (code B ref 57675); Mon, 26 Sep 2022 13:31:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:30:52 +0000 Received: from localhost ([127.0.0.1]:49652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoCB-0005dm-T3 for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:30:52 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoC9-0005MM-DS for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:30:49 -0400 Date: Mon, 26 Sep 2022 21:30:24 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rXZf8rx19R2FbzJ4250O2kZ5Z1Em9z5N08Nam0kQIe8=; b=a9oJbpuw16XRsBevar3KcgkhmJ0W1MAiFLCxiBHFyMG0j7XGmx0vB8UquNOtm4OXVSAj9N StiI4zNvHyRPbNovQUcBlm7Ma8yd61wDacfoKOnverSQPzSM/ErZI6HZq8Q5LH0af4aiHQ 3UmCv8J1nhz09Prxmuo0S+ekqcobJhb6CfBlpvhqd+zJZbJbXmmDVvhHFG6C/EJpiguXJv NDz71sgXwdLjG9vWq3hknewMhuZBeVm44n+RmCeuiSijsiYmWVi8TA45byiN6zs5pIkdWF LNUvoYcX2lHmpPUz+NI/XDpGXlom442YRr/IPBWpFmBIaGYYxm2dSfBCm0I/qw== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (abseil-cpp-cxxstd17): New variable. --- gnu/packages/cpp.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d03e0bc7e1..5e0646444c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1041,6 +1041,15 @@ (define-public abseil-cpp `(cons* "-DBUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) +(define-public abseil-cpp-cxxstd17 + (let ((base abseil-cpp)) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DCMAKE_CXX_STANDARD=17" #$flags)))))))) + (define-public pegtl (package (name "pegtl") From patchwork Mon Sep 26 13:30:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42947 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 7A8FB27BBE9; Mon, 26 Sep 2022 15:11:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C904027BBEA for ; Mon, 26 Sep 2022 15:11:50 +0100 (BST) Received: from localhost ([::1]:50876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocopp-0003j8-OR for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 10:11:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoDK-0003Du-Te for guix-patches@gnu.org; Mon, 26 Sep 2022 09:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoDK-0004Tz-DL for guix-patches@gnu.org; Mon, 26 Sep 2022 09:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoDK-0005jz-2F for guix-patches@gnu.org; Mon, 26 Sep 2022 09:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 03/10] gnu: Add crc32c. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419907622002 (code B ref 57675); Mon, 26 Sep 2022 13:32:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:31:16 +0000 Received: from localhost ([127.0.0.1]:49662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoCZ-0005io-L3 for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:31:16 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoCY-0005ib-7y for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:31:14 -0400 Date: Mon, 26 Sep 2022 21:30:49 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5+GEB4hXt6uW+xDIxCo2RyaY2nkv5Mt4dainrY7aeEk=; b=rjGh3QOd8hrndh9scJOu6fFKJ4TiUQwP3nQz4z8yex6B/fPK9sTDKZ6/SH1TZGGCDK1Uh+ JQ7isKctyFbrQHZenIX+7S1UfMTZMmGk/JP6gWu+gkC2EbhmhjqG9H8jbrXyZ84Zh6rwZ9 esJ3yo6P/ZaUvIsIFVWkX7l+NkuIX6qkCkZaUFw9SJDPgSCXksTo7kjAO2I29bZ5f1Pu9Q CiGCKELpLbrPgDEZU5pvQWS+DhxY6aG5sLx9VwJAWR8Gqmxzbv9XoO4lst+zabqsuuRpyu 12Acph2qMRXFQH6KX4rjr7AgLxVMxkghfzr/MRTrMFSblPzXOZh1os9fSNY6zw== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (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 From patchwork Mon Sep 26 13:31:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42939 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 9A69727BBEA; Mon, 26 Sep 2022 14:40:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA5A427BBE9 for ; Mon, 26 Sep 2022 14:40:52 +0100 (BST) Received: from localhost ([::1]:57878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoLs-0003xo-45 for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:40:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoDK-0003E5-W9 for guix-patches@gnu.org; Mon, 26 Sep 2022 09:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50588) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoDK-0004UA-Ho for guix-patches@gnu.org; Mon, 26 Sep 2022 09:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoDK-0005k6-DL for guix-patches@gnu.org; Mon, 26 Sep 2022 09:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 04/10] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419910122041 (code B ref 57675); Mon, 26 Sep 2022 13:32:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:31:41 +0000 Received: from localhost ([127.0.0.1]:49665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoCz-0005jP-4q for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:31:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:41932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoCv-0005jC-Ro for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:31:39 -0400 Date: Mon, 26 Sep 2022 21:31:12 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U/X+pJb+NnSAaLJHbDOwrkS4EFwnn93CDowSr77OYXk=; b=QIz3TczSwi1YG0CwBlBMTWN1XA9nPHFR3Kj8RcQ9Cv0r/87GXhqOZNrW4vy+eoK8IMHWa4 OThvpc3fOUiScIT961lvDJNTeU2BUV9jdRTV9SJpHADW6M6p9kFD9iZAA4kK3/+WtbMYIb ymFIaaZOlCmBRQQVSbHnEZVq1tqWARO/wXhMhSdHBNlTnuvkCHxVECFBLVb8+/LKAd851K aqU7ggWdOB18i0OaHr1Dh/D9dtbMxvjiYHaNC40+cb57qNUSAM/xRhuuLT/GhK5R2OI925 yMzZAGgH9GLJYNMmT6fneTxzgNnC6EZ9Em4+vcdgKiRUv6eog1bIbo4G64Jzmw== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (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 +Date: Sun, 15 May 2022 12:47:41 +0200 +Subject: [PATCH] fix(h265_pps_parser): fix missing cstdint include + +--- + src/common_video/h265/h265_pps_parser.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h +index 28c95ea9..c180b1b9 100644 +--- a/src/common_video/h265/h265_pps_parser.h ++++ b/src/common_video/h265/h265_pps_parser.h +@@ -12,6 +12,7 @@ + #define COMMON_VIDEO_H265_PPS_PARSER_H_ + + #include "absl/types/optional.h" ++#include + + namespace rtc { + class BitBuffer; diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c9869f93e..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 From patchwork Mon Sep 26 13:32:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42948 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 72E0227BBEA; Mon, 26 Sep 2022 15:12:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3123027BBE9 for ; Mon, 26 Sep 2022 15:12:02 +0100 (BST) Received: from localhost ([::1]:36906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoq1-0004JW-Ac for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 10:12:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoEI-0004PU-Or for guix-patches@gnu.org; Mon, 26 Sep 2022 09:33:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoEI-0004aq-Gx for guix-patches@gnu.org; Mon, 26 Sep 2022 09:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoEI-0005lj-Bi for guix-patches@gnu.org; Mon, 26 Sep 2022 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 05/10] gnu: webrtc-for-telegram-desktop: Order inputs alphabetically. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419915322126 (code B ref 57675); Mon, 26 Sep 2022 13:33:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:32:33 +0000 Received: from localhost ([127.0.0.1]:49670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoDo-0005ko-QM for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:32:33 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:41438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoDn-0005kc-Kb for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:32:32 -0400 Date: Mon, 26 Sep 2022 21:32:06 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTkunTXjByJTPzWMNvCNEWGu1GxkZn3U9WRM2ANjk9Q=; b=H3AxapYKFoe645RykUoilz4OnViHWWYtN92ykkDA5yZoOFOfZ5RravNYcyBPhY0y8K/yhP zRiUuiUxteGFckiiYTaQ5xMO2deouokrZLqupELxx41NhkgOLdAPGy/2NN6jtLqFSSaCHz SH7X0np8bU01djhxCvuL4hBeVFE/sDhP5dJKWeTGr+qg5f3S2nTc/Bl2+kD5qAcklU6Zh5 mXgIH8e8pkSq8waTdkBrTtHgwG2KB+/F7pBx6DuKczkmXdhCLyBTa8kJ0l/yT8DlmZWarw zWMEBog5p3LUGmp3l8yVfJbV8+60BMJQGKEHGMAJ4bPGemGcKpU7Vc3Th83EAQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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.") From patchwork Mon Sep 26 13:32:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42941 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 AD18027BBEA; Mon, 26 Sep 2022 14:41:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6EDC127BBE9 for ; Mon, 26 Sep 2022 14:41:44 +0100 (BST) Received: from localhost ([::1]:59428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoMf-0004fr-Vp for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:41:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoEK-0004Pe-O5 for guix-patches@gnu.org; Mon, 26 Sep 2022 09:33:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoEI-0004av-Tn for guix-patches@gnu.org; Mon, 26 Sep 2022 09:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoEI-0005lr-Ol for guix-patches@gnu.org; Mon, 26 Sep 2022 09:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 06/10] gnu: Remove libvpx-for-telegram-desktop. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419917622163 (code B ref 57675); Mon, 26 Sep 2022 13:33:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:32:56 +0000 Received: from localhost ([127.0.0.1]:49673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoEC-0005lP-3k for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:32:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoE9-0005lC-T4 for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:32:54 -0400 Date: Mon, 26 Sep 2022 21:32:28 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ipUnQPyOqPtBX5Xj6E1XwmLx3efHzEodm1SHrqkfrlM=; b=qlJW0os7fvoELpf0MO1AlZEEFxx3TJnoTSRAGmgYs4dRToTHzKk7wpEo0RR5DkrwM4YDzV 0EYprl2FxV1YFhpLVatZsYJx6kQ6EGoqMMdzLIcvZqoaxw+7m8zkO51aUJdPnhtifViox/ 4OwQ/kR5ljSym9yqAORkxPF3YcHIA5jJXSsnwlDllEtgJxVdBBJqVdK/ZSUeshjIeTj4Yz 7vRLafJNxCaopVASsfCu7zC3pyK96DQdRMCSmbc1WnoA439kPOscZuFkCwUpDvhewxTfMn PRO3sC0Bc7EiQfRTL9/CauvppvWBHQx/pgVqQbnmBy3FKaYbd7rPhJmsSf/etg== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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")) From patchwork Mon Sep 26 13:32:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42944 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 C75F827BBEA; Mon, 26 Sep 2022 14:42:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B01327BBE9 for ; Mon, 26 Sep 2022 14:42:36 +0100 (BST) Received: from localhost ([::1]:36040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoNX-0006Lc-Kt for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:42:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoFG-0005r0-Lx for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoFG-0004lJ-8P for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoFG-0005oD-3J for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 07/10] gnu: Add libdispatch. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419919722233 (code B ref 57675); Mon, 26 Sep 2022 13:34:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:33:17 +0000 Received: from localhost ([127.0.0.1]:49685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoEW-0005mX-KA for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:33:16 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:56588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoET-0005m3-Vp for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:33:14 -0400 Date: Mon, 26 Sep 2022 21:32:49 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V5042Dnww6ArvzZQI7Mf14K6zJ6MZrxHnuzUvspIsSM=; b=18nKEDFyRyo3POmlTfGBRhThTe/DSqVYzfYD8IxwbXKTmYHTXe8KVoudL6AhDZVh+PEj59 sIi3Oj5mHDXAKFdIUT18HufcyIqHMnVHgjJcx77iuVpjBiEbDARzb1tI7OT7Clh6zAnyXu aCQ+gqQv6jxHV891EfCKYF+8566xaIyaPoGQ6OZShlZBfpVnSy3pWUiCoJ3GALOp/UW3zL 9vmYjtbYb5ZcnTOefDhqCWpmmL6GGgyBUd7fTud8QVwNAdrPZ/OGzAJv3xM+OAFIvTI7+f eWgENaoTm8Xagd6v/pFgp1t8muZwVtJ5urV16IBtFl47uYgDVNrxWamvvOSH7w== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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))) From patchwork Mon Sep 26 13:33:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42943 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 E8D1327BBEA; Mon, 26 Sep 2022 14:42:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F93C27BBE9 for ; Mon, 26 Sep 2022 14:42:21 +0100 (BST) Received: from localhost ([::1]:51218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoNI-0005jN-M9 for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:42:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoFH-0005r2-7b for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoFG-0004lU-U5 for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoFG-0005oK-Ok for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 08/10] gnu: telegram-desktop: Update to 4.2.2. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419921422268 (code B ref 57675); Mon, 26 Sep 2022 13:34:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:33:34 +0000 Received: from localhost ([127.0.0.1]:49688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoEn-0005n5-2o for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:33:34 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:42130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoEk-0005ms-P8 for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:33:32 -0400 Date: Mon, 26 Sep 2022 21:33:06 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AkR5rQikncoeee/Ych6/A1QPAlO/3vFjR/rMesa2LpE=; b=SmzsHQSmzyLE9xWJTzgsswaGKVmrczLy5YQG7k57b4w1webJWDT5mfVc5VHJXShEQWLLKQ ugC2nzp1NAuljaZImp0aYCL/qKugY7x2X1hQ5FFBPn6F7+NzQfGnCuDF0IbJ9e2zdNW4tx anAYWzLR5M93x2CkzS0CZSGafWcObpXHEFqO7JJiAj28sNh2zmSN8fbNMhw8/YGv8Sny4T U777Ny1kzEe3NNmv7qZLkz8lBF2WTz+/kkXaXR0PI2gWwMGWTlAYYLbaI/cMVTxKQxhzUv L+i+9m2Vw9jiL2v8VNTnj7uhb8wyFabhVAQXEB7d6weCD489x7ftB6j/DGvjaA== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/telegram.scm (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 +Date: Wed, 2 Mar 2022 01:07:48 +0100 +Subject: [PATCH] Introduce TDESKTOP_DISABLE_LEGACY_TGVOIP + +Originally from Alt Linux[0], OpenBSD has so far adapted the removal of +tgvoip in the official net/tdesktop build. + +tgcalls provides everything needed for calls; audio/video/desktop +sharing calls have been working fine across different operating systems +and telegram desktop/mobile versions without problems. + +0: http://www.sisyphus.ru/cgi-bin/srpm.pl/Sisyphus/telegram-desktop/getpatch/1 +--- + Telegram/CMakeLists.txt | 6 +++--- + Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++++ + Telegram/cmake/lib_tgcalls.cmake | 4 ++++ + Telegram/cmake/telegram_options.cmake | 8 ++++++++ + 4 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt +index fb2bf370f..5d9578f2d 100644 +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -28,7 +28,9 @@ get_filename_component(res_loc Resources REALPATH) + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) + include(cmake/lib_stripe.cmake) +-include(cmake/lib_tgvoip.cmake) ++if (NOT TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ include(cmake/lib_tgvoip.cmake) ++endif() + include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) +@@ -52,9 +54,7 @@ target_prepare_qrc(Telegram) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy + tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip + + # Order in this list defines the order of include paths in command line. + # We need to place desktop-app::external_minizip this early to have its +diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp +index 6894d5d90..cd03620e7 100644 +--- a/Telegram/SourceFiles/calls/calls_call.cpp ++++ b/Telegram/SourceFiles/calls/calls_call.cpp +@@ -39,8 +39,10 @@ class InstanceImpl; + class InstanceV2Impl; + class InstanceV2ReferenceImpl; + class InstanceV2_4_0_0Impl; ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + class InstanceImplLegacy; + void SetLegacyGlobalServerConfig(const std::string &serverConfig); ++#endif + } // namespace tgcalls + + namespace Calls { +@@ -56,7 +58,9 @@ const auto Register = tgcalls::Register(); + const auto RegisterV2 = tgcalls::Register(); + const auto RegV2Ref = tgcalls::Register(); + const auto RegisterV240 = tgcalls::Register(); ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + const auto RegisterLegacy = tgcalls::Register(); ++#endif + + [[nodiscard]] base::flat_set CollectEndpointIds( + const QVector &list) { +@@ -1322,7 +1326,9 @@ Call::~Call() { + } + + void UpdateConfig(const std::string &data) { ++#ifndef TDESKTOP_DISABLE_LEGACY_TGVOIP + tgcalls::SetLegacyGlobalServerConfig(data); ++#endif + } + + } // namespace Calls +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 34a5ba418..8a784be2c 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -267,6 +267,10 @@ PRIVATE + ${tgcalls_loc} + ) + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ return() ++endif() ++ + add_library(lib_tgcalls_legacy STATIC) + init_target(lib_tgcalls_legacy) + +diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake +index 1c3c25431..033f2bc95 100644 +--- a/Telegram/cmake/telegram_options.cmake ++++ b/Telegram/cmake/telegram_options.cmake +@@ -4,7 +4,9 @@ + # For license and copyright information please follow this link: + # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + ++option(TDESKTOP_DISABLE_LEGACY_TGVOIP "Disable legacy tgvoip support." OFF) + option(TDESKTOP_API_TEST "Use test API credentials." OFF) ++ + set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") + set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") + +@@ -40,6 +42,12 @@ if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "") + " ") + endif() + ++if (TDESKTOP_DISABLE_LEGACY_TGVOIP) ++ target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_LEGACY_TGVOIP) ++else() ++ target_link_libraries(Telegram PRIVATE tdesktop::lib_tgcalls_legacy tdesktop::lib_tgvoip) ++endif() ++ + if (DESKTOP_APP_DISABLE_SPELLCHECK) + target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_SPELLCHECK) + else() +-- +2.37.3 + diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 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 +;;; Copyright © 2022 Hilton Chain ;;; ;;; 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+)))) From patchwork Mon Sep 26 13:33:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42946 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 5A42227BBEA; Mon, 26 Sep 2022 14:46:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0490327BBE9 for ; Mon, 26 Sep 2022 14:46:22 +0100 (BST) Received: from localhost ([::1]:35280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoRA-0004Sx-5t for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoFI-0005r3-1f for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoFH-0004lb-Bq for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoFH-0005oS-6U for guix-patches@gnu.org; Mon, 26 Sep 2022 09:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 09/10] gnu: telegram-desktop: Order inputs alphabetically. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419923622305 (code B ref 57675); Mon, 26 Sep 2022 13:34:03 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:33:56 +0000 Received: from localhost ([127.0.0.1]:49693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoFA-0005nh-Fp for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:33:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:42666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoF9-0005nU-00 for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:33:55 -0400 Date: Mon, 26 Sep 2022 21:33:29 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XmYF/ALBLzCb97f/S23XCOZNqSeis+cCX4pLnLye+KE=; b=sfWmSi8uONDYnLRG9T4QYTbDIHNx6lWtOXhAWzGgHtS+wN1+x9/GSNzGISa+CAEmX4v0dh 1LPLRyKU+88A6DOm/vHRhuNZFBqKSJAZvvnRQ2krctw9sQS+6pRfaVFHk8xO9a0upIlkXW JkAICpPunS8gV1mNfSOS9J2L7iL8mbNeeNH6gMSmjBwpM7gs694N4JmYKcto/hHeuQjZfR Xq32s54sVcml8Dz1kAaiM1ba8hfwU5TverOobKp1OTYKsdf6WzGUteekiJgUdbCZR/lr3b FV2RibI3o/2NeVJmeRyh0nluwzcUe/birQiXNkj8jC7lptQtv7HKgAXVdJ1BfQ== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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)) From patchwork Mon Sep 26 13:33:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42945 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 5E12227BBEA; Mon, 26 Sep 2022 14:43:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD5BB27BBE9 for ; Mon, 26 Sep 2022 14:43:17 +0100 (BST) Received: from localhost ([::1]:42682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocoOD-0006x0-02 for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 09:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocoGG-0006mI-TK for guix-patches@gnu.org; Mon, 26 Sep 2022 09:35:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocoGE-0004zk-WA for guix-patches@gnu.org; Mon, 26 Sep 2022 09:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ocoGE-0005rG-Qv for guix-patches@gnu.org; Mon, 26 Sep 2022 09:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH 10/10] gnu: telegram: Remove unused variables. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 13:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57675@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 57675-submit@debbugs.gnu.org id=B57675.166419925822417 (code B ref 57675); Mon, 26 Sep 2022 13:35:02 +0000 Received: (at 57675) by debbugs.gnu.org; 26 Sep 2022 13:34:18 +0000 Received: from localhost ([127.0.0.1]:49708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoFV-0005pV-LI for submit@debbugs.gnu.org; Mon, 26 Sep 2022 09:34:18 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:55568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocoFP-0005ou-HV for 57675@debbugs.gnu.org; Mon, 26 Sep 2022 09:34:13 -0400 Date: Mon, 26 Sep 2022 21:33:46 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1664199245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O4TE4xkNh2+b/ZstO6Bv4HnSs+FP3wVS1xNtX41VpTY=; b=IgPCtrKrGq2P+/2EXNEu5ZW4PZYR2/yY45JCTzqwNPItHbaDe5DMr0x3a89JN/nWApkfQF NWHUsYgplusLdkCnbGjeGlBcCs+7D3D/8gl0R0qSjSSXxCjiI5x6Akc52OVWXDLbEAvXuZ ow2juh7ABXMcANLmSGWsg9at9I7SccHQmSsknfqJtJnkfZH9BWfyZfQZc3etyU4jRDqx5t Y1Zyqn+eaZe4LyjibyzzDcSgrsyZF6xJkkqPMk7p3oG0VXbo8TWl2aTESVHJ5w7NzaznBd p6NJMgXuPCGQ6BWJd7zFK/LiggHi5600yZIB5VIHdBsvlyYCai6xpz6nb7TRXA== Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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")