X-Loop: help-debbugs@HIDDEN Subject: [bug#44730] [GAJIM]: Fix loading of installed plugins Resent-From: Raghav Gururajan <rg@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Wed, 18 Nov 2020 23:46:02 +0000 Resent-Message-ID: <handler.44730.B.160574311311859 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 44730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44730 <at> debbugs.gnu.org Cc: Julien Lepiller <julien@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1kfX8P-00035A-Un for submit <at> 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 <rg@HIDDEN>) id 1kfUPN-0002hL-2p for submit <at> 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 <rg@HIDDEN>) id 1kfUPM-0004e1-Qf for guix-patches@HIDDEN; 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 <rg@HIDDEN>) id 1kfUPG-0005OG-MJ for guix-patches@HIDDEN; 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@HIDDEN) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 0FE0CFF804; Wed, 18 Nov 2020 20:50:15 +0000 (UTC) From: Raghav Gururajan <rg@HIDDEN> Autocrypt: addr=rg@HIDDEN; 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@HIDDEN> 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 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LDhLCZvWiCqSinmT2yTJpF5eRgxnEFOZT" Received-SPF: permerror client-ip=217.70.183.199; envelope-from=rg@HIDDEN; 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-Spam-Score: -2.3 (--) X-Mailman-Approved-At: Wed, 18 Nov 2020 18:45:08 -0500 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LDhLCZvWiCqSinmT2yTJpF5eRgxnEFOZT Content-Type: multipart/mixed; boundary="wUErv5j9yogHhhwgGywHO1I0GHX9COg2Z"; protected-headers="v1" From: Raghav Gururajan <rg@HIDDEN> To: guix-patches@HIDDEN Cc: Julien Lepiller <julien@HIDDEN> Message-ID: <101c1bb4-2513-b1de-2962-436b4431f836@HIDDEN> Subject: [GAJIM]: Fix loading of installed plugins --wUErv5j9yogHhhwgGywHO1I0GHX9COg2Z Content-Type: multipart/mixed; boundary="------------99FC2AA81A3DB6D5D5EF68CC" Content-Language: en-CA This is a multi-part message in MIME format. --------------99FC2AA81A3DB6D5D5EF68CC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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. --------------99FC2AA81A3DB6D5D5EF68CC Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-gajim-Fix-loading-of-os-installed-plugins.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-gajim-Fix-loading-of-os-installed-plugins.patch" =46rom efa57cb42f620009b13f27774167e452d40a318b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan <raghavgururajan@HIDDEN> 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.patc= h. [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 =3D \ %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/p= atches/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 <raghavgururajan@HIDDEN> +Date: Wed, 18 Nov 2020 15:12:45 -0500 +Subject: [PATCH] [PATCH]: Fix loading of plugins installed via OS's pack= age + 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'])] +=20 +=20 +--=20 +2.29.2 + --=20 2.29.2 --------------99FC2AA81A3DB6D5D5EF68CC-- --wUErv5j9yogHhhwgGywHO1I0GHX9COg2Z-- --LDhLCZvWiCqSinmT2yTJpF5eRgxnEFOZT Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX7WJBgUDAAAAAAAKCRBfWBZkf4vlUYiy AP0eoflrYILbJdoAqQ41qIjh3rSP+XppFFVyZb7xH7t+3QEAuGhMxHOuJN+hbXtMrh7Ybzn39Z4l FSppl5OIpSmO2Qw= =LE1F -----END PGP SIGNATURE----- --LDhLCZvWiCqSinmT2yTJpF5eRgxnEFOZT--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Raghav Gururajan <rg@HIDDEN> Subject: bug#44730: Acknowledgement ([GAJIM]: Fix loading of installed plugins) Message-ID: <handler.44730.B.160574311311859.ack <at> debbugs.gnu.org> References: <101c1bb4-2513-b1de-2962-436b4431f836@HIDDEN> X-Gnu-PR-Message: ack 44730 X-Gnu-PR-Package: guix-patches Reply-To: 44730 <at> debbugs.gnu.org Date: Wed, 18 Nov 2020 23:46:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 44730 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 44730: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44730 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
Received: (at control) by debbugs.gnu.org; 19 Nov 2020 00:45:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 18 19:45:16 2020 Received: from localhost ([127.0.0.1]:37207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1kfY4a-0004bI-Cs for submit <at> debbugs.gnu.org; Wed, 18 Nov 2020 19:45:16 -0500 Received: from knopi.disroot.org ([178.21.23.139]:43454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <raghavgururajan@HIDDEN>) id 1kfY4X-0004b9-9q for control <at> debbugs.gnu.org; Wed, 18 Nov 2020 19:45:15 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0FF4653460 for <control <at> debbugs.gnu.org>; Thu, 19 Nov 2020 01:45:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gx4JLx6eRDVJ for <control <at> debbugs.gnu.org>; Thu, 19 Nov 2020 01:45:10 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1605746710; bh=zOU4gzIdhlqo1ZXq3L4d78q35W46P7smS+xuqIkS+GQ=; h=Date:From:Subject:To; b=H2uKmOPLDGI7h0fVwVmbBvMwYhPDAHckkN7CIhQ6oSnjmF7r++A6BVh/K9o+0vfvP RCQriRTQS8Tu3p6wcNPFGkZaSh7uEARAjOGyMTRhespMMi+BpY9ktZghk7vCLlkfm8 DaPrvffL9933aXwRzXYYc00nI8zrq1X08yqnwHBiIpocAvzZNX4MMmA4ZRXdGyksSL QHHLuSFBVnZIm7L0AmXbTd1XdVVWBPmGlu/C+vNcj5WEuac3CAn6boz7gN643Zvk1D jZfW9LeGIMUKKJkwLgc0zqA7o+vgwbDBrHetGxMfwUFYwZ2zFtvV2/KWSVXC6q186Y +46ggjVPm3QXA== Date: Thu, 19 Nov 2020 00:45:10 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Raghav Gururajan" <raghavgururajan@HIDDEN> Message-ID: <52d136f0a3177cb14a2059b71a6fad5f@HIDDEN> Subject: Merge Duplication To: control <at> debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) merge 44728 44730
X-Loop: help-debbugs@HIDDEN Subject: [bug#44730] [GAJIM]: Fix loading of installed plugins Resent-From: Tobias Geerinckx-Rice <me@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 19 Nov 2020 14:45:01 +0000 Resent-Message-ID: <handler.44730.B44730.160579708810964 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 44730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan <rg@HIDDEN> Cc: julien@HIDDEN, 44730 <at> debbugs.gnu.org X-Debbugs-Original-Cc: Julien Lepiller <julien@HIDDEN>, 44730 <at> debbugs.gnu.org, guix-patches@HIDDEN Received: via spool by 44730-submit <at> debbugs.gnu.org id=B44730.160579708810964 (code B ref 44730); Thu, 19 Nov 2020 14:45:01 +0000 Received: (at 44730) by debbugs.gnu.org; 19 Nov 2020 14:44:48 +0000 Received: from localhost ([127.0.0.1]:38673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1kflAu-0002qe-Sz for submit <at> debbugs.gnu.org; Thu, 19 Nov 2020 09:44:48 -0500 Received: from tobias.gr ([80.241.217.52]:50162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <me@HIDDEN>) id 1kflAp-0002qR-Op for 44730 <at> debbugs.gnu.org; Thu, 19 Nov 2020 09:44:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=moZqXfUBq05YeVJJh7T7IsLQcwJJOI1YpJq4emhAJ7o=; h=date:in-reply-to: references:subject:cc:to:from; b=UTK6Pgx68xhxF9JjVZotIBZV22q08uiWrlVne 9fq74AtXpWKTDUp+2b5IJSaHheywioRIMBTohUWMM8Yqyu3w3v1DAscX18jVmSue1hDqNO sVQCWqumQLvBzBQK8gPB+X1Jmdio+LPfuyEOl54YLJCRhKZI9brjz1jiL+LgAeNMP49whs sFY3FW6FHecht2pE+GSTnrRn9a1r+0mthWG4blXmn/oOBwgygzjaHZlajT6HB2OEypZgO2 K3JqGk2a5exrJmE6bI5Vf3HFEhvSJlKH+zoPmqMEV7LtUMmii7E6ZmNNmnDpPE0oM+CLFu 0GtEWY6+3TVhIodWACWLlm1ZQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 445e6beb (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Thu, 19 Nov 2020 14:44:40 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; From: Tobias Geerinckx-Rice <me@HIDDEN> References: <101c1bb4-2513-b1de-2962-436b4431f836@HIDDEN> In-reply-to: <101c1bb4-2513-b1de-2962-436b4431f836@HIDDEN> Date: Thu, 19 Nov 2020 15:44:31 +0100 Message-ID: <87eekp76eo.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hullo Raghav! Thanks for taking care of Gajim. Raghav Gururajan =E5=86=99=E9=81=93=EF=BC=9A > fix plugins issue in Gajim. Please provide more information: what was wrong with the original=20 code, and why and how will your patch fix it? It's better to put=20 this in the commit message itself (above the change log), not just=20 the cover letter (your mail). No more than a few lines. The more clear your explanation, the faster the fix can be=20 reviewed and merged. I assume that the problem is the empty =E2=80=98Plugins=E2=80=99 list when = I run: $ guix environment guix \ -- ./pre-inst-env guix environment \ --pure --ad-hoc gajim{,-openpgp,-omemo} \ -- gajim However, the fix doesn't look right to me. After applying your patch, Gajim is broken. Menus don't work. =2D-8<---------------cut here---------------start------------->8--- Traceback (most recent call last): File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/application.py",=20 line 222, in _activate self.interface.run(self) File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/gui_interface.py",=20 line 1965, in run app.plugin_manager =3D plugins.PluginManager() File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/common/helpers.py",=20 line 1002, in __call__ cls._instances[cls] =3D super(Singleton, cls).__call__( File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/plugins/pluginmanager.py",=20 line 224, in __init__ self._load_plugins() File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/plugins/pluginmanager.py",=20 line 668, in _load_plugins for plugin_dir in configpaths.get_plugin_dirs(): File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/common/configpaths.py",=20 line 50, in get_plugin_dirs Path(os.getenv['PLUGINS_OS']), =2D-8<---------------cut here---------------end--------------->8--- I wrote my own patch (attached; no, I don't speak much Python). I=20 think it fixes the problem but I can't test it. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-gajim-Honour-GAJIM_PLUGIN_PATH.patch Content-Transfer-Encoding: quoted-printable From=20866593af88993ab5068f165b1284b8b4cb32e04e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@HIDDEN> Date: Thu, 19 Nov 2020 15:20:14 +0100 Subject: [PATCH] gnu: gajim: Honour $GAJIM_PLUGIN_PATH. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit This perhaps fixes <http://issues.guix.gnu.org/44730> maybe. * gnu/packages/messaging.scm (gajim)[arguments]: Replace the =E2=80=98add-plugin-dirs=E2=80=99 substitution phase with a... [source]: ...patch that won't silently break in the future. * gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. =2D-- gnu/local.mk | 1 + gnu/packages/messaging.scm | 13 ++----------- .../patches/gajim-honour-GAJIM_PLUGIN_PATH.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.pat= ch diff --git a/gnu/local.mk b/gnu/local.mk index a1da838aee..e728ed28d1 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -990,6 +990,7 @@ dist_patch_DATA =3D \ %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-honour-GAJIM_PLUGIN_PATH.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..99131dcf05 100644 =2D-- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -743,7 +743,8 @@ of xmpppy.") (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 =2D (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))= )) + (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) + (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments `(#:imported-modules @@ -756,16 +757,6 @@ of xmpppy.") (guix build utils)) #:phases (modify-phases %standard-phases =2D (add-after 'unpack 'add-plugin-dirs =2D (lambda _ =2D (substitute* "gajim/common/configpaths.py" =2D (("_paths\\['PLUGINS_USER'\\]\\]") =2D "_paths['PLUGINS_USER']] + \ =2D([os.getenv('GAJIM_PLUGIN_PATH')] \ =2Dif os.getenv('GAJIM_PLUGIN_PATH') \ =2Dand Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() \ =2Delse [])")) =2D #t)) (replace 'check (lambda _ ;; Tests require a running X server. diff --git a/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch b/gn= u/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch new file mode 100644 index 0000000000..cb3313197c =2D-- /dev/null +++ b/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch @@ -0,0 +1,11 @@ +--- a/gajim/common/configpaths.py 2020-11-19 12:12:02.004414323 +0100 ++++ a/gajim/common/configpaths.py 2020-11-19 15:34:52.211476895 +0100 +@@ -47,7 +47,7 @@ + return [Path(_paths['PLUGINS_BASE']), + Path('/app/plugins')] + return [Path(_paths['PLUGINS_BASE']), +- Path(_paths['PLUGINS_USER'])] ++ Path(_paths['PLUGINS_USER'])] + ([Path(os.getenv('GAJIM_PLUGI= N_PATH'))] if os.getenv('GAJIM_PLUGIN_PATH') and Path(os.getenv('GAJIM_PLUG= IN_PATH')).is_dir() else []) +=20 +=20 + def get_paths(type_: PathType) -> Generator[str, None, None]: =2D-=20 2.29.2 --=-=-= Content-Type: text/plain; format=flowed The plug-ins are found, but won't load with my version of Gajim. --8<---------------cut here---------------start------------->8--- 11/19/20 15:10:01 (W) gajim.plugin_system Plugin omemo not loaded, newer version of gajim required: 1.2.91 <= 1.2.2 <= 1.3.90 11/19/20 15:10:01 (W) gajim.plugin_system Plugin openpgp not loaded, newer version of gajim required: 1.2.91 <= 1.2.2 <= 1.3.90 --8<---------------cut here---------------end--------------->8--- This is on current master. How are these plug-ins expected to be used? > - (variable "GAJIM_PLUGIN_PATH") > + (variable "PLUGINS_OS") This doesn't look related to the fix at hand. Why remove GAJIM_? Why rename _PATH? TBH, both strike me as unnecessary regressions. Kind regards, T G-R --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX7aEzw0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15hB8BAM726V8hc632zdEaX4KZWUya5B+VL0JK/oL9Kr42 9n83AQCLu7+Ezt4wozc7oJqgieulQtXufpeSj/Cwf2IC6Yx8BA== =q9bR -----END PGP SIGNATURE----- --==-=-=--
X-Loop: help-debbugs@HIDDEN Subject: [bug#44730] [GAJIM]: Fix loading of installed plugins Resent-From: Tobias Geerinckx-Rice <me@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 19 Nov 2020 14:46:02 +0000 Resent-Message-ID: <handler.44730.B.160579710311039 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 44730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan <rg@HIDDEN> Cc: julien@HIDDEN, 44730 <at> debbugs.gnu.org X-Debbugs-Original-Cc: Julien Lepiller <julien@HIDDEN>, 44730 <at> debbugs.gnu.org, guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.160579710311039 (code B ref -1); Thu, 19 Nov 2020 14:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2020 14:45:03 +0000 Received: from localhost ([127.0.0.1]:38676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1kflB8-0002r4-To for submit <at> debbugs.gnu.org; Thu, 19 Nov 2020 09:45:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:46348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <me@HIDDEN>) id 1kflB6-0002qw-8I for submit <at> debbugs.gnu.org; Thu, 19 Nov 2020 09:44:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <me@HIDDEN>) id 1kflB5-0005u0-Mo for guix-patches@HIDDEN; Thu, 19 Nov 2020 09:44:52 -0500 Received: from tobias.gr ([2a02:c205:2020:6054::1]:60204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <me@HIDDEN>) id 1kflAv-0004ek-8T for guix-patches@HIDDEN; Thu, 19 Nov 2020 09:44:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=moZqXfUBq05YeVJJh7T7IsLQcwJJOI1YpJq4emhAJ7o=; h=date:in-reply-to: references:subject:cc:to:from; b=UTK6Pgx68xhxF9JjVZotIBZV22q08uiWrlVne 9fq74AtXpWKTDUp+2b5IJSaHheywioRIMBTohUWMM8Yqyu3w3v1DAscX18jVmSue1hDqNO sVQCWqumQLvBzBQK8gPB+X1Jmdio+LPfuyEOl54YLJCRhKZI9brjz1jiL+LgAeNMP49whs sFY3FW6FHecht2pE+GSTnrRn9a1r+0mthWG4blXmn/oOBwgygzjaHZlajT6HB2OEypZgO2 K3JqGk2a5exrJmE6bI5Vf3HFEhvSJlKH+zoPmqMEV7LtUMmii7E6ZmNNmnDpPE0oM+CLFu 0GtEWY6+3TVhIodWACWLlm1ZQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 445e6beb (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Thu, 19 Nov 2020 14:44:40 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; From: Tobias Geerinckx-Rice <me@HIDDEN> References: <101c1bb4-2513-b1de-2962-436b4431f836@HIDDEN> In-reply-to: <101c1bb4-2513-b1de-2962-436b4431f836@HIDDEN> Date: Thu, 19 Nov 2020 15:44:31 +0100 Message-ID: <87eekp76eo.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@HIDDEN; helo=tobias.gr X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.1 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hullo Raghav! Thanks for taking care of Gajim. Raghav Gururajan =E5=86=99=E9=81=93=EF=BC=9A > fix plugins issue in Gajim. Please provide more information: what was wrong with the original=20 code, and why and how will your patch fix it? It's better to put=20 this in the commit message itself (above the change log), not just=20 the cover letter (your mail). No more than a few lines. The more clear your explanation, the faster the fix can be=20 reviewed and merged. I assume that the problem is the empty =E2=80=98Plugins=E2=80=99 list when = I run: $ guix environment guix \ -- ./pre-inst-env guix environment \ --pure --ad-hoc gajim{,-openpgp,-omemo} \ -- gajim However, the fix doesn't look right to me. After applying your patch, Gajim is broken. Menus don't work. =2D-8<---------------cut here---------------start------------->8--- Traceback (most recent call last): File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/application.py",=20 line 222, in _activate self.interface.run(self) File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/gui_interface.py",=20 line 1965, in run app.plugin_manager =3D plugins.PluginManager() File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/common/helpers.py",=20 line 1002, in __call__ cls._instances[cls] =3D super(Singleton, cls).__call__( File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/plugins/pluginmanager.py",=20 line 224, in __init__ self._load_plugins() File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/plugins/pluginmanager.py",=20 line 668, in _load_plugins for plugin_dir in configpaths.get_plugin_dirs(): File=20 "/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/python3.8/si= te-packages/gajim/common/configpaths.py",=20 line 50, in get_plugin_dirs Path(os.getenv['PLUGINS_OS']), =2D-8<---------------cut here---------------end--------------->8--- I wrote my own patch (attached; no, I don't speak much Python). I=20 think it fixes the problem but I can't test it. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-gajim-Honour-GAJIM_PLUGIN_PATH.patch Content-Transfer-Encoding: quoted-printable From=20866593af88993ab5068f165b1284b8b4cb32e04e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice <me@HIDDEN> Date: Thu, 19 Nov 2020 15:20:14 +0100 Subject: [PATCH] gnu: gajim: Honour $GAJIM_PLUGIN_PATH. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit This perhaps fixes <http://issues.guix.gnu.org/44730> maybe. * gnu/packages/messaging.scm (gajim)[arguments]: Replace the =E2=80=98add-plugin-dirs=E2=80=99 substitution phase with a... [source]: ...patch that won't silently break in the future. * gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. =2D-- gnu/local.mk | 1 + gnu/packages/messaging.scm | 13 ++----------- .../patches/gajim-honour-GAJIM_PLUGIN_PATH.patch | 11 +++++++++++ 3 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.pat= ch diff --git a/gnu/local.mk b/gnu/local.mk index a1da838aee..e728ed28d1 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -990,6 +990,7 @@ dist_patch_DATA =3D \ %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-honour-GAJIM_PLUGIN_PATH.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..99131dcf05 100644 =2D-- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -743,7 +743,8 @@ of xmpppy.") (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 =2D (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))= )) + (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx")) + (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments `(#:imported-modules @@ -756,16 +757,6 @@ of xmpppy.") (guix build utils)) #:phases (modify-phases %standard-phases =2D (add-after 'unpack 'add-plugin-dirs =2D (lambda _ =2D (substitute* "gajim/common/configpaths.py" =2D (("_paths\\['PLUGINS_USER'\\]\\]") =2D "_paths['PLUGINS_USER']] + \ =2D([os.getenv('GAJIM_PLUGIN_PATH')] \ =2Dif os.getenv('GAJIM_PLUGIN_PATH') \ =2Dand Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() \ =2Delse [])")) =2D #t)) (replace 'check (lambda _ ;; Tests require a running X server. diff --git a/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch b/gn= u/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch new file mode 100644 index 0000000000..cb3313197c =2D-- /dev/null +++ b/gnu/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch @@ -0,0 +1,11 @@ +--- a/gajim/common/configpaths.py 2020-11-19 12:12:02.004414323 +0100 ++++ a/gajim/common/configpaths.py 2020-11-19 15:34:52.211476895 +0100 +@@ -47,7 +47,7 @@ + return [Path(_paths['PLUGINS_BASE']), + Path('/app/plugins')] + return [Path(_paths['PLUGINS_BASE']), +- Path(_paths['PLUGINS_USER'])] ++ Path(_paths['PLUGINS_USER'])] + ([Path(os.getenv('GAJIM_PLUGI= N_PATH'))] if os.getenv('GAJIM_PLUGIN_PATH') and Path(os.getenv('GAJIM_PLUG= IN_PATH')).is_dir() else []) +=20 +=20 + def get_paths(type_: PathType) -> Generator[str, None, None]: =2D-=20 2.29.2 --=-=-= Content-Type: text/plain; format=flowed The plug-ins are found, but won't load with my version of Gajim. --8<---------------cut here---------------start------------->8--- 11/19/20 15:10:01 (W) gajim.plugin_system Plugin omemo not loaded, newer version of gajim required: 1.2.91 <= 1.2.2 <= 1.3.90 11/19/20 15:10:01 (W) gajim.plugin_system Plugin openpgp not loaded, newer version of gajim required: 1.2.91 <= 1.2.2 <= 1.3.90 --8<---------------cut here---------------end--------------->8--- This is on current master. How are these plug-ins expected to be used? > - (variable "GAJIM_PLUGIN_PATH") > + (variable "PLUGINS_OS") This doesn't look related to the fix at hand. Why remove GAJIM_? Why rename _PATH? TBH, both strike me as unnecessary regressions. Kind regards, T G-R --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX7aEzw0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15hB8BAM726V8hc632zdEaX4KZWUya5B+VL0JK/oL9Kr42 9n83AQCLu7+Ezt4wozc7oJqgieulQtXufpeSj/Cwf2IC6Yx8BA== =q9bR -----END PGP SIGNATURE----- --==-=-=--
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.