From patchwork Tue Jul 4 16:31:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parnikkapore X-Patchwork-Id: 51542 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 5CC1C27BBE2; Tue, 4 Jul 2023 17:32: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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_MSGID_YAHOO,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E02527BBEA for ; Tue, 4 Jul 2023 17:32:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGiwg-0008Rf-Am; Tue, 04 Jul 2023 12:32:06 -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 1qGiwf-0008Qn-1u for guix-patches@gnu.org; Tue, 04 Jul 2023 12:32:05 -0400 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 1qGiwd-0000dY-QL for guix-patches@gnu.org; Tue, 04 Jul 2023 12:32:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGiwd-0000Dm-Lz for guix-patches@gnu.org; Tue, 04 Jul 2023 12:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64021] [PATCH v2 6/6] gnu: gajim: Clean up formatting. Resent-From: Parnikkapore Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 16:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 64021@debbugs.gnu.org Received: via spool by 64021-submit@debbugs.gnu.org id=B64021.1688488292748 (code B ref 64021); Tue, 04 Jul 2023 16:32:03 +0000 Received: (at 64021) by debbugs.gnu.org; 4 Jul 2023 16:31:32 +0000 Received: from localhost ([127.0.0.1]:36505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGiw8-0000Bs-18 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:31:32 -0400 Received: from sonic312-20.consmr.mail.sg3.yahoo.com ([106.10.244.210]:38596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGiw4-0000AS-LA for 64021@debbugs.gnu.org; Tue, 04 Jul 2023 12:31:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1688488282; bh=qTFt3cPVKrFaT9pYqCdf5CRrjkTm8IFXDTv7xbZmHkE=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=mBUTR5lADljIKPQMsdMJ5MElz5OF721KTskY5ZndEwLR6jmaiTvmkZTdY25aa+ri8rCzFNU2qC8ladXV2eGJzG+V2AvwsYwvxReh9XGHelWhheUVmY2uleVHBWfswmMfSYKVWgSGRNHDJM8Oxu7iXZefTDO524EeeAxkiCQ0KtwVRix95cXpEMcu0bbft2AVbdRIdSTeUEkpBOCqcVnv0Ogqv+3fCAJCvGSPxJMApCTqKdumjAnovzVhpcG/eMAEHAWeSk/gypExz1QKguBODp5mFxDDhMtpQ1k577UUDXkRS8OL5f0UsbYlQYK2QfgiqHYT72nMFqbGTcxByXnsDA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1688488282; bh=ny6SGvT3HJGggEZyJY0SP9lM2ikp3MAMKLWDufhs8FN=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=gXIB9JMC6Sd3fbBpIHIFo/4rPGLEq7DQN+xxjlp8pCbo97dkdjYKWE8nTcoN//OwN1VPPamTCeUhz1K6hfDwP6vKvF3+klqA1VQU4b5eUNY0oc6YmlJm3o4zT4/tvYiQG+pwfU/c/v4v0npX+gobb9AIah9PQbCwHihsYCAZ/fAOFPTetylXuMOt0dHQzi0B52e+IcBtJFeHoLmIgIYI+7Dsif0/CZBfmYAIyR2i+EH9cpTQShVmzjtSZ7X9Qk0DSultffdEI50GnULut/7tELJPtZp4qIXc8a0hQaCyzQp/oniAF7SssiodvwY/6QMb6M+5jDCHAGBEa6iAsf/HYg== X-YMail-OSG: UqUo6_sVM1muL7blivNgEF01j_nh901BYj_RAikcihXlwHaoUxmPEd5kZIXw5HH 9WlQR4IPiUAVXnwVUfKa7HLYHUuT2oE71n28pHricMj2I2VCyqN9H2BRqIrnwrvX9y1G.SQb2oQL IkhiL4aWydcUctAWvvTk0xDCgLIRRiOj8mASDtVLMa8yZyKHZrQjtvKXtfVp3iaYdNASnpAzqyac Uivipjcw.zpKXvBtziupdyYInGMS5F0wKzDCppnyeD9GX7wKheA7.sRH.ehJ5Fp6KrgR5QUVIG5c QHBJjMKlg3DGKQZLADSBtSve5o5BfHj4enlJVkM3jgJyfUtoK8CvHMuWbo2AyJn796kWAr1eoh19 xcefbjQHPBZhy7pGaDgt5dic3J2gKQgVeYW3MYeJxsC6OYS7AzKjPReDAxUOg0iDAuCiXNd2We5x hl1sM__BNwg8Q5029K8my6kKfhhEelET1kDXh00gW.1yPJWKWnuYUE5bL9v9Mn5jxm07GTg43w_n rVv5lupc8f9agOj.C1vuQtIq4jVr615pb1xlJVeBK9ymT_hjHw0.oh2AH_yPRmbdY9usBOIyANZn eGndnd09mJ4TG3rngV5l9Rjac3O9D0repSLUAgkST0JPzgVzahoUa7EJqlAgQj0EFEuQT7iSeESZ ef1hGEC.l1yjY_in3b9FELfxcxhxhyhPNDhZQgp_c9beHUEj5g93YYdf54B_IUXdezJ61aIO4rRE 5EOxof1ZljTt_i..9aAPrx5G4_WE_XcMLm30akAUDXCypXa4yHN1_9bLb0z.tqHp5MEKlz7C36qN SMADZO40t_MlVyhMqbwTtbGJ98H8eyQndvI4p3egJYatZlYbAks8Gpn1VDcNAKZQSrnfeKYuMga. KBk03G5KEBWKLvUuhAL_WHvc4Vq6siaUbdQ4N3O11m0UvJ.IYFFQ_GjzOUThUNFQob87c0b8vMc. 5t5bsLtvGU_9L9wpaP3f3ym_FIzw9dSIKnKV9X3FpyPMKiazfQeuy4Y0i7DZ5rcRvfExVlE.Qfaf C.GUDKdPPJ1bhX5r.2O.U3TPV1kpag8jODHuweHD65c22uBUHFn4W8TdqODfD2wk.d1mHbJQjbaz R4fBoPO83udQKKvUFDdDt82FxCAK8yuspdRLIB9CLRihuXQKId1f6jj8jBnDPjnZWAfg.dCtVQRH e0KaoXmFxOJL7AF6fcHNtVb2nlx.vtF3FdjePMcJuCmNDvj.nMNRMaXlOmC_wauE8bvHhwSc_nwO Zc_Bk7CqJHCqDKApgsv8qoK6j.lnLzN9_nQ6oecK41m3uEsI049wdO3WZgZeKyFe.4pvODMDCuUe RZziH3uEKrlgu2ih9oMfo460uskzZZYnh86seSSCjMy3RiKpFaR9yH7wgvQfKmI3.mGyRQnjdbyI cHMWpJsdqJd5BWRkal5jbe2n7q3otJ16bpYYJiMd_5wCMaslvvU9hjVO0khSYMqt_1Ql.301e5H4 hp46JEiwJr_j..5o4C2XsUIlMoE88Uihn.K3r1J6dCrJ2Blu7GeYySrV1Qhz1qRS5gVVO5bhuHW6 __T2q1BwVxmOY2qX7rvpklFB0NRprrN8TpOD7yqj_q07wUwc_ScXeK9fEhgcL23ML_JR.OL1.Iq4 5jt.C5m.WjztFj37dW0aIvCcSfZyD0n6aneDYnvUuKkkr3vHigWehiOGv28qeF2z8auiSImNyTFR ILSfjZWjn7vD1Qzh22vjXYoSCjlNwCjYk1NSACD0fQfA9dnFEax5Zo._t8OyQ8seTvyoUtjJEXOT Bz4N6HW37zw7xGGHJFY2aVn4QoiDPSCC5ZWvtFnRekFZusyyzhJina60Q4Ljx9INzvPl.VaIJN34 i0o_z5n52nOduNsBjB5x3sIA98GxthEZfcCSxSjjQI11I_dV9vLu9gf80P_hvRZgw8OGTDMN7CXz u9Z0VKcb8cr9DHCE6dqvk3fhUYFLGVZdb_Y.WleqEkFDGOUtQK3i_n7KiUpYB9pbaxAGNIdDBOAi x6O1SpAEvPYhUUN.urCbteN.mU5iqo5fLHwpkclq4.m9xAM3YGFyDUlVYFVPdRr3y1Wcyv9Xzv62 bzzN11Fn.MqMBbXTUs_H9_tUwRf3P4T3kQY_xaBVJQkqG1ynQOUjHcb2KAD75fQHLnr3nlSOiVnh n4iV0pAUB.ZlheClDlCFsZvbgV5JQbGYrpiLrY3r7BfAa.3UjoLYVPEhQT2SqfEyQy0R6CEb0jpc RilrJyKyuXKxz_eyj2OmntqnFGNeXBf2F X-Sonic-MF: X-Sonic-ID: 28a35686-6961-4516-abec-67b396a820fe Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.sg3.yahoo.com with HTTP; Tue, 4 Jul 2023 16:31:22 +0000 Received: by hermes--production-sg3-67fd64777-t6vwt (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID f9117dd229aa0947267aba0e59991f26; Tue, 04 Jul 2023 16:31:18 +0000 (UTC) Date: Tue, 4 Jul 2023 23:31:13 +0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <61a27ed52288bab9945aa256a1193e6956b60616.1688488273.git.poomklao@yahoo.com> References: <61a27ed52288bab9945aa256a1193e6956b60616.1688488273.git.poomklao@yahoo.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Parnikkapore X-ACL-Warn: , Parnikkapore via Guix-patches X-Patchwork-Original-From: Parnikkapore via Guix-patches via From: Parnikkapore 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/messaging.scm (gajim): Clean up formatting. --- gnu/packages/messaging.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index bee9750055..2d377d0bcb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1128,13 +1128,13 @@ (define-public gajim (source (origin (method url-fetch) - (uri - (string-append "https://gajim.org/downloads/" - (version-major+minor version) - "/gajim-" version ".tar.gz")) + (uri (string-append "https://gajim.org/downloads/" + (version-major+minor version) + "/gajim-" version ".tar.gz")) (sha256 - (base32 "066kvkjw3qcdanr3nczy0wgcwihk9jc9zhzfr5bwlqvcyxcv7k5p")) - (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) + (base32 "066kvkjw3qcdanr3nczy0wgcwihk9jc9zhzfr5bwlqvcyxcv7k5p")) + (patches + (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments `(#:imported-modules @@ -1142,8 +1142,7 @@ (define-public gajim (guix build glib-or-gtk-build-system)) #:modules ((guix build python-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)) #:phases ,#~(modify-phases %standard-phases @@ -1152,12 +1151,14 @@ (define-public gajim 'generate-gdk-pixbuf-loaders-cache-file)) (add-before 'build 'build-metadata (lambda _ - (invoke "./pep517build/build_metadata.py" "-o" "dist/metadata"))) + (invoke "./pep517build/build_metadata.py" + "-o" "dist/metadata"))) ;; TODO: Change to pyproject-build-system once it supports ;; in-tree build backends. (replace 'build (lambda _ - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (invoke "python" "-m" "build" "--wheel" "--no-isolation" + "."))) (replace 'install (lambda _ (apply invoke "pip" "--no-cache-dir" "--no-input" @@ -1174,11 +1175,14 @@ (define-public gajim (setenv "DISPLAY" ":1") ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "python" "-m" "unittest" "discover" "-s" "test"))) + (invoke "dbus-launch" "python" "-m" "unittest" + "discover" "-s" "test"))) (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (assoc-ref glib-or-gtk:%standard-phases + 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (assoc-ref glib-or-gtk:%standard-phases + 'glib-or-gtk-wrap)) (add-after 'install 'wrap-env (lambda _ (for-each @@ -1196,10 +1200,8 @@ (define-public gajim (list (search-path-specification (variable "GAJIM_PLUGIN_PATH") - (separator #f) ;single entry - (files - (list - "share/gajim/plugins"))) + (separator #f) ; single entry + (files (list "share/gajim/plugins"))) ;; Gajim needs to use the propagated inputs of its plugins. (search-path-specification (variable "GUIX_PYTHONPATH")