From patchwork Tue Feb 14 22:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 46949 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 496011685C; Tue, 14 Feb 2023 22:32:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 0C06C1682F for ; Tue, 14 Feb 2023 22:32:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pS3qL-000338-1f; Tue, 14 Feb 2023 17:32:09 -0500 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 1pS3qE-00032d-Ko for guix-patches@gnu.org; Tue, 14 Feb 2023 17:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pS3qE-00036N-BF for guix-patches@gnu.org; Tue, 14 Feb 2023 17:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pS3qD-0002SZ-Qg for guix-patches@gnu.org; Tue, 14 Feb 2023 17:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61518] [PATCH v2] gnu: psi: Replace with psi-plus. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Feb 2023 22:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61518 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61518@debbugs.gnu.org Received: via spool by 61518-submit@debbugs.gnu.org id=B61518.16764139129438 (code B ref 61518); Tue, 14 Feb 2023 22:32:01 +0000 Received: (at 61518) by debbugs.gnu.org; 14 Feb 2023 22:31:52 +0000 Received: from localhost ([127.0.0.1]:57285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS3q3-0002SA-Rf for submit@debbugs.gnu.org; Tue, 14 Feb 2023 17:31:52 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:51405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pS3q1-0002Rx-IQ for 61518@debbugs.gnu.org; Tue, 14 Feb 2023 17:31:50 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 7C5565C01E1; Tue, 14 Feb 2023 17:31:44 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 14 Feb 2023 17:31:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=mesmtp; t=1676413904; x=1676500304; bh=s/Qi0ypruLkBIYdPBAi/BS BT8sjUN3T2veqiW1bRNqo=; b=dii/dvajGnFBricl9xZMs2q1LLtfJZWzoMJspq wd9+81a6xyuXLT3aiwEGBpQFskwxLC36mv3vrNpwGNOQaV06T6L5ayZ06/t5qcdc QqY7dvfKtsqia11EFFft+lNZlRaBJ25zoxmjyhgPH4mlemiQiDcSt0tfPZ7t9K+9 JZRug= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1676413904; x=1676500304; bh=s/Qi0ypruLkBIYdPBAi/BSBT8sjUN3T2veq iW1bRNqo=; b=jc0wtT+eLVNNV+6cPyOp8J8J0w2bcJlKpZyLiigpUdQWCDR7zRr gfrJNxSnkjduFAZ5vMcdSQGbv9UHRKl/cQDZ/FQ6fVEJ4DqsV/eqoYAeKoN/dpQZ ZG93yWvFpnKgQcKqZdF1Ig/wydX3gtUQXh11W4xIbbT4t0xmk1JHOe/ojTb+MCb9 1l19wen4YgyUCF9ZPfOi9cCqqNVjE2y3dyik+3K/4aC5/x9b/d108Ucf1T6FFP5r Tmivvws/HGh5TM6cDmUe0K4tuHL3csHuRPJDC4TLPHH/F57G8gdx857in2FcsF5A HZgXQU8ee1pVNJ5xNR4FKYVq0wT5P9GwpeA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudeifedgudehgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetkeejkeehtdehvddujeeigfeuueetke fhleevudeujeegfedvveetvdejgefhffenucffohhmrghinhepghhnuhdrohhrghdpphhs ihdqihhmrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <61518@debbugs.gnu.org>; Tue, 14 Feb 2023 17:31:44 -0500 (EST) From: Leo Famulari Date: Tue, 14 Feb 2023 17:31:40 -0500 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This is required for . * gnu/packages/messaging.scm (psi): Deprecate in favor of psi-plus. --- gnu/packages/messaging.scm | 59 ++------------------------------------ 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3027d56907..b6e7bc7cf1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -193,62 +193,6 @@ (define-public omemo-wget XMPP-based sessions.") (license license:lgpl3+))) -(define-public psi - (package - (name "psi") - (version "1.5") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/psi/Psi/" - version "/psi-" version ".tar.xz")) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "3rdparty"))) - (sha256 - (base32 "1dxmm1d1zr0pfs51lba732ipm6hm2357jlfb934lvarzsh7karri")))) - (build-system qt-build-system) - (arguments - `(#:tests? #f ; No target - #:configure-flags - (list - "-DUSE_ENCHANT=ON" - "-DUSE_CCACHE=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cmake - (lambda _ - (substitute* "cmake/modules/FindHunspell.cmake" - (("hunspell-1.6") - "hunspell-1.7")) - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("ruby" ,ruby))) - (inputs - `(("aspell" ,aspell) - ("enchant" ,enchant-1.6) - ("hunspell" ,hunspell) - ("libidn" ,libidn) - ("qca" ,qca) - ("qtbase" ,qtbase-5) - ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsvg-5" ,qtsvg-5) - ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) - ("x11" ,libx11) - ("xext" ,libxext) - ("xcb" ,libxcb) - ("zlib" ,zlib))) - (synopsis "Qt-based XMPP Client") - (description "Psi is a capable XMPP client aimed at experienced users. -Its design goals are simplicity and stability.") - (home-page "https://psi-im.org") - (license license:gpl2+))) - (define-public libgnt (package (name "libgnt") @@ -3142,6 +3086,9 @@ (define-public psi-plus designed for experienced users.") (license license:gpl2+))) +(define-public psi + (deprecated-package "psi" psi-plus)) + (define-public python-zulip (package (name "python-zulip")