From patchwork Sat Jul 15 14:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojtek Kosior X-Patchwork-Id: 51726 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 80E1727BBEA; Sat, 15 Jul 2023 15:30:40 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7FBAB27BBE2 for ; Sat, 15 Jul 2023 15:30:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKgHe-0002Ai-PI; Sat, 15 Jul 2023 10:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKgHb-0001ke-5w for guix-patches@gnu.org; Sat, 15 Jul 2023 10:30:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qKgHa-0007S7-PD for guix-patches@gnu.org; Sat, 15 Jul 2023 10:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKgHa-0007YJ-I7 for guix-patches@gnu.org; Sat, 15 Jul 2023 10:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64651] [PATCH] gnu: pantalaimon: Fix media downloads. Resent-From: Wojtek Kosior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jul 2023 14:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64651 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64651@debbugs.gnu.org Cc: Wojtek Kosior X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168943136528954 (code B ref -1); Sat, 15 Jul 2023 14:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jul 2023 14:29:25 +0000 Received: from localhost ([127.0.0.1]:45715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKgGy-0007Ww-OD for submit@debbugs.gnu.org; Sat, 15 Jul 2023 10:29:24 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKgGw-0007Wf-0m for submit@debbugs.gnu.org; Sat, 15 Jul 2023 10:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKgGp-0008Rq-Lr for guix-patches@gnu.org; Sat, 15 Jul 2023 10:29:15 -0400 Received: from koszko.org ([93.95.227.159]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKgGn-0007Mh-Nu for guix-patches@gnu.org; Sat, 15 Jul 2023 10:29:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=koszko.org; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc: To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Z7qTs99wy7oG/Lg7IBpQX0uwYcYVbLriSkSb54oe6fQ=; b=sjxzvmZVCL7D5G10rxCMfmkTAr Mmk3dcYRbrlv4COfRwILipnpp/ZTxzuMR0P1ZoHSO6n65ZOEbMmyTI72CwdUrj71V13KKOlMQ9LLN 7m8e4DNwCauQ+IegqUtMpO5L8c85CXIZ7KqilNSzTqsOkERNWhtNJKukIWF+cxj2g5MbsrY5QJS5D 72pCyPEcjuEdO+Wcgol0RV6wpyHu/6+xrtS2KurOP2zFvNwj1DF6UV8k/ugblJX/+pj9Vv1F/ifBA BfciYuOBsIwJIiOB/F85V6ng/yGgGn0xAEtFKIrWcazcDM2zSe5DQGSF91bP5sj/bdSck/NOisNK+ wHSBzgDetdmyGP5vsbXJYkk+PrHRnNRlcwV0qJxd6o4d/i+JG7puGr3MLv5dGlbdTf6k0859AqAgt ZRGAehNBklnF+Sd/Cspb23vyfivI+47B3+rW8GXYG79iLlsa9Xgp4D8bnQQXIjvSzHje4nOlV/PgC kMAl2dZr0dLVmgOuwmwXyjMPoydSwjOgDldqUYHFnIhidMwI5INT19e4tgKRCe2Ur86NgRgy4fsz/ 8kfZCgxnrcO+UEzBsxFkg46ZVY2w7AmuHi+QDwfZCYM5VCbzTogUbEP6abL3ldCiagb4AysKn5WmN TOfRU0SMX/8jwswXETmZRaTHpG2itqyXBLQPMaE5s=; Received: from [77.252.47.107] (helo=localhost.localdomain) by koszko.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qKgGl-0007V1-1X; Sat, 15 Jul 2023 16:29:11 +0200 Date: Sat, 15 Jul 2023 16:22:28 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=93.95.227.159; envelope-from=koszko@koszko.org; helo=koszko.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Wojtek Kosior X-ACL-Warn: , Wojtek Kosior via Guix-patches X-Patchwork-Original-From: Wojtek Kosior via Guix-patches via From: Wojtek Kosior Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/matrix.scm (pantalaimon)[arguments]: Patch incorrect function invokation that made downloads of attachments impossible --- gnu/packages/matrix.scm | 8 ++++++++ 1 file changed, 8 insertions(+) base-commit: 00ed2901f5171e4f9435641a91678217cae38030 diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 6107dfc979..60c5543e5f 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -259,6 +259,14 @@ (define-public pantalaimon ;; Upgrading python-appdirs requires rebuilting 3000+ packages, ;; when 1.4.4 is a simple maintenance fix from 1.4.3. (("appdirs >= 1.4.4") "appdirs >= 1.4.3")))) + (add-after 'downgrade-appdirs-requirement 'bugfixes + (lambda _ + (substitute* "pantalaimon/daemon.py" + ;; FIXME: Remove this once a pantalaimon version with this fix + ;; is officially released. + ;; https://github.com/matrix-org/pantalaimon/pull/152/commits/d71770ca94981afde8c9be6aaaca951f0685b64e + (("client.download\\(server_name, media_id, file_name\\)") + "client.download(server_name=server_name, media_id=media_id, filename=file_name)")))) (add-after 'install 'install-doc (lambda _ (with-directory-excursion "docs/man"