From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 18 18:45:13 2020 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) To: guix-patches@gnu.org 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= Subject: [GAJIM]: Fix loading of installed plugins 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 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@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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Wed, 18 Nov 2020 18:45:08 -0500 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 To: guix-patches@gnu.org Cc: Julien Lepiller Message-ID: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> 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 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 +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-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 18 19:45:16 2020 Received: (at control) by debbugs.gnu.org; 19 Nov 2020 00:45:16 +0000 Received: from localhost ([127.0.0.1]:37207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfY4a-0004bI-Cs for submit@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 ) id 1kfY4X-0004b9-9q for control@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 ; 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 ; 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" Message-ID: <52d136f0a3177cb14a2059b71a6fad5f@disroot.org> Subject: Merge Duplication To: control@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 44728 44730 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 19 09:44:48 2020 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 ) id 1kflAu-0002qe-Sz for submit@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 ) id 1kflAp-0002qR-Op for 44730@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 To: Raghav Gururajan Subject: Re: [bug#44730] [GAJIM]: Fix loading of installed plugins References: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> In-reply-to: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> 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-Debbugs-Envelope-To: 44730 Cc: Julien Lepiller , 44730@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 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 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----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 19 19:14:11 2020 Received: (at submit) by debbugs.gnu.org; 20 Nov 2020 00:14:11 +0000 Received: from localhost ([127.0.0.1]:41346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfu3w-0004dQ-4X for submit@debbugs.gnu.org; Thu, 19 Nov 2020 19:14:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:57044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfqtU-00067I-3b for submit@debbugs.gnu.org; Thu, 19 Nov 2020 15:51:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfqtS-0006Of-PF for guix-patches@gnu.org; Thu, 19 Nov 2020 15:51:03 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:35843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfqtN-0006Ev-QX for guix-patches@gnu.org; Thu, 19 Nov 2020 15:51:02 -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 relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 79C591BF205; Thu, 19 Nov 2020 20:50:51 +0000 (UTC) To: Tobias Geerinckx-Rice References: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> <87eekp76eo.fsf@nckx> 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= Subject: Re: [bug#44730] [GAJIM]: Fix loading of installed plugins Message-ID: Date: Thu, 19 Nov 2020 15:50:49 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.4.0 MIME-Version: 1.0 In-Reply-To: <87eekp76eo.fsf@nckx> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3txxYeoFzss4pOKXkdpeNY5kYi7zWvvg7" Received-SPF: permerror client-ip=217.70.183.201; envelope-from=rg@raghavgururajan.name; helo=relay8-d.mail.gandi.net 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, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 19 Nov 2020 19:13:59 -0500 Cc: Julien Lepiller , 44730@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --3txxYeoFzss4pOKXkdpeNY5kYi7zWvvg7 Content-Type: multipart/mixed; boundary="r4zaxWg0rxaQLMSnblHU3XbNIx0WAHhwI"; protected-headers="v1" From: Raghav Gururajan To: Tobias Geerinckx-Rice Cc: 44730@debbugs.gnu.org, Julien Lepiller , guix-patches@gnu.org Message-ID: Subject: Re: [bug#44730] [GAJIM]: Fix loading of installed plugins References: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> <87eekp76eo.fsf@nckx> In-Reply-To: <87eekp76eo.fsf@nckx> --r4zaxWg0rxaQLMSnblHU3XbNIx0WAHhwI Content-Type: multipart/mixed; boundary="------------8AC81E65B183FE72C74969B7" Content-Language: en-CA This is a multi-part message in MIME format. --------------8AC81E65B183FE72C74969B7 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Tobias! > Thanks for taking care of Gajim. Anytime! :-) > Raghav Gururajan =E5=86=99=E9=81=93=EF=BC=9A >> fix plugins issue in Gajim. >=20 > Please provide more information: what was wrong with the original code,= =20 > and why and how will your patch fix it?=C2=A0 It's better to put this i= n the=20 > commit message itself (above the change log), not just the cover letter= =20 > (your mail).=C2=A0 No more than a few lines. >=20 > The more clear your explanation, the faster the fix can be reviewed and= =20 > merged. I keep doing this, my apologies. I have included comment in commit=20 message of revised patch. > I assume that the problem is the empty =E2=80=98Plugins=E2=80=99 list w= hen I run: >=20 > =C2=A0$ guix environment guix \ > =C2=A0=C2=A0 -- ./pre-inst-env guix environment \ > =C2=A0=C2=A0 --pure --ad-hoc gajim{,-openpgp,-omemo} \ > =C2=A0=C2=A0 -- gajim Yes! > However, the fix doesn't look right to me. >=20 > After applying your patch, Gajim is broken.=C2=A0 Menus don't work. >=20 > --8<---------------cut here---------------start------------->8--- > Traceback (most recent call last): > =C2=A0File=20 > =C2=A0"/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/pyt= hon3.8/site-packages/gajim/application.py", =C2=A0line 222, in _activate > =C2=A0=C2=A0 self.interface.run(self) > =C2=A0File=20 > =C2=A0"/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/pyt= hon3.8/site-packages/gajim/gui_interface.py", =C2=A0line 1965, in run > =C2=A0=C2=A0 app.plugin_manager =3D plugins.PluginManager() > =C2=A0File=20 > =C2=A0"/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/pyt= hon3.8/site-packages/gajim/common/helpers.py", =C2=A0line 1002, in __call= __ > =C2=A0=C2=A0 cls._instances[cls] =3D super(Singleton, cls).__call__( > =C2=A0File=20 > =C2=A0"/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/pyt= hon3.8/site-packages/gajim/plugins/pluginmanager.py", =C2=A0line 224, in = __init__ > =C2=A0=C2=A0 self._load_plugins() > =C2=A0File=20 > =C2=A0"/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/pyt= hon3.8/site-packages/gajim/plugins/pluginmanager.py", =C2=A0line 668, in = _load_plugins > =C2=A0=C2=A0 for plugin_dir in configpaths.get_plugin_dirs(): > =C2=A0File=20 > =C2=A0"/gnu/store/zd02xplbafrmzs2swrj3r3zx1hrsvg4y-gajim-1.2.2/lib/pyt= hon3.8/site-packages/gajim/common/configpaths.py", =C2=A0line 50, in get_= plugin_dirs > =C2=A0=C2=A0 Path(os.getenv['PLUGINS_OS']), > --8<---------------cut here---------------end--------------->8--- Sorry, I was misled by a dev. I tries your patch instead now. > I wrote my own patch (attached; no, I don't speak much Python).=C2=A0 I= think=20 > it fixes the problem but I can't test it. Thanks! I just tested it. It works. :-) > The plug-ins are found, but won't load with my version of Gajim. >=20 > --8<---------------cut here---------------start------------->8--- > 11/19/20 15:10:01 (W) gajim.plugin_system=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 Plugin omemo not=20 > loaded, newer version of gajim required: 1.2.91 <=3D 1.2.2 <=3D 1.3.90 > 11/19/20 15:10:01 (W) gajim.plugin_system=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 Plugin openpgp not=20 > loaded, newer version of gajim required: 1.2.91 <=3D 1.2.2 <=3D 1.3.90 > --8<---------------cut here---------------end--------------->8--- >=20 > This is on current master.=C2=A0 How are these plug-ins expected to be = used? I think you installed plugins, both via guix and via gajim's plugin=20 installer. You should remove one of them. >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (variable "GAJIM_PLUGIN_PATH") >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (variable "PLUGINS_OS") >=20 > This doesn't look related to the fix at hand. >=20 > Why remove GAJIM_? > Why rename _PATH? > TBH, both strike me as unnecessary regressions. I was discussing with a Gajim Dev. They agreed to merge our patch in=20 Gajim's upstream. So it can be useful for other non-conventional distros = as well. Regards, RG. --------------8AC81E65B183FE72C74969B7 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 e102e488114673069f879afb3796a8e6fb69aaf4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 19 Nov 2020 15:36:48 -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. [1] The 'add-plugins-dir phase does not work for version 1.2.2, so this patch is a work-around. [2] The variable name is changed from GAJIM_PLUGINS_PATH to PLUGINS_OS, to resonate close with variable names PLUGINS_BASE and PLUGINS_USER, as this patch is planned to be merged in gajim's upstream. --- gnu/local.mk | 1 + gnu/packages/messaging.scm | 16 ++++--------- gnu/packages/patches/gajim-plugins-os.patch | 25 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/gajim-plugins-os.patch diff --git a/gnu/local.mk b/gnu/local.mk index 217c05eab6..7fd98876d7 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..09834bfe63 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -743,7 +743,9 @@ of xmpppy.") (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 - (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))= )) + (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))= + (patches + (search-patches "gajim-plugins-os.patch")))) (build-system python-build-system) (arguments `(#:imported-modules @@ -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..80a0dfacaf --- /dev/null +++ b/gnu/packages/patches/gajim-plugins-os.patch @@ -0,0 +1,25 @@ +From c8e8d29243222e52bb30e123f2c7321a9f418995 Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Thu, 19 Nov 2020 15:20:38 -0500 +Subject: [PATCH 3/3] [PATCH]: Fix loading of OS-installed plugins. + +--- + gajim/common/configpaths.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py +index 0ac879314..f4418b020 100644 +--- a/gajim/common/configpaths.py ++++ b/gajim/common/configpaths.py +@@ -47,7 +47,7 @@ def get_plugin_dirs() -> List[Path]: + return [Path(_paths['PLUGINS_BASE']), + Path('/app/plugins')] + return [Path(_paths['PLUGINS_BASE']), +- Path(_paths['PLUGINS_USER'])] ++ Path(_paths['PLUGINS_USER'])] + ([Path(os.getenv('PLUGINS_O= S'))] if os.getenv('PLUGINS_OS') and Path(os.getenv('PLUGINS_OS')).is_dir= () else []) +=20 +=20 + def get_paths(type_: PathType) -> Generator[Path, None, None]: +--=20 +2.29.2 + --=20 2.29.2 --------------8AC81E65B183FE72C74969B7-- --r4zaxWg0rxaQLMSnblHU3XbNIx0WAHhwI-- --3txxYeoFzss4pOKXkdpeNY5kYi7zWvvg7 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX7baqQUDAAAAAAAKCRBfWBZkf4vlUTtC AP99Ka8CzFdCjRMNUgrVssoCJ25i5sKgD1oXyaT7mC6k1wD/XGtz5NFXp4cWojMDhaDoBuYni4+U E/WqqYevVbxExg4= =eaAE -----END PGP SIGNATURE----- --3txxYeoFzss4pOKXkdpeNY5kYi7zWvvg7-- From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 19 19:14:12 2020 Received: (at submit) by debbugs.gnu.org; 20 Nov 2020 00:14:12 +0000 Received: from localhost ([127.0.0.1]:41348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfu43-0004de-GL for submit@debbugs.gnu.org; Thu, 19 Nov 2020 19:14:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:58616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfrir-00015G-KG for submit@debbugs.gnu.org; Thu, 19 Nov 2020 16:44:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfrir-00083J-Co for guix-patches@gnu.org; Thu, 19 Nov 2020 16:44:09 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfrip-0007uN-6M for guix-patches@gnu.org; Thu, 19 Nov 2020 16:44:09 -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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 7AD4FE0006; Thu, 19 Nov 2020 21:44:02 +0000 (UTC) From: Raghav Gururajan To: Tobias Geerinckx-Rice References: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> <87eekp76eo.fsf@nckx> Subject: Re: [bug#44730] [GAJIM]: Fix loading of installed plugins Message-ID: <413febc7-09cc-fd0b-18ee-eef5bd0b0305@raghavgururajan.name> Date: Thu, 19 Nov 2020 16:44:00 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="x0bGazrfBtgVZeZSSyiJK1p21UHtoxAsL" Received-SPF: permerror client-ip=217.70.183.196; envelope-from=rg@raghavgururajan.name; helo=relay4-d.mail.gandi.net 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, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 19 Nov 2020 19:13:59 -0500 Cc: Julien Lepiller , 44730@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --x0bGazrfBtgVZeZSSyiJK1p21UHtoxAsL Content-Type: multipart/mixed; boundary="HFxG7xo8TL9kSDdFtfjE8WtveY1yIPCzE"; protected-headers="v1" From: Raghav Gururajan To: Tobias Geerinckx-Rice Cc: 44730@debbugs.gnu.org, Julien Lepiller , guix-patches@gnu.org Message-ID: <413febc7-09cc-fd0b-18ee-eef5bd0b0305@raghavgururajan.name> Subject: Re: [bug#44730] [GAJIM]: Fix loading of installed plugins References: <101c1bb4-2513-b1de-2962-436b4431f836@raghavgururajan.name> <87eekp76eo.fsf@nckx> In-Reply-To: --HFxG7xo8TL9kSDdFtfjE8WtveY1yIPCzE Content-Type: multipart/mixed; boundary="------------F962169692A51EF75DFF8BB0" Content-Language: en-CA This is a multi-part message in MIME format. --------------F962169692A51EF75DFF8BB0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello Tobias! As we discussed in IRC, here are the patches to downgrade gajim-plugins. Regards, RG. --------------F962169692A51EF75DFF8BB0 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-gajim-omemo-Downgrade-to-2.6.80.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-gajim-omemo-Downgrade-to-2.6.80.patch" =46rom 9fa851423882d67ade3d3a30aa84e294c8fdedc2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 19 Nov 2020 16:35:08 -0500 Subject: [PATCH 1/2] gnu: gajim-omemo: Downgrade to 2.6.80. * gnu/packages/messaging.scm (gajim-omemo) [version]: Downgrade to 2.6.80= =2E This gajim-plugin is downgraded to a version that is compatible with stable version of gajim (1.2.2). --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 624ad72c23..e970c3f000 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -859,7 +859,7 @@ and OpenPGP) and available in 29 languages.") (define-public gajim-omemo (package (name "gajim-omemo") - (version "2.7.9") + (version "2.6.80") (source (origin (method url-fetch/zipbomb) @@ -868,7 +868,7 @@ and OpenPGP) and available in 29 languages.") "https://ftp.gajim.org/plugins_releases/omemo_" version ".zip")) (sha256 - (base32 "19si2v5yrxpn2m0f684npsg0iiyl2h3r5hbxyrxv4k3acmfmhb3z"))= )) + (base32 "179hgx091c12258335znn1540jhp4z3n3wv5ksrgqq7l3jgc93d7"))= )) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) --=20 2.29.2 --------------F962169692A51EF75DFF8BB0 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-gajim-openpgp-Downgrade-to-1.2.14.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-gajim-openpgp-Downgrade-to-1.2.14.patch" =46rom e97939170362cbcac58537f72d929c14a675d095 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 19 Nov 2020 16:40:17 -0500 Subject: [PATCH 2/2] gnu: gajim-openpgp: Downgrade to 1.2.14. * gnu/packages/messaging.scm (gajim-openpgp) [version]: Downgrade to 1.2.= 14. This gajim-plugin is downgraded to a version that is compatible with the stable version of gajim (1.2.2). --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e970c3f000..9a2034f253 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -897,7 +897,7 @@ multi-client end-to-end encryption.") (define-public gajim-openpgp (package (name "gajim-openpgp") - (version "1.3.5") + (version "1.2.14") (source (origin (method url-fetch/zipbomb) @@ -906,7 +906,7 @@ multi-client end-to-end encryption.") "https://ftp.gajim.org/plugins_releases/openpgp_" version ".zip")) (sha256 - (base32 "1jvpl2gjl5xxvsgxpmvh3mn2mm142dg2hknakkc32swb7l1fqx5m"))= )) + (base32 "0wdjpf1i4pvl4ha4plfpywwi9aw5n2mhrpv8mmbidpawxqfbd94b"))= )) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) --=20 2.29.2 --------------F962169692A51EF75DFF8BB0-- --HFxG7xo8TL9kSDdFtfjE8WtveY1yIPCzE-- --x0bGazrfBtgVZeZSSyiJK1p21UHtoxAsL Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCX7bnIAUDAAAAAAAKCRBfWBZkf4vlUfFz AQCalSKh8AbQE/0EVon+JeSLE93hR6NLg6vLOUo3/dQeDQD6Az/P6u5RtmQASexTr6jGUjyVFJsa bxOE0UMkmHFDsgA= =E0hV -----END PGP SIGNATURE----- --x0bGazrfBtgVZeZSSyiJK1p21UHtoxAsL--