unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#43575] Gajim-Next
@ 2020-09-23  3:52 Raghav Gururajan
  2020-09-23  4:03 ` Raghav Gururajan
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Raghav Gururajan @ 2020-09-23  3:52 UTC (permalink / raw)
  To: 43575; +Cc: dannym

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

Hello Guix!

Please find the attached patch-set.

NOTES:
[1] New module gajim.scm was created, as Gajim project has quite a 
packages of it's own. The idea is similar to linphone.scm.
[2] Once users get used to gajim-next and gajim-omemo-next, we can 
deprecate older package definitions gajim and gajim-omemo.

Regards,
RG.

[-- Attachment #2: 1.patch --]
[-- Type: text/x-patch, Size: 2919 bytes --]

From 2ab2e311a783d9dc9c71e0ca3cee8bc0f7387bdb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 20 Sep 2020 04:11:09 -0400
Subject: [PATCH 1/6] gnu: Add gupnp-igd.

* gnu/packages/gnome.scm (gupnp-igd): New variable.
---
 gnu/packages/gnome.scm | 58 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d727f18ed8..9fb592c95a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -211,6 +211,64 @@
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
+(define-public gupnp-igd
+  (package
+    (name "gupnp-igd")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1q9bw12ibih3yxpha3gm1dabyqg9gx6yxacbh4kxsgm1i84j0lab"))))
+    (build-system meson-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Dgtk_doc=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "doc"
+               (substitute* "gupnp-igd-docs.xml"
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+                                 "/xml/dtd/docbook/"))))
+             #t))
+         (add-after 'install 'move-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share"))
+               (rename-file
+                (string-append out "/share/gtk-doc")
+                (string-append doc "/share/gtk-doc"))
+               #t))))))
+    (native-inputs
+     `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gssdp" ,gssdp)
+       ("gupnp" ,gupnp)
+       ("libsoup" ,libsoup)))
+    (synopsis "UPnP IGD for GNOME")
+    (description "GUPnP-IGD is a library to handle UPnP IGD port mapping.")
+    (home-page "https://gitlab.gnome.org/GNOME/gupnp-igd")
+    (license license:lgpl2.1+)))
+
 (define-public brasero
   (package
     (name "brasero")
-- 
2.28.0


[-- Attachment #3: 2.patch --]
[-- Type: text/x-patch, Size: 6952 bytes --]

From bc685e241e02b397a925d7ab45fea75d47952cd0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 22:59:47 -0400
Subject: [PATCH 4/6] gnu: Add farstream.

* gnu/packages/freedesktop.scm (farstream): New variable.
* gnu/packages/patches/farstream-make.patch: New file.
* gnu/local.mk (dist_PATCH_DATA): Add it.
---
 gnu/local.mk                              |  1 +
 gnu/packages/freedesktop.scm              | 87 +++++++++++++++++++++++
 gnu/packages/patches/farstream-make.patch | 38 ++++++++++
 3 files changed, 126 insertions(+)
 create mode 100644 gnu/packages/patches/farstream-make.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 79e035177e..697c0532e4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -950,6 +950,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch	\
   %D%/packages/patches/extempore-unbundle-external-dependencies.patch	\
   %D%/packages/patches/extundelete-e2fsprogs-1.44.patch		\
+  %D%/packages/patches/farstream-make.patch                          \
   %D%/packages/patches/fastcap-mulGlobal.patch			\
   %D%/packages/patches/fastcap-mulSetup.patch			\
   %D%/packages/patches/fasthenry-spAllocate.patch		\
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 721feb1e69..7f745d11a8 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -71,6 +71,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libffi)
@@ -79,6 +80,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages man)
   #:use-module (gnu packages m4)
+  #:use-module (gnu packages networking)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages perl)
@@ -98,6 +100,91 @@
   #:use-module (gnu packages xorg)
   #:use-module (srfi srfi-1))
 
+(define-public farstream
+  (package
+    (name "farstream")
+    (version "0.2.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://gitlab.freedesktop.org/farstream/farstream.git")
+         (commit version)))
+       (file-name
+        (git-file-name name version))
+       (sha256
+        (base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk"))
+       (patches
+        (search-patches "farstream-make.patch"))))
+    (build-system glib-or-gtk-build-system)
+    (outputs '("out" "doc"))
+    (arguments
+     `(#:tests? #f ; https://gitlab.freedesktop.org/farstream/farstream/-/issues/18
+       #:configure-flags
+       (list
+        "--enable-gtk-doc"
+        "--enable-glib-asserts"
+        (string-append "--with-html-dir="
+                       (assoc-ref %outputs "doc")
+                       "/share/gtk-doc/html"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'copy-common
+           (lambda _
+             (delete-file "autogen.sh")
+             (copy-recursively
+              (assoc-ref %build-inputs "common")
+              "common")
+             #t))
+         (add-after 'unpack 'patch-docbook-xml
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "docs"
+               (substitute* '("libs/farstream-libs-docs.sgml"
+                              "plugins/farstream-plugins-docs.sgml")
+                 (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+                  (string-append (assoc-ref inputs "docbook-xml")
+                                 "/xml/dtd/docbook/"))))
+             #t)))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("common"
+        ,(origin
+           (method git-fetch)
+           (uri
+            (git-reference
+             (url "https://gitlab.freedesktop.org/gstreamer/common.git")
+             (commit "88e512ca7197a45c4114f7fa993108f23245bf50")))
+           (file-name
+            (git-file-name "common" "latest"))
+           (sha256
+            (base32 "1nk94pnskjyngqcfb9p32g4yvf4nzpjszisw24r9azl0pawqpsn6"))))
+       ("docbook-xml" ,docbook-xml-4.1.2)
+       ("docbook-xsl" ,docbook-xsl)
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk-doc" ,gtk-doc)
+       ("libtool" ,libtool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("gupnp-igd" ,gupnp-igd)
+       ("libnice" ,libnice)))
+    (propagated-inputs
+     `(("gstreamer" ,gstreamer)
+       ("gst-plugins-bad" ,gst-plugins-bad)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gst-plugins-good" ,gst-plugins-good)))
+    (synopsis "The Farstream VVoIP framework")
+    (description "Farstream is a collection of GStreamer modules and libraries
+for videoconferencing.")
+    (home-page "https://www.freedesktop.org/wiki/Software/Farstream")
+    (license license:lgpl2.1+)))
+
 (define-public libglib-testing
   (package
     (name "libglib-testing")
diff --git a/gnu/packages/patches/farstream-make.patch b/gnu/packages/patches/farstream-make.patch
new file mode 100644
index 0000000000..20a84f6e59
--- /dev/null
+++ b/gnu/packages/patches/farstream-make.patch
@@ -0,0 +1,38 @@
+From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@freedesktop.org>
+Date: Thu, 12 Mar 2020 14:07:23 +0100
+Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3
+
+GNU Make 4.3 has a backwards incompatible change affecting the use of
+number signs or hashes (ie., #) inside function invocations. See:
+https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html
+
+In this case, it would expand the '\#' in the '\n\#include \"$(h)\"'
+argument to the foreach call to '\#', not '#'. This would lead to
+spurious backslashes in front of the '#include' directives in the
+generated fs-enumtypes.c file.
+
+Spotted by Ernestas Kulik.
+
+https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4
+---
+ common-modified/gst-glib-gen.mak | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
+index 14f1ba37..2247a41c 100644
+--- a/common-modified/gst-glib-gen.mak
++++ b/common-modified/gst-glib-gen.mak
+@@ -6,7 +6,8 @@
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++hash:=\#
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
+-- 
+GitLab
+
-- 
2.28.0


[-- Attachment #4: 3.patch --]
[-- Type: text/x-patch, Size: 3425 bytes --]

From b6651a39d7d14d769142a7a2478d7584748d7b9c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 18:31:39 -0400
Subject: [PATCH 2/6] gnu: Add python-nbxmpp-next.

* gnu/packages/gajim.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/gajim.scm (python-nbxmpp-next): New variable.
---
 gnu/local.mk           |  1 +
 gnu/packages/gajim.scm | 61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 gnu/packages/gajim.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index f249fa3d55..79e035177e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -217,6 +217,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/ftp.scm				\
   %D%/packages/fribidi.scm			\
   %D%/packages/fvwm.scm				\
+  %D%/packages/gajim.scm                       \
   %D%/packages/game-development.scm		\
   %D%/packages/games.scm			\
   %D%/packages/gawk.scm				\
diff --git a/gnu/packages/gajim.scm b/gnu/packages/gajim.scm
new file mode 100644
index 0000000000..dfccbaf19d
--- /dev/null
+++ b/gnu/packages/gajim.scm
@@ -0,0 +1,61 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages gajim)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (guix build-system python)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
+
+(define-public python-nbxmpp-next
+  (package
+    (name "python-nbxmpp-next")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (pypi-uri "nbxmpp" version))
+       (sha256
+        (base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("glib:bin" ,glib "bin")
+       ("python-setuptools" ,python-setuptools)))
+    (inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("libsoup" ,libsoup)
+       ("python-idna" ,python-idna)
+       ("python-precis-i18n" ,python-precis-i18n)
+       ("python-pygobject" ,python-pygobject)))
+    (synopsis "Non-blocking XMPP Module")
+    (description "Python-nbxmpp is a Python library that provides a way for
+Python applications to use the XMPP network.  This library was initially a fork
+of xmpppy.")
+    (home-page "https://dev.gajim.org/gajim/python-nbxmpp")
+    (license license:gpl3+)))
+
+;;; End of gajim.scm
\ No newline at end of file
-- 
2.28.0


[-- Attachment #5: 4.patch --]
[-- Type: text/x-patch, Size: 4451 bytes --]

From 89ef272c871d1141854f592c8ec5a8a50ecd2054 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 18:40:18 -0400
Subject: [PATCH 3/6] gnu: Add gajim-next.

* gnu/packages/gajim.scm (gajim-next): New variable.
---
 gnu/packages/gajim.scm | 89 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gajim.scm b/gnu/packages/gajim.scm
index dfccbaf19d..bb3eb120c8 100644
--- a/gnu/packages/gajim.scm
+++ b/gnu/packages/gajim.scm
@@ -19,10 +19,19 @@
 
 (define-module (gnu packages gajim)
   #:use-module (gnu packages)
+  #:use-module (gnu packages avahi)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
+  #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages xorg)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -58,4 +67,82 @@ of xmpppy.")
     (home-page "https://dev.gajim.org/gajim/python-nbxmpp")
     (license license:gpl3+)))
 
-;;; End of gajim.scm
\ No newline at end of file
+(define-public gajim-next
+  (package
+    (name "gajim-next")
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://gajim.org/downloads/"
+                       (version-major+minor version)
+                       "/gajim-" version ".tar.gz"))
+       (sha256
+        (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:imported-modules
+       (,@%python-build-system-modules
+        (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 utils))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             ;; Tests require a running X server.
+             (system "Xvfb :1 +extension GLX &")
+             (setenv "DISPLAY" ":1")
+             ;; For missing '/etc/machine-id'.
+             (setenv "DBUS_FATAL_WARNINGS" "0")
+             (invoke "dbus-launch" "python" "./setup.py" "test")
+             #t))
+         (add-after 'install '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)))))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("gtk+:bin" ,gtk+ "bin")
+       ("python-distutils-extra" ,python-distutils-extra)
+       ("python-setuptools" ,python-setuptools)
+       ("xorg-server" ,xorg-server-for-tests)))
+    (propagated-inputs
+     `(("avahi" ,avahi)
+       ("dbus" ,dbus)
+       ("farstream" ,farstream)
+       ("geoclue" ,geoclue)
+       ("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gnome-keyring" ,gnome-keyring)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("gsound",gsound)
+       ("gspell" ,gspell)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+)
+       ;; ("gupnp-igd" ,gupnp-igd)
+       ("libsoup" ,libsoup)
+       ;; ("libxss" ,libxss)
+       ("network-manager" ,network-manager)
+       ("python-css-parser" ,python-css-parser)
+       ("python-keyring" ,python-keyring)
+       ("python-nbxmpp" ,python-nbxmpp-next)
+       ("python-packaging" ,python-packaging)
+       ("python-precis-i18n" ,python-precis-i18n)
+       ("python-pycairo" ,python-pycairo)
+       ("python-pygobject" ,python-pygobject)
+       ("python-pyopenssl" ,python-pyopenssl)))
+    (synopsis "A fully-featured XMPP client")
+    (description "Gajim aims to be an easy to use and fully-featured XMPP chat
+client.")
+    (home-page "https://gajim.org/")
+    (license license:gpl3+)))
+
+;;; End of gajim.scm
-- 
2.28.0


[-- Attachment #6: 5.patch --]
[-- Type: text/x-patch, Size: 2273 bytes --]

From 9df12a7f1f33edc7a092bee86d79b8a0c4adc257 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 23:15:00 -0400
Subject: [PATCH 5/6] gnu: Add gajim-omemo-next.

* gnu/packages/gajim.scm (gajim-omemo-next): New variable.
---
 gnu/packages/gajim.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/gajim.scm b/gnu/packages/gajim.scm
index bb3eb120c8..a8df5b5840 100644
--- a/gnu/packages/gajim.scm
+++ b/gnu/packages/gajim.scm
@@ -33,6 +33,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -145,4 +146,40 @@ client.")
     (home-page "https://gajim.org/")
     (license license:gpl3+)))
 
+(define-public gajim-omemo-next
+  (package
+    (name "gajim-omemo-next")
+    (version "2.7.9")
+    (source
+     (origin
+       (method url-fetch/zipbomb)
+       (uri
+        (string-append
+         "https://ftp.gajim.org/plugins_releases/omemo_"
+         version ".zip"))
+       (sha256
+        (base32 "19si2v5yrxpn2m0f684npsg0iiyl2h3r5hbxyrxv4k3acmfmhb3z"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let* ((out (assoc-ref %outputs "out"))
+                (share (in-vicinity out "share/gajim/plugins"))
+                (source (assoc-ref %build-inputs "source")))
+           (mkdir-p share)
+           (copy-recursively source share)
+           #t))))
+    (propagated-inputs
+     `(("python-axolotl" ,python-axolotl)
+        ("python-axolotl-curve25519" ,python-axolotl-curve25519)
+        ("python-cryptography" ,python-cryptography)
+        ("python-qrcode" ,python-qrcode)))
+    (synopsis "Gajim OMEMO Plugin")
+    (description "Gajim-OMEMO is a plugin that adds support for the OMEMO
+Encryption to Gajim.")
+    (home-page "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin")
+    (license license:gpl3+)))
+
 ;;; End of gajim.scm
-- 
2.28.0


[-- Attachment #7: 6.patch --]
[-- Type: text/x-patch, Size: 2189 bytes --]

From 178cecd9938328d075c8a2728d213cda17a19b95 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 23:29:46 -0400
Subject: [PATCH 6/6] gnu: Add gajim-openpgp.

* gnu/packages/gajim.scm (gajim-openpgp): New variable.
---
 gnu/packages/gajim.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/gajim.scm b/gnu/packages/gajim.scm
index a8df5b5840..2aa03d7a0f 100644
--- a/gnu/packages/gajim.scm
+++ b/gnu/packages/gajim.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages python)
@@ -182,4 +183,38 @@ Encryption to Gajim.")
     (home-page "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin")
     (license license:gpl3+)))
 
+(define-public gajim-openpgp
+  (package
+    (name "gajim-openpgp")
+    (version "1.3.5")
+    (source
+     (origin
+       (method url-fetch/zipbomb)
+       (uri
+        (string-append
+         "https://ftp.gajim.org/plugins_releases/openpgp_"
+         version ".zip"))
+       (sha256
+        (base32 "1jvpl2gjl5xxvsgxpmvh3mn2mm142dg2hknakkc32swb7l1fqx5m"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let* ((out (assoc-ref %outputs "out"))
+                (share (in-vicinity out "share/gajim/plugins"))
+                (source (assoc-ref %build-inputs "source")))
+           (mkdir-p share)
+           (copy-recursively source share)
+           #t))))
+    (propagated-inputs
+     `(("python-cryptography" ,python-cryptography)
+        ("python-gnupg" ,python-gnupg)))
+    (synopsis "Gajim OpenPGP Plugin")
+    (description "Gajim-OpenPGP is a plugin that adds support for the OpenPGP
+Encryption to Gajim.")
+    (home-page "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OpenPGPplugin")
+    (license license:gpl3+)))
+
 ;;; End of gajim.scm
-- 
2.28.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#43575] Gajim-Next
  2020-09-23  3:52 [bug#43575] Gajim-Next Raghav Gururajan
@ 2020-09-23  4:03 ` Raghav Gururajan
  2020-10-19 23:15   ` bug#43575: Gajim-Next Julien Lepiller
  2020-10-15  4:52 ` [bug#43575] Gajim-Next Raghav Gururajan
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 7+ messages in thread
From: Raghav Gururajan @ 2020-09-23  4:03 UTC (permalink / raw)
  To: 43575; +Cc: dannym

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

Hello Guix!

> Please find the attached patch-set.
> 
> NOTES:
> [1] New module gajim.scm was created, as Gajim project has quite a 
> packages of it's own. The idea is similar to linphone.scm.
> [2] Once users get used to gajim-next and gajim-omemo-next, we can 
> deprecate older package definitions gajim and gajim-omemo.

OOPS! Missed a patch. Attached it here.

Regards,
RG.

[-- Attachment #2: 0.patch --]
[-- Type: text/x-patch, Size: 1255 bytes --]

From 5380eeb27f5c3815c3a78e75924a68d6c95eb4d3 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 23 Sep 2020 00:01:13 -0400
Subject: [PATCH 7/7] gnu: libnice: Propagate gnutls.

* gnu/packages/networking.scm (libnice) [inputs]: Move gnutls to ...
[propagated-inputs]: ... here.
---
 gnu/packages/networking.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1c2e7cf979..eb4a6c8c98 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -238,13 +238,13 @@ Android, and ChromeOS.")
        ("gtk-doc" ,gtk-doc)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("gnutls" ,gnutls)
-       ("gstreamer" ,gstreamer)
+     `(("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
        ("libnsl" ,libnsl)))
     (propagated-inputs
      `(("glib" ,glib)
-       ("glib-networking" ,glib-networking)))
+       ("glib-networking" ,glib-networking)
+       ("gnutls" ,gnutls)))
     (synopsis "GLib ICE implementation")
     (description "LibNice is a library that implements the Interactive
 Connectivity Establishment (ICE) standard (RFC 5245 & RFC 8445).  It provides a
-- 
2.28.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#43575] Gajim-Next
  2020-09-23  3:52 [bug#43575] Gajim-Next Raghav Gururajan
  2020-09-23  4:03 ` Raghav Gururajan
@ 2020-10-15  4:52 ` Raghav Gururajan
  2020-10-15  4:53 ` Raghav Gururajan
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Raghav Gururajan @ 2020-10-15  4:52 UTC (permalink / raw)
  To: 43575; +Cc: dannym

Hello Guix!

Please find the revised patches.

Regards,
RG.




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#43575] Gajim-Next
  2020-09-23  3:52 [bug#43575] Gajim-Next Raghav Gururajan
  2020-09-23  4:03 ` Raghav Gururajan
  2020-10-15  4:52 ` [bug#43575] Gajim-Next Raghav Gururajan
@ 2020-10-15  4:53 ` Raghav Gururajan
  2020-10-15 21:24 ` Raghav Gururajan
  2020-10-15 21:41 ` Raghav Gururajan
  4 siblings, 0 replies; 7+ messages in thread
From: Raghav Gururajan @ 2020-10-15  4:53 UTC (permalink / raw)
  To: 43575; +Cc: dannym

[-- Attachment #1: Type: text/plain, Size: 75 bytes --]

Hello Guix!

Please find the revised patches attached.

Regards,
RG.

[-- Attachment #2: 0001-gnu-libnice-Propagate-gnutls.patch --]
[-- Type: application/octet-stream, Size: 1255 bytes --]

[-- Attachment #3: 0002-gnu-Add-gupnp-igd.patch --]
[-- Type: application/octet-stream, Size: 2919 bytes --]

[-- Attachment #4: 0003-gnu-Add-farstream.patch --]
[-- Type: application/octet-stream, Size: 6952 bytes --]

[-- Attachment #5: 0004-gnu-Add-python-nbxmpp-next.patch --]
[-- Type: application/octet-stream, Size: 3425 bytes --]

[-- Attachment #6: 0005-gnu-Add-gajim-next.patch --]
[-- Type: application/octet-stream, Size: 5240 bytes --]

[-- Attachment #7: 0006-gnu-Add-gajim-omemo-next.patch --]
[-- Type: application/octet-stream, Size: 2273 bytes --]

[-- Attachment #8: 0007-gnu-Add-gajim-openpgp.patch --]
[-- Type: application/octet-stream, Size: 2189 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#43575] Gajim-Next
  2020-09-23  3:52 [bug#43575] Gajim-Next Raghav Gururajan
                   ` (2 preceding siblings ...)
  2020-10-15  4:53 ` Raghav Gururajan
@ 2020-10-15 21:24 ` Raghav Gururajan
  2020-10-15 21:41 ` Raghav Gururajan
  4 siblings, 0 replies; 7+ messages in thread
From: Raghav Gururajan @ 2020-10-15 21:24 UTC (permalink / raw)
  To: 43575

[-- Attachment #1: Type: text/plain, Size: 75 bytes --]

Hello Guix!

Please find the revised patches attached.

Regards,
RG.

[-- Attachment #2: 0001-gnu-libnice-Propagate-gnutls.patch --]
[-- Type: application/octet-stream, Size: 1257 bytes --]

[-- Attachment #3: 0002-gnu-Add-gupnp-igd.patch --]
[-- Type: application/octet-stream, Size: 2921 bytes --]

[-- Attachment #4: 0003-gnu-Add-farstream.patch --]
[-- Type: application/octet-stream, Size: 6862 bytes --]

[-- Attachment #5: 0004-gnu-python-nbxmpp-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 1666 bytes --]

[-- Attachment #6: 0005-gnu-python-nbxmpp-Upgrade-to-1.0.2-and-revise-defini.patch --]
[-- Type: application/octet-stream, Size: 2006 bytes --]

[-- Attachment #7: 0006-gnu-python-nbxmpp-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1420 bytes --]

[-- Attachment #8: 0007-gnu-gajim-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 3799 bytes --]

[-- Attachment #9: 0008-gnu-gajim-Upgrade-to-1.2.2-and-revise-definition-acc.patch --]
[-- Type: application/octet-stream, Size: 8232 bytes --]

[-- Attachment #10: 0009-gnu-gajim-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1329 bytes --]

[-- Attachment #11: 0010-gnu-gajim-omemo-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 2110 bytes --]

[-- Attachment #12: 0011-gnu-gajim-omemo-Upgrade-to-2.7.9-and-revise-definiti.patch --]
[-- Type: application/octet-stream, Size: 1881 bytes --]

[-- Attachment #13: 0012-gnu-gajim-omemo-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1272 bytes --]

[-- Attachment #14: 0013-gnu-Add-gajim-openpgp.patch --]
[-- Type: application/octet-stream, Size: 1952 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#43575] Gajim-Next
  2020-09-23  3:52 [bug#43575] Gajim-Next Raghav Gururajan
                   ` (3 preceding siblings ...)
  2020-10-15 21:24 ` Raghav Gururajan
@ 2020-10-15 21:41 ` Raghav Gururajan
  4 siblings, 0 replies; 7+ messages in thread
From: Raghav Gururajan @ 2020-10-15 21:41 UTC (permalink / raw)
  To: 43575

[-- Attachment #1: Type: text/plain, Size: 113 bytes --]

Hello Guix!

> Please find the revised patches attached.

Oops! here are the correct ones.

Regards,
RG.

[-- Attachment #2: 0001-gnu-libnice-Propagate-gnutls.patch --]
[-- Type: application/octet-stream, Size: 1257 bytes --]

[-- Attachment #3: 0002-gnu-Add-gupnp-igd.patch --]
[-- Type: application/octet-stream, Size: 2921 bytes --]

[-- Attachment #4: 0003-gnu-Add-farstream.patch --]
[-- Type: application/octet-stream, Size: 6954 bytes --]

[-- Attachment #5: 0004-gnu-python-nbxmpp-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 1666 bytes --]

[-- Attachment #6: 0005-gnu-python-nbxmpp-Upgrade-to-1.0.2-and-revise-defini.patch --]
[-- Type: application/octet-stream, Size: 2006 bytes --]

[-- Attachment #7: 0006-gnu-python-nbxmpp-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1420 bytes --]

[-- Attachment #8: 0007-gnu-gajim-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 3799 bytes --]

[-- Attachment #9: 0008-gnu-gajim-Upgrade-to-1.2.2-and-revise-definition-acc.patch --]
[-- Type: application/octet-stream, Size: 8232 bytes --]

[-- Attachment #10: 0009-gnu-gajim-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1329 bytes --]

[-- Attachment #11: 0010-gnu-gajim-omemo-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 2110 bytes --]

[-- Attachment #12: 0011-gnu-gajim-omemo-Upgrade-to-2.7.9-and-revise-definiti.patch --]
[-- Type: application/octet-stream, Size: 1881 bytes --]

[-- Attachment #13: 0012-gnu-gajim-omemo-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1272 bytes --]

[-- Attachment #14: 0013-gnu-Add-gajim-openpgp.patch --]
[-- Type: application/octet-stream, Size: 1952 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43575: Gajim-Next
  2020-09-23  4:03 ` Raghav Gururajan
@ 2020-10-19 23:15   ` Julien Lepiller
  0 siblings, 0 replies; 7+ messages in thread
From: Julien Lepiller @ 2020-10-19 23:15 UTC (permalink / raw)
  To: Raghav Gururajan; +Cc: 43575-done

Pushed as 0c140b12f3fe21540ffdda0a84a1e1cb428c4d1b to
2cbda6ded88cd281b66dbfe27e165d3cea7f1ed1. Thank you!




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-10-19 23:17 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-23  3:52 [bug#43575] Gajim-Next Raghav Gururajan
2020-09-23  4:03 ` Raghav Gururajan
2020-10-19 23:15   ` bug#43575: Gajim-Next Julien Lepiller
2020-10-15  4:52 ` [bug#43575] Gajim-Next Raghav Gururajan
2020-10-15  4:53 ` Raghav Gururajan
2020-10-15 21:24 ` Raghav Gururajan
2020-10-15 21:41 ` Raghav Gururajan

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git