From patchwork Wed Nov 18 20:50:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 25182 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 4322B27BBF5; Thu, 19 Nov 2020 02:23:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3A80A27BBF6 for ; Thu, 19 Nov 2020 02:23:12 +0000 (GMT) Received: from localhost ([::1]:57334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfZbL-0003aO-5J for patchwork@mira.cbaines.net; Wed, 18 Nov 2020 21:23:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfX9G-0001Ha-SB for guix-patches@gnu.org; Wed, 18 Nov 2020 18:46:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfX9G-0004gs-IW for guix-patches@gnu.org; Wed, 18 Nov 2020 18:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kfX9G-00036f-FX for guix-patches@gnu.org; Wed, 18 Nov 2020 18:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44730] [GAJIM]: Fix loading of installed plugins Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Nov 2020 23:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44730@debbugs.gnu.org Cc: Julien Lepiller X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160574311311859 (code B ref -1); Wed, 18 Nov 2020 23:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2020 23:45:13 +0000 Received: from localhost ([127.0.0.1]:37093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfX8P-00035A-Un for submit@debbugs.gnu.org; Wed, 18 Nov 2020 18:45:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:35008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfUPN-0002hL-2p for submit@debbugs.gnu.org; Wed, 18 Nov 2020 15:50:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfUPM-0004e1-Qf for guix-patches@gnu.org; Wed, 18 Nov 2020 15:50:28 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:37065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfUPG-0005OG-MJ for guix-patches@gnu.org; Wed, 18 Nov 2020 15:50:27 -0500 X-Originating-IP: 174.89.21.249 Received: from [192.168.2.62] (bras-vprn-ckvlon0125w-lp130-03-174-89-21-249.dsl.bell.ca [174.89.21.249]) (Authenticated sender: rg@raghavgururajan.name) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 0FE0CFF804; Wed, 18 Nov 2020 20:50:15 +0000 (UTC) From: Raghav Gururajan Autocrypt: addr=rg@raghavgururajan.name; keydata= xjMEX2ZCJBYJKwYBBAHaRw8BAQdAdiUK33kml2dYjrWidlr4/v0pmjpUv7hOsBN/oSl5wx7N L1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmdAcmFnaGF2Z3VydXJhamFuLm5hbWU+wpMEExYI ADsCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUC X28v0AIZAQAKCRBfWBZkf4vlUQf2AQD63gsdJzk0w6Gy0AzpJtMa63mbVRAh4xfnxsRNu6Sb GQD/UDytGjwnQ4nKYsGdoCcA7LM64EkknDvI3ZmlqG7Xuw/OOARfZkIkEgorBgEEAZdVAQUB AQdAZgiqc2NhH/myrCCan9x7gKI6QBPZ/1b+Bz/f3n95ozkDAQgHwngEGBYIACAWIQTNLV6q qYzLN9qR1rBfWBZkf4vlUQUCX2ZCJAIbDAAKCRBfWBZkf4vlUV/OAQD+tMNgmddPSchLpaDP psdDhpvra2uTonNUmnfbTvPgpQD/dG72NCT8hBUVqtzxwQmBrXY/nPEUxctYuvu3unUmzQU= Message-ID: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> Date: Wed, 18 Nov 2020 15:50:14 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.4.0 MIME-Version: 1.0 Received-SPF: permerror client-ip=217.70.183.199; envelope-from=rg@raghavgururajan.name; helo=relay9-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 15:00:06 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 18 Nov 2020 18:45:08 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 18 Nov 2020 21:22:56 -0500 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" X-getmail-retrieved-from-mailbox: Patches Hello Guix! Please find the attached patch to fix plugins issue in Gajim. @Julien Will you be able to push this patch? This patch is a follow-up of #43575. Thank you! Regards, RG. From efa57cb42f620009b13f27774167e452d40a318b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 18 Nov 2020 15:33:24 -0500 Subject: [PATCH] gnu: gajim: Fix loading of os-installed plugins. * gnu/packages/messaging.scm (gajim) [patches]: Add gajim-plugins-os.patch. [arguments]<#:phases>['add-plugins-dir]: Remove phase. [native-search-paths]: Modify. * gnu/packages/patches/gajim-plugins-os.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/messaging.scm | 14 +++--------- gnu/packages/patches/gajim-plugins-os.patch | 25 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/gajim-plugins-os.patch diff --git a/gnu/local.mk b/gnu/local.mk index 217c05eab6..53bda11011 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -991,6 +991,7 @@ dist_patch_DATA = \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/gajim-plugins-os.patch \ %D%/packages/patches/ganeti-deterministic-manual.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \ %D%/packages/patches/ganeti-drbd-compat.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 624ad72c23..714cfa27d6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -742,6 +742,8 @@ of xmpppy.") (string-append "https://gajim.org/downloads/" (version-major+minor version) "/gajim-" version ".tar.gz")) + (patches + (search-patches "gajim-plugins-os.patch")) (sha256 (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")))) (build-system python-build-system) @@ -756,16 +758,6 @@ of xmpppy.") (guix build utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'add-plugin-dirs - (lambda _ - (substitute* "gajim/common/configpaths.py" - (("_paths\\['PLUGINS_USER'\\]\\]") - "_paths['PLUGINS_USER']] + \ -([os.getenv('GAJIM_PLUGIN_PATH')] \ -if os.getenv('GAJIM_PLUGIN_PATH') \ -and Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() \ -else [])")) - #t)) (replace 'check (lambda _ ;; Tests require a running X server. @@ -795,7 +787,7 @@ else [])")) (native-search-paths (list (search-path-specification - (variable "GAJIM_PLUGIN_PATH") + (variable "PLUGINS_OS") (separator #f) ;single entry (files (list diff --git a/gnu/packages/patches/gajim-plugins-os.patch b/gnu/packages/patches/gajim-plugins-os.patch new file mode 100644 index 0000000000..39c22803f7 --- /dev/null +++ b/gnu/packages/patches/gajim-plugins-os.patch @@ -0,0 +1,25 @@ +From c1974d64e5b8f03dc5fc9564f4dd8cff5f2cbc9b Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Wed, 18 Nov 2020 15:12:45 -0500 +Subject: [PATCH] [PATCH]: Fix loading of plugins installed via OS's package + manager. + +--- + gajim/common/configpaths.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py +index 0ac879314..57b99f955 100644 +--- a/gajim/common/configpaths.py ++++ b/gajim/common/configpaths.py +@@ -47,6 +47,7 @@ def get_plugin_dirs() -> List[Path]: + return [Path(_paths['PLUGINS_BASE']), + Path('/app/plugins')] + return [Path(_paths['PLUGINS_BASE']), ++ Path(os.getenv['PLUGINS_OS']), + Path(_paths['PLUGINS_USER'])] + + +-- +2.29.2 + -- 2.29.2