From patchwork Thu Sep 22 02:25:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42825 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 C633F27BBEA; Thu, 22 Sep 2022 03:26:13 +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 881DB27BBE9 for ; Thu, 22 Sep 2022 03:26:13 +0100 (BST) Received: from localhost ([::1]:49548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBum-0000BT-KX for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:26:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBud-0000BD-73 for guix-patches@gnu.org; Wed, 21 Sep 2022 22:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBuc-0005zQ-NU for guix-patches@gnu.org; Wed, 21 Sep 2022 22:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBuc-0006u6-IB for guix-patches@gnu.org; Wed, 21 Sep 2022 22:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 1/8] gnu: Add abseil-cpp-cxxstd17. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:26: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.166381356126524 (code B ref 57675); Thu, 22 Sep 2022 02:26:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:26:01 +0000 Received: from localhost ([127.0.0.1]:35596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBub-0006tk-4W for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:01 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBuZ-0006tX-9Y for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:25:59 -0400 Date: Thu, 22 Sep 2022 10:25:38 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813553; 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=lDLQtk0eR9fOPC3HfBdGyUY+30jEmvbw09MGaM5eZieFLn6tgBoaaE9Kwjssmv6sR12MRi nZj8IG5vmJx/4JYKs1q6PzV6IOw1e2dRqsGwdKiizsXrwzgmI0CgAMIVGCL057VDe1IuIN TPAARDPrVjdeciicrymu7uCN9sxOCh/J3APxH7+DTPQ6I1ZHHG7x4zZh1hxiTLjOVhQlCL gCjj7n0vuZuFILnXgo6J/B1o9k7+nfScittIHT+rzDkoX1jHKK291afHdZRO7k1VSfkXo9 XGVLRNRpFJEmTJvBtT2il5l36KPMGwwC20WMfNb0gPY78ai2N9dMOs6+zUYezw== 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 Thu Sep 22 02:25:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42826 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 0F86C27BBEA; Thu, 22 Sep 2022 03:27: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,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 C820627BBE9 for ; Thu, 22 Sep 2022 03:27:43 +0100 (BST) Received: from localhost ([::1]:46698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwE-0000tP-SN for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:27:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBva-0000b0-5t for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBvZ-0006AI-Uv for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBvZ-0006wM-QH for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 2/8] gnu: extra-cmake-modules: Update to 5.98.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:27: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.166381357326582 (code B ref 57675); Thu, 22 Sep 2022 02:27:01 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:26:13 +0000 Received: from localhost ([127.0.0.1]:35601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBun-0006ug-E3 for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:13 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBum-0006uS-2V for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:12 -0400 Date: Thu, 22 Sep 2022 10:25:51 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813566; 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=QgrDJbgQOAH6sm92Ol3fqk9Hsc3bHvkj39SM5AjW5eo=; b=zSvpsYQ5Jf/w0jptQaeF/vUoRH0Q3OVUcYXGBjEm7so9cocL29zmGsdMWYMBIbNyyih+RN hQK/818+oktvihNwnL0bT7ATL1c8Iy7BqkTNiYQ25lcQegEWaAUeNk/5NPnTKo5/h3Z2tk FSe3OkaNkhZfbtdOO0pSjRDma6fJ8LitIFk3Fi2IljrcRKf/Mc4j1sPTH5Pc9qWxhY9mkE PJeZSoqGfOAOXUk3OAjJtFN+cAL20/l8sz1bNcT1xx3wTjeIiKS4HN8D4JSQ/mo78iiYBQ VhJFxE3fwEqZh2asMYzai9ZUa0IeGnOc4sWZcRm2W+LTAdwK1Is2DQxy9+Kh5A== 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 (extra-cmake-modules): Update to 5.98.0. --- gnu/packages/kde-frameworks.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 738013fdba..52314fd0ff 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -88,7 +88,7 @@ (define-module (gnu packages kde-frameworks) (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.91.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -97,7 +97,7 @@ (define-public extra-cmake-modules name "-" version ".tar.xz")) (sha256 (base32 - "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp")))) + "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too From patchwork Thu Sep 22 02:26: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: 42827 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 8494F27BBEA; Thu, 22 Sep 2022 03:27: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,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 3B87527BBE9 for ; Thu, 22 Sep 2022 03:27:44 +0100 (BST) Received: from localhost ([::1]:46700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwF-0000ui-9u for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBva-0000bY-OV for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBva-0006AQ-Fa for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBva-0006wT-74 for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 3/8] gnu: kcoreaddons: Remove trailing #t. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:27: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.166381359026614 (code B ref 57675); Thu, 22 Sep 2022 02:27:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:26:30 +0000 Received: from localhost ([127.0.0.1]:35604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBv3-0006vA-NZ for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:30 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBv2-0006uw-2v for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:28 -0400 Date: Thu, 22 Sep 2022 10:26:06 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813582; 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=DPqzO4hrjYh+qq9tQuuHIaD0PiiP2kje4P6OaSdnE2c=; b=jOvLaROczaPTIJNOOqmcFsLkOeZZGUPmwUlNJjiU7KNaH7RmjOsCmACxnIKw6LqTUNUY3g qseEtMom31Vn5Wa+HEjpGr0EMzik2yS5tJVVo2KF6fLbvuoz3ZfgiE2oQVugre16Beejwc ptb4dplpvCzJSRxnNSQ0zaaD/inqKrlAN5DJ82TW7N5FDL08B294ucvA6Y7GEwgf1sCEsd QUpTJgZc92G4ApB8MPKQ9HF99qpU1XhPgPhOwxO6EoX9DnQjub6PVFd1WKUVEedzhVfgBK UV7qf3w0qSxXNZlrOGlz5yfD8pCcDfkegROjYdy5FTOwpWHjfWM3pk3WTCOW3g== 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)[arugments]<#:phases>: Remove trailing #t. --- gnu/packages/kde-frameworks.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52314fd0ff..e4337636ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -603,20 +603,17 @@ (define-public kcoreaddons ;; being interleaved. (display "[test_channels]\n*\n") ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))) - #t)) + (display "[benchNotifyWatcher]\n*\n"))))) ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e (add-after 'unpack 'fix-broken-test (lambda _ (substitute* "autotests/kdirwatch_unittest.cpp" (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))) - #t)) + (string-append m "\nwaitUntilNewSecond();"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "TMPDIR" (getcwd)) - #t))))) + (setenv "TMPDIR" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Qt addon library with a collection of non-GUI utilities") (description "KCoreAddons provides classes built on top of QtCore to From patchwork Thu Sep 22 02:26:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42828 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 49DE327BBEA; Thu, 22 Sep 2022 03:27:45 +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 8A65727BBE9 for ; Thu, 22 Sep 2022 03:27:44 +0100 (BST) Received: from localhost ([::1]:46702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwF-0000vm-Mc for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBvb-0000cc-0L for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBva-0006AZ-Np for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBva-0006wb-IX for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 4/8] gnu: kcoreaddons: Update to 5.98.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:27: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.166381360426642 (code B ref 57675); Thu, 22 Sep 2022 02:27:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:26:44 +0000 Received: from localhost ([127.0.0.1]:35607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBvI-0006ve-2F for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:44 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBvG-0006vP-3j for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:42 -0400 Date: Thu, 22 Sep 2022 10:26:20 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813596; 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=RxFXt6EB5ujZGI6OXncH2i0YNK3jWZwDztcE1IR6Fu4=; b=yDmmT4BipPDHtZ8okpfmPGDtAbt0hD/LkyF5PE5fDMc9e6BgmTcGlAsDCNtAYgj1YR4FSl VVvK146NgJhCBePDuMiyDYIjKi/B1Ni+6yRok3ozJweNhgKq6DvoVF0H0POUVzYUWMs1vU VFMMwUrh2QY0oRIcbf0vKbMAlG81Lz0E3TlKMwnTsseWwdbRRqwH+jdQsAFGOAeAeCVRGG gKS2aLuqeumJmyNHMUCuML1ozZOTVpumoVlLdZ2Ba60UYfn3LD1CY/ioZDhk68qjAFzhBA LgJLQz9uNJY1AiCwxNkMmeTnjPFzP3tH+bnJSejVvl6JoTFpJ1hyTdDsGF/LTg== 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 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e4337636ac..61cbf19bc4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -574,7 +574,7 @@ (define-public kconfig (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.70.0") + (version "5.98.0") (source (origin (method url-fetch) (uri (string-append @@ -583,7 +583,7 @@ (define-public kcoreaddons name "-" version ".tar.xz")) (sha256 (base32 - "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) + "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools-5 shared-mime-info @@ -602,14 +602,8 @@ (define-public kcoreaddons ;; FIXME: Make it pass. Test failure caused by stout/stderr ;; being interleaved. (display "[test_channels]\n*\n") - ;; This fails with ENOSPC because of too many inotify watches. - (display "[benchNotifyWatcher]\n*\n"))))) - ;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e - (add-after 'unpack 'fix-broken-test - (lambda _ - (substitute* "autotests/kdirwatch_unittest.cpp" - (("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m) - (string-append m "\nwaitUntilNewSecond();"))))) + ;; FIXME + (display "[test_inheritance]\n*\n"))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) From patchwork Thu Sep 22 02:26:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42829 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 9450827BBEA; Thu, 22 Sep 2022 03:27:58 +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 C6EAC27BBE9 for ; Thu, 22 Sep 2022 03:27:57 +0100 (BST) Received: from localhost ([::1]:33128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwS-0001N7-W9 for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:27:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBvb-0000dv-Cd for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBvb-0006Ar-2d for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBva-0006wi-U4 for guix-patches@gnu.org; Wed, 21 Sep 2022 22:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 5/8] gnu: webrtc-for-telegram-desktop: Update to 621f3da5. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:27: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.166381361826669 (code B ref 57675); Thu, 22 Sep 2022 02:27:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:26:58 +0000 Received: from localhost ([127.0.0.1]:35610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBvV-0006w4-D6 for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:57 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBvU-0006vr-3o for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:26:56 -0400 Date: Thu, 22 Sep 2022 10:26:34 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813610; 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=OSZQtqYAIdIkDHTxBbKCC502oWEfK5mY7gUVvN0l1JE=; b=Fkup1BxDK6S8HMYpA124dsGuODNvwtXZfuBh4//+1ZjxhyIUiNoBG8ppV8yeSjsEqSVbea 8Y6zQHF+uwd0DsC/PKTeHuyq0GjOIrQdVNEf5XADqdZh7b1rLpBrl3In2H7C9rA2sB94Ez SaKWGeYFzc8kM5mei1zrwszZm2NYE5zW+ux7nqQdtWG71b/32r4Mgd/aRyEUEFJFS43jSq xsnm0JYWIiPxmY0hrVkWHVWN27FdWlQG60RvhRi0BDNNRcZ0YqbvGBnNVO7Orr41YU4NQA BgfhDvifOKAoVpvHDUCUFBO4OioXo20u/H2iN+evqbdwSP/3j489eJ1b6r6ykQ== 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 (crc32c-for-telegram-desktop): New variable. (webrtc-for-telegram-desktop): Update to 621f3da5. [patches]: Add webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch. [snippet]: Unbundle libvpx and openh264. [native-inputs]: Remove perl. [inputs]: Replace pipewire with pipewire-0.3. Add abseil-cpp-cxxstd17, libdrm, libglvnd, libvpx, libxfixes, mesa, openh264. Remove alsa-lib, libx11 and pulseaudio. [arguments<#:phases>,license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...r-telegram-desktop-fix-gcc12-cstdint.patch | 21 ++++++ gnu/packages/telegram.scm | 74 ++++++++++++------- 3 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..10ee65fdd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1969,6 +1969,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch new file mode 100644 index 0000000000..f1fd29d0d3 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch @@ -0,0 +1,21 @@ +From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001 +From: Xiretza +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..a9e1cc1ff7 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -30,6 +30,8 @@ (define-module (gnu packages telegram) #:use-module (gnu packages digest) #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -58,6 +60,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -104,6 +107,21 @@ (define libyuv-for-telegram-desktop (base32 "01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll"))))) +(define crc32c-for-telegram-desktop + (let ((commit "21fc8ef30415a635e7351ffa0e5d5367943d4a94") + (revision "78")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/crc32c") + (commit commit))) + (file-name (git-file-name + "crc32c-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -297,8 +315,8 @@ (define tgcalls-for-telegram-desktop "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) (define-public webrtc-for-telegram-desktop - (let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34") - (revision "166")) + (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") + (revision "327")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -314,58 +332,62 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "0plwdp6xgxi27hif5j7kpq425cidxyxbbga3z2f64dsninwy5p1x")) + (base32 "1ks1572k1jj7pmzwm79p2gdgi31dd4bs761bphnx32zyq4c6skxk")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/101 + "webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Custom forks which are incompatible with the ones in Guix. - "abseil-cpp" "libsrtp" "openh264" "rnnoise" + '("abseil-cpp" "libsrtp" "rnnoise" ;; Not available in Guix. - "pffft" "usrsctp" - ;; Has cmake support files for libvpx input. - "libvpx"))) + "crc32c" "pffft"))) (with-directory-excursion "src/third_party" (for-each delete-file-recursively (lset-difference string=? (scandir ".") - (cons* "." ".." keep))))))))) + (cons* "." ".." keep))))) + ;; Use system openh264. + (substitute* "CMakeLists.txt" + (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments (list #:tests? #f ; No target - #:configure-flags #~(list "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-inputs (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libvpx-to (string-append third-party - "/libvpx/source/libvpx")) + (crc32c-to (string-append third-party "/crc32c/src")) (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$libvpx-for-telegram-desktop libvpx-to) + (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) (copy-recursively #$libyuv-for-telegram-desktop libyuv-to))))))) - (native-inputs (list perl pkg-config python-wrapper yasm)) + (native-inputs (list pkg-config python-wrapper yasm)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 ffmpeg libjpeg-turbo - glib - libxcomposite - libxdamage - libxrender - libxrandr + libvpx + openh264 openssl opus - pipewire + ;; TG_OWT_USE_PROTOBUF protobuf - pulseaudio - libx11 + ;; TG_OWT_USE_PIPEWIRE + glib libdrm libglvnd mesa pipewire-0.3 + ;; TG_OWT_USE_X11 + libxcomposite + libxdamage libxext + libxfixes + libxrandr + libxrender libxtst)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by @@ -377,13 +399,11 @@ (define-public webrtc-for-telegram-desktop license:asl2.0 ;; LibYuv (license:non-copyleft "file:///src/third_party/libyuv/LICENSE") - ;; OpenH264 - license:bsd-2 ;; PFFFT (license:non-copyleft "file:///src/third_party/pffft/LICENSE") ;; RnNoise license:gpl3 - ;; LibSRTP, LibVPx, UsrSCTP and Others + ;; LibSRTP, Crc32c and Others license:bsd-3)))))) (define-public rlottie-for-telegram-desktop From patchwork Thu Sep 22 02:26:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42830 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 F1A8727BBEE; Thu, 22 Sep 2022 03:28:15 +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 550AF27BBEB for ; Thu, 22 Sep 2022 03:28:13 +0100 (BST) Received: from localhost ([::1]:43016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwi-0001Z0-Fu for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:28:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBwY-0001Y9-M9 for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBwY-0006ce-EX for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBwY-0006yg-9T for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 6/8] gnu: Remove libvpx-for-telegram-desktop. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:28: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.166381363226741 (code B ref 57675); Thu, 22 Sep 2022 02:28:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:27:12 +0000 Received: from localhost ([127.0.0.1]:35617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBvk-0006xE-1T for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:27:12 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:57830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBvh-0006x1-O3 for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:27:10 -0400 Date: Thu, 22 Sep 2022 10:26:48 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813623; 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=g/VY1cL0EBKnW9YfhFTYp91c4ayhHla86xu1AY53PlA=; b=HmJqvgSVCZ7OvlGlOcdFpHGXq8AQsDQG5WMRXM/T1NZtKnJJh0iL/UdXa0k2bNlQ185b0o XfEDbp1Ecgjzsz9VlWkt9jE1o/yPMR5yhd93NnsXwuAcmzMZXcQol8YfdYz+l/CDXOIQ93 8hgcTyhlrJLz8BXWe/Jbra8+rdhmMOup8VWHL1OVX2lF68/igZFDOrb3G6k5PdiVXHV9w3 mNGyTG5I99bElg/y49B/QIzrPYwIIaPQgLkOZPbhX4MxfZs2IoBYzeOhdcoa1g64H/Bh/e 0/YRETMc9ugfU1gHHwc9mrBTnvaMwhJSPT7GoYSUa2UWlT6GPalwiHWQ+XDnQw== 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 a9e1cc1ff7..79086d845c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -77,21 +77,6 @@ (define-module (gnu packages telegram) (define %telegram-version "2.9.3") -(define libvpx-for-telegram-desktop - (let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9") - (revision "112")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://chromium.googlesource.com/webm/libvpx") - (commit commit))) - (file-name (git-file-name - "libvpx-for-telegram-desktop" - (git-version "1.9.0" revision commit))) - (sha256 - (base32 - "1psvxaddihlw1k5n0anxif3qli6zyw2sa2ywn6mkb8six9myrp68"))))) - (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") (revision "2211")) From patchwork Thu Sep 22 02:27:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42831 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 41A7E27BBEB; Thu, 22 Sep 2022 03:28:16 +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 8956F27BBE9 for ; Thu, 22 Sep 2022 03:28:12 +0100 (BST) Received: from localhost ([::1]:43014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwh-0001YQ-Mn for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:28:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBwZ-0001YG-4W for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBwY-0006cj-T9 for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBwY-0006yn-OH for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 7/8] gnu: telegram-desktop: Update to 4.2.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:28: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.166381365626778 (code B ref 57675); Thu, 22 Sep 2022 02:28:02 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:27:36 +0000 Received: from localhost ([127.0.0.1]:35620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBw7-0006xo-Dn for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:27:36 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBw4-0006xa-Dw for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:27:33 -0400 Date: Thu, 22 Sep 2022 10:27:11 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813646; 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=k5UGZSXawsZxpEGg94j2dHiWWwBUORY6psR2hU/Hjn0=; b=RTmf4xqK4fnDTO8atb/LyqVEeW7XSOynjbhVUjDI7Vel+ft6gUly1Rt13Y/ZDnR0bZwzk8 luZSiUnh1m1cq0jSkR+ySRkTnfBla9AzEI5NRpWRpNXIFtLtQuhzMJBrz5PSz4r0Samljg 1CBVlNO/BmlvMbvHcEuD1ibFIPkKIpbakjimrC4c1GXnTDw97CX1J/m87FqbjeytLXA05D RQkVOV7t3E1pRhy+fW1H7OryXCVSQi7ivcg7GGe0THUoqQr3u4A4bI4BompNi8KoebZLpv 6Rhhq6+698Yh2aUgs5QnbtffnbTICSTHNRA4Edi1s4Xrw3Zsj8te12X5+gm4sw== 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 (dispatch-for-telegram-desktop): New variable. (cmake-helpers-for-telegram-desktop,codegen-for-telegram-desktop) (lib-base-for-telegram-desktop,lib-crl-for-telegram-desktop) (lib-lottie-for-telegram-desktop,lib-qr-for-telegram-desktop) (lib-rpl-for-telegram-desktop,lib-spellcheck-for-telegram-desktop) (lib-storage-for-telegram-desktop,lib-tl-for-telegram-desktop) (lib-ui-for-telegram-desktop,lib-webrtc-for-telegram-desktop) (lib-webview-for-telegram-desktop,tgcalls-for-telegram-desktop): Bump to submodule checkout. (rlottie-for-telegram-desktop): Bump to submodule checkout. [snippet]: Switch off werror. [arguments]: Use inherited ones. (telegram-desktop): Update to 4.2.0. [patches]: Add telegram-desktop-allow-disable-libtgvoip.patch. [arguments]<#:configure-flags>: Unbundle rlottie. <#:phases>: Adjusted according to unbundled package. [native-inputs]: Add clang-toolchain. Remove cmake-shared, extra-cmake-modules and qttools-5. [inputs]: Replace qtbase-5 with qtbase. Add abseil-cpp-cxxstd17, kcoreaddons, libvpx, qt5compat, wayland, webkitgtk. Remove catch2, fcitx-qt5, fcitx5-qt, gtk+, hime, kwayland, libdbusmenu-qt, libtgvoip-for-telegram-desktop, libx11, materialdecoration, nimf and qt5ct. [propagated-inputs]: Remove dconf. [license]: Adjusted accordingly. --- gnu/local.mk | 1 + ...gram-desktop-allow-disable-libtgvoip.patch | 125 +++++++++ gnu/packages/telegram.scm | 257 +++++++++--------- 3 files changed, 253 insertions(+), 130 deletions(-) create mode 100644 gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 10ee65fdd5..e8d0178293 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1871,6 +1871,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/tensorflow-c-api-fix.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ + %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ diff --git a/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch new file mode 100644 index 0000000000..3c062cbd9a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch @@ -0,0 +1,125 @@ +From 4d1a8351ee82728912fcf7ad0070049b2910c393 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni +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 79086d845c..2157988b07 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -43,6 +43,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) #:use-module (gnu packages lua) #:use-module (gnu packages perl) @@ -60,6 +61,7 @@ (define-module (gnu packages telegram) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -75,7 +77,7 @@ (define-module (gnu packages telegram) #:use-module (guix build-system python) #:use-module (guix build-system qt)) -(define %telegram-version "2.9.3") +(define %telegram-version "4.2.0") (define libyuv-for-telegram-desktop (let ((commit "ad890067f661dc747a975bc55ba3767fe30d4452") @@ -107,77 +109,92 @@ (define crc32c-for-telegram-desktop (base32 "0cddf8z7v33gfb2k60lkzwa97g20m1v81cnvllm3q9ylpnx8g6f4"))))) +(define dispatch-for-telegram-desktop + (let ((commit "ecc678d79f38cf63d24b6d16e18f69a9117d8d73") + (revision "14")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple/swift-corelibs-libdispatch.git") + (commit commit))) + (file-name + (git-file-name + "dispatch-for-telegram-desktop" (git-version "5.6" revision commit))) + (sha256 + (base32 + "0hy4q6x3bgphazmpl3v62995abc9fpi8y7yg9aiblzsqkxmgjmqn"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72"))) + (commit "b9f1b6036329e44ec61f51f0b363fe2319158b84"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))) + "0sgp1nlmcm2imgpssqxrwinafnmicmq0qikgdnhs1d44hrwxbws3")))) (define codegen-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/codegen.git") - (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119"))) + (commit "8815d7aec9b901191d08445f29e2edd0aeba7b2c"))) (file-name (git-file-name "codegen-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))) + "1ly958mjk25kfcpa174kvg134p9r751ixi275afj5kr57by9mbq2")))) (define lib-base-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6"))) + (commit "cc5550de2766657ced8d0bb4d2db3f050363d3d5"))) (file-name (git-file-name "lib-base-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))) + "16x5qp5w51igk213rhl49x256vjvpkjkgi2ziwzxnsj0pzdd4y27")))) (define lib-crl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_crl.git") - (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f"))) + (commit "4e620bc383d032aadea8e6af02661f8c76695cec"))) (file-name (git-file-name "lib-crl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz")))) + "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))) (define lib-lottie-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_lottie.git") - (commit "0770df009db7928df1d0cad0900dc5110106d229"))) + (commit "6ed1c22ed60692d2f288c9222fafd7d5cd62f904"))) (file-name (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))) + "0l57ibfij9xm4ww4s9cc63q1x8xzpc6ablwaji1krrn3xxksqdd4")))) (define lib-qr-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_qr.git") - (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189"))) + (commit "501f4c3502fd872ab4d777df8911bdac32de7c48"))) (file-name (git-file-name "lib-qr-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))) + "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) (define lib-rlottie-for-telegram-desktop (origin @@ -196,60 +213,60 @@ (define lib-rpl-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_rpl.git") - (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617"))) + (commit "fd31f5bf382d2679eccdb1abaf8240a56c6a7abe"))) (file-name (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))) + "1fpq8nyh8wx6zkb3sjjrx9ydqzyhw4483bdk1i9blp0ijn9xxdxf")))) (define lib-spellcheck-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "68c9b788958904aea7de79f986a0f82ec8c5b094"))) + (commit "0e386e22cb6ba8a114b569840a635e096dcb645e"))) (file-name (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))) + "06js7ccv6z3nbd4v2p4hp2prrlmz5ww46y3yb922pp7gm317dwyw")))) (define lib-storage-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_storage.git") - (commit "403df6c4a29562bd417c92d410e49819f5a48cc1"))) + (commit "839609369d04615475cb1518636de3619106a917"))) (file-name (git-file-name "lib-storage-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))) + "1l26h2fmqp9dcpr6pfvdd5sjb68j7yh0ms2lnr8na7jf5xqmkwwm")))) (define lib-tl-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_tl.git") - (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb"))) + (commit "36fb95c4de1339d2c8921ad6b2911858c3d0e0fa"))) (file-name (git-file-name "lib-tl-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))) + "03rngnssnqwr7ad05qn64mwgji5fb0r3fp5ybkf951p8phr1jvzk")))) (define lib-ui-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1b590f9e16eb9571a039f072d6fea66c607e419f"))) + (commit "f82162f05a72352bfee0fb79f9e50c350b3a98f3"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))) + "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) (define lib-waylandshells-for-telegram-desktop (origin @@ -268,36 +285,36 @@ (define lib-webrtc-for-telegram-desktop (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "ef49f953f12b112008a094a719f40939aaf39db4"))) + (commit "9b11599c3c56047cfa4c68b69f1fcc93b602c33a"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))) + "0158jx8hj4fv6qpw5pgcr2mdlihj0dxs060dg3iy61zz6q68z5dq")))) (define lib-webview-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webview.git") - (commit "e06427c624515485774e2e2181d4afeb05ad5a67"))) + (commit "546df65eb2424550ed84ce14fc9c5d1bb3586f35"))) (file-name (git-file-name "lib-webview-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))) + "0zzjwyw82bggncmmsw969lnjl04pklmqjqm77jjzadinivl52z0l")))) (define tgcalls-for-telegram-desktop (origin (method git-fetch) (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3"))) + (commit "82c4921045c440b727c38e464f3a0539708423ff"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" %telegram-version)) (sha256 (base32 - "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))) + "1109r17abh66yz91b65fn2g4ryfybnsr5g6075sjhbah1gccv9mk")))) (define-public webrtc-for-telegram-desktop (let ((commit "621f3da55331733bf0d1b223786b96b68c03dca1") @@ -341,18 +358,17 @@ (define-public webrtc-for-telegram-desktop (("\\include\\(cmake\\/libopenh264\\.cmake\\)")"")))))) (build-system cmake-build-system) (arguments - (list - #:tests? #f ; No target - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'copy-inputs - (lambda _ - (let* ((third-party (string-append (getcwd) "/src/third_party")) - (crc32c-to (string-append third-party "/crc32c/src")) - (libyuv-to (string-append third-party "/libyuv"))) - (copy-recursively #$crc32c-for-telegram-desktop crc32c-to) - (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + (list #:tests? #f ; No target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda _ + (copy-recursively + #$libyuv-for-telegram-desktop + (string-append (getcwd) "/src/third_party/libyuv")) + (copy-recursively + #$crc32c-for-telegram-desktop + (string-append (getcwd) "/src/third_party/crc32c/src"))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 @@ -392,38 +408,25 @@ (define-public webrtc-for-telegram-desktop license:bsd-3)))))) (define-public rlottie-for-telegram-desktop - (let ((commit "cbd43984ebdf783e94c8303c41385bf82aa36d5b") - (revision "671")) - (hidden-package - (package - (inherit rlottie) - (version - (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/rlottie.git") - (commit commit))) - (file-name - (git-file-name "rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "1lxpbgbhps9rmck036mgmiknqrzpjxpas8n7qxykv6pwzn0c8n0c")))) - (arguments - `(#:configure-flags - (list - "-Dlog=true" - "-Ddumptree=true" - "-Dtest=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cxx-flags - (lambda _ - (substitute* "meson.build" - (("werror=true") - "werror=false")) - #t))))))))) + (hidden-package + (package + (inherit rlottie) + (version %telegram-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/desktop-app/rlottie.git") + (commit "8c69fc20cf2e150db304311f1233a4b55a8892d7"))) + (file-name + (git-file-name "rlottie-for-telegram-desktop" version)) + (sha256 + (base32 "14gwg3sn6xdx9ymnx5r0vfm4pk8dwk92s10a1wdvfbjpyrxll64i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "meson.build" + (("werror=true") "werror=false"))))))))) (define-public libtgvoip-for-telegram-desktop (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") @@ -476,20 +479,23 @@ (define-public telegram-desktop (uri (git-reference (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzf1y3xhqvizg29bd1kya48cjbkq073d2x10ynwcmmx396l4nd8")) + (base32 "16xhng5m3aw4j4ax74nydpxjnx5z3ga21vmrznlm4lbk9ivyn7vx")) + (patches + (search-patches + ;; https://github.com/telegramdesktop/tdesktop/pull/24126 + "telegram-desktop-allow-disable-libtgvoip.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) + '(;; Not available in Guix. + "dispatch" "tgcalls"))) (with-directory-excursion "Telegram/ThirdParty" (for-each delete-file-recursively (lset-difference string=? @@ -497,34 +503,33 @@ (define-public telegram-desktop (cons* "." ".." keep))))))))) (build-system qt-build-system) (arguments - (list #:tests? #f ; No target + (list #:tests? #f ;No target #:imported-modules `(,@%qt-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build qt-build-system) - ((guix build glib-or-gtk-build-system) - #:prefix glib-or-gtk:) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:configure-flags - #~(list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also . - ;; Here, we snarf the keys from the official Snaps, which are - ;; also stored in <#$source/snap/snapcraft.yaml>. - "-DTDESKTOP_API_ID=611335" - "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - ;; Disable WebkitGTK support as it fails to link - "-DDESKTOP_APP_DISABLE_WEBKITGTK=ON" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF") + #~`(;; Client applications need an API ID and hash, see also: + ;; . Here, we + ;; use the ones given by the official Snap package, see: + ;; . + "-DTDESKTOP_API_ID=611335" + "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + "-DTDESKTOP_DISABLE_LEGACY_TGVOIP=ON" + "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" + "-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" + ,(string-append "-DTDESKTOP_LAUTCHER_BASENAME=" #$name)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'make-writable (lambda _ (for-each make-file-writable (find-files ".")))) - (add-after 'make-writable 'copy-inputs + (add-after 'make-writable 'copy-sources (lambda _ (for-each (match-lambda @@ -537,81 +542,73 @@ (define-public telegram-desktop ("Telegram/lib_crl" #$lib-crl-for-telegram-desktop) ("Telegram/lib_lottie" #$lib-lottie-for-telegram-desktop) ("Telegram/lib_qr" #$lib-qr-for-telegram-desktop) - ("Telegram/lib_rlottie" #$lib-rlottie-for-telegram-desktop) ("Telegram/lib_rpl" #$lib-rpl-for-telegram-desktop) ("Telegram/lib_spellcheck" #$lib-spellcheck-for-telegram-desktop) ("Telegram/lib_storage" #$lib-storage-for-telegram-desktop) ("Telegram/lib_tl" #$lib-tl-for-telegram-desktop) ("Telegram/lib_ui" #$lib-ui-for-telegram-desktop) - ("Telegram/lib_waylandshells" #$lib-waylandshells-for-telegram-desktop) ("Telegram/lib_webrtc" #$lib-webrtc-for-telegram-desktop) ("Telegram/lib_webview" #$lib-webview-for-telegram-desktop) + ("Telegram/ThirdParty/dispatch" #$dispatch-for-telegram-desktop) ("Telegram/ThirdParty/tgcalls" #$tgcalls-for-telegram-desktop))))) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" (("class-memaccess") "all")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cmake-shared - extra-cmake-modules - `(,glib "bin") + (list `(,glib "bin") `(,gtk+ "bin") + clang-toolchain pkg-config - python-wrapper - qttools-5)) + python-wrapper)) (inputs - (list alsa-lib + (list abseil-cpp-cxxstd17 + alsa-lib c++-gsl - catch2 - libexpected - fcitx-qt5 - fcitx5-qt ffmpeg - glib - glibmm-2.64 - gtk+ - hime - hunspell jemalloc - kwayland - libdbusmenu-qt + kcoreaddons + libexpected libjpeg-turbo - libtgvoip-for-telegram-desktop - lz4 - materialdecoration + libvpx minizip - nimf openal openssl opus pulseaudio qrcodegen-cpp - qtbase-5 - qtsvg-5 - qt5ct + qt5compat + qtbase qtimageformats - qtwayland + qtsvg-5 range-v3 rlottie-for-telegram-desktop rnnoise webrtc-for-telegram-desktop - libx11 - libxcb - xcb-util-keysyms xxhash - zlib)) - (propagated-inputs (list dconf)) + zlib + ;; DESKTOP_APP_DISABLE_DBUS_INTEGRATION + glibmm-2.64 + ;; DESKTOP_APP_DISABLE_SPELLCHECK + hunspell + ;; DESKTOP_APP_LOTTIE_USE_CACHE + lz4 + ;; DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + qtwayland wayland + ;; DESKTOP_APP_DISABLE_X11_INTEGRATION + libxcb xcb-util-keysyms + ;; Optional + webkitgtk)) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list - ;; ThirdParty - license:lgpl2.1+ + ;; Telegram/ThirdParty/dispatch + license:asl2.0 + ;; Telegram/ThirdParty/tgcalls + license:lgpl3 ;; Others license:gpl3+)))) From patchwork Thu Sep 22 02:27: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: 42832 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 8A75827BBE9; Thu, 22 Sep 2022 03:28:16 +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 7537527BBEA for ; Thu, 22 Sep 2022 03:28:14 +0100 (BST) Received: from localhost ([::1]:43020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obBwj-0001cF-KS for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 22:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obBwZ-0001YP-Hl for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obBwZ-0006cu-AX for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obBwZ-0006yu-5c for guix-patches@gnu.org; Wed, 21 Sep 2022 22:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57675] [PATCH v9 8/8] gnu: telegram: Remove unneeded variables. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 02:28: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.166381366726804 (code B ref 57675); Thu, 22 Sep 2022 02:28:03 +0000 Received: (at 57675) by debbugs.gnu.org; 22 Sep 2022 02:27:47 +0000 Received: from localhost ([127.0.0.1]:35623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBwI-0006yF-Rt for submit@debbugs.gnu.org; Wed, 21 Sep 2022 22:27:47 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:40386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obBwH-0006y1-6P for 57675@debbugs.gnu.org; Wed, 21 Sep 2022 22:27:45 -0400 Date: Thu, 22 Sep 2022 10:27:24 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663813659; 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=J1OyBHk2sM9u76bWBr9xK52hNSEcYCBad7tFbMDeUqo=; b=xNv4GTEN5ETut/xccRjsFcziXytaKk+ySJ5K7/HOapyjv2PP0+4s+khl/fLsIseehx8Io7 eqZxGsfzX8rs5Q5S4Aq9QCrKVgnl2iVdSxWpkvKtalzOvJz4RtNirGy/prVuiXCBYs/w+F nWneqC2fzC0faOtkH8i7R03G6y/UWiSiWeQ3QWX/Esh/U5NGavQ8o5oIj/PCMtc3vXG3za XFhMfV5UPhx+ZNfXw1emKZnHHnT5hu0/f2WzkV+TOaBt+yBo5KdO+lhNbIN0ZKR13uuS+I 16eZJWyie/JPqU+2m8M5GQTDBCckwFZshMFuWqiOlqRAbknM0ru3T5do//gvBw== 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 2157988b07..e7d716461a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -196,18 +196,6 @@ (define lib-qr-for-telegram-desktop (base32 "0hmwqj7a9vcy8wq7pd1qprl68im3zl5f1wzcn2zzk2wvi0389k9f")))) -(define lib-rlottie-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))) - (define lib-rpl-for-telegram-desktop (origin (method git-fetch) @@ -268,18 +256,6 @@ (define lib-ui-for-telegram-desktop (base32 "1zv29i7hxv70dsq36zrvkvaraff5zcb7sccpncqfl51s59kfsnz5")))) -(define lib-waylandshells-for-telegram-desktop - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/desktop-app/lib_waylandshells.git") - (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7"))) - (file-name - (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version)) - (sha256 - (base32 - "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))) - (define lib-webrtc-for-telegram-desktop (origin (method git-fetch) @@ -428,47 +404,6 @@ (define-public rlottie-for-telegram-desktop (substitute* "meson.build" (("werror=true") "werror=false"))))))))) -(define-public libtgvoip-for-telegram-desktop - (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") - (revision "88")) - (hidden-package - (package - (inherit libtgvoip) - (version - (git-version "2.4.4" revision commit)) - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/libtgvoip.git") - (commit commit))) - (file-name - (git-file-name "libtgvoip-for-telegram-desktop" version)) - (sha256 - (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) - (arguments - `(#:configure-flags - (list - "--disable-static" - "--disable-dsp" ; FIXME - "--enable-audio-callback" - "--with-alsa" - "--with-pulse") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-linkers - (lambda _ - (substitute* "Makefile.am" - (("\\$\\(CRYPTO_LIBS\\) \\$\\(OPUS_LIBS\\)") - "$(CRYPTO_LIBS) $(OPUS_LIBS) $(ALSA_LIBS) $(PULSE_LIBS)")) - (substitute* "tgvoip.pc.in" - (("libcrypto opus") - "libcrypto opus alsa libpulse")) - #t))))) - (native-inputs - (list autoconf automake libtool pkg-config)))))) - (define-public telegram-desktop (package (name "telegram-desktop")