From a624c3631077aa3fa5c05849579932c5b67b985c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Mon, 13 May 2019 09:00:55 +0200
Subject: gnu: gajim: Fix error when GAJIM_PLUGIN_PATH is not set.

Fixes <https://bug.gnu.org/35606>

* gnu/packages/messaging.scm (gajim)[arguments]: Handle case when
GAJIM_PLUGIN_PATH is unset in add-plugins-dir phase.
---
 gnu/packages/messaging.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/messaging.scm')

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 94d4b0855c..45e9d40a43 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -594,8 +594,12 @@ was initially a fork of xmpppy, but uses non-blocking sockets.")
          (add-after 'unpack 'add-plugin-dirs
            (lambda _
              (substitute* "gajim/common/configpaths.py"
-               (("_paths\\['PLUGINS_USER'\\]")
-                "_paths['PLUGINS_USER'],os.getenv('GAJIM_PLUGIN_PATH')"))
+               (("_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 _
-- 
cgit v1.2.3


From b019965cc546f056ac93bb4129416e91bd060d48 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 24 May 2019 08:12:30 +0200
Subject: gnu: gajim-omemo: Update to 2.6.29.

* gnu/packages/messaging.scm (gajim-omemo): Update to 2.6.29.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/messaging.scm')

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 45e9d40a43..827b7f800e 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -687,7 +687,7 @@ end-to-end encryption support; XML console.")
 (define-public gajim-omemo
   (package
     (name "gajim-omemo")
-    (version "2.6.28")
+    (version "2.6.29")
     (source (origin
               (method url-fetch/zipbomb)
               (uri (string-append
@@ -695,7 +695,7 @@ end-to-end encryption support; XML console.")
                     version ".zip"))
               (sha256
                (base32
-                "1xy9yyd4416my151kj41nc62xwgmnwpagrmw49bniv09y78cqysg"))))
+                "1mif5qkrvxclqbqmq6njini4laznbs5nn82w2f1hkl8c1284dvgi"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit v1.2.3