* [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 related [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 --]
From 2a3e98293e1d8bd3b37a26219f17b3dccd9c7e76 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 23 Sep 2020 00:01:13 -0400
Subject: [PATCH 1/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 5c57ef2b6d..455c24af01 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -240,13 +240,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
[-- Attachment #3: 0002-gnu-Add-gupnp-igd.patch --]
[-- Type: application/octet-stream, Size: 2919 bytes --]
From 7e89c8dac71236fec530c801b65c796351de4a6f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 20 Sep 2020 04:11:09 -0400
Subject: [PATCH 2/7] 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 d6ab0fb984..e9c2dd1aa5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -214,6 +214,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 #4: 0003-gnu-Add-farstream.patch --]
[-- Type: application/octet-stream, Size: 6952 bytes --]
From ab9eeb3874283ff556a4d096df45abadaf6b0d68 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 22:59:47 -0400
Subject: [PATCH 3/7] 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 e29ff89d9e..d50db30ef1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -952,6 +952,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 cfb87178fb..5116c48af3 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 #5: 0004-gnu-Add-python-nbxmpp-next.patch --]
[-- Type: application/octet-stream, Size: 3425 bytes --]
From 65495da8daf73ec03d022f5003f12248f66eaf9e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 18:31:39 -0400
Subject: [PATCH 4/7] 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 d50db30ef1..40b73101ca 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -219,6 +219,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 #6: 0005-gnu-Add-gajim-next.patch --]
[-- Type: application/octet-stream, Size: 5240 bytes --]
From 0652d8ab484a4d24057e3dc35514dbd7d413a44e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 18:40:18 -0400
Subject: [PATCH 5/7] gnu: Add gajim-next.
* gnu/packages/gajim.scm (gajim-next): New variable.
---
gnu/packages/gajim.scm | 105 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 104 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gajim.scm b/gnu/packages/gajim.scm
index dfccbaf19d..d6d52594ed 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,98 @@ 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))
+ (add-after 'install 'wrap-env
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each
+ (lambda (name)
+ (let ((file (string-append out "/bin/" name))
+ (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (wrap-program file
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
+ '("gajim" "gajim-remote" "gajim-history-manager")))
+ #t)))))
+ (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)))
+ (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" ,libxscrnsaver)
+ ("network-manager" ,network-manager)
+ ("python-css-parser" ,python-css-parser)
+ ("python-keyring" ,python-keyring)
+ ("python-nbxmpp" ,python-nbxmpp-next)
+ ("python-packaging" ,python-packaging)
+ ("python-pillow" ,python-pillow)
+ ("python-precis-i18n" ,python-precis-i18n)
+ ("python-pycairo" ,python-pycairo)
+ ("python-pygobject" ,python-pygobject)
+ ("python-pyopenssl" ,python-pyopenssl)))
+ (propagated-inputs
+ `(("dconf" ,dconf)))
+ (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 #7: 0006-gnu-Add-gajim-omemo-next.patch --]
[-- Type: application/octet-stream, Size: 2273 bytes --]
From b2f8c1a89a38e627ff1b8d6aed27746b0c2b49ba Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 23:15:00 -0400
Subject: [PATCH 6/7] 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 d6d52594ed..88ca37e00e 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)
@@ -161,4 +162,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 #8: 0007-gnu-Add-gajim-openpgp.patch --]
[-- Type: application/octet-stream, Size: 2189 bytes --]
From 138fd437378fe0de3ab287f61e9537e95f78a079 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 23:29:46 -0400
Subject: [PATCH 7/7] 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 88ca37e00e..b0313c3434 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)
@@ -198,4 +199,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 related [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 --]
From 2a3e98293e1d8bd3b37a26219f17b3dccd9c7e76 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 23 Sep 2020 00:01:13 -0400
Subject: [PATCH 01/13] 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 5c57ef2b6d..455c24af01 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -240,13 +240,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
[-- Attachment #3: 0002-gnu-Add-gupnp-igd.patch --]
[-- Type: application/octet-stream, Size: 2921 bytes --]
From 7e89c8dac71236fec530c801b65c796351de4a6f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 20 Sep 2020 04:11:09 -0400
Subject: [PATCH 02/13] 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 d6ab0fb984..e9c2dd1aa5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -214,6 +214,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 #4: 0003-gnu-Add-farstream.patch --]
[-- Type: application/octet-stream, Size: 6862 bytes --]
From 092b2e7b5cf391c3abe85b5a1dda5c1c1178158e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 22:59:47 -0400
Subject: [PATCH 03/13] 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 | 85 +++++++++++++++++++++++
gnu/packages/patches/farstream-make.patch | 38 ++++++++++
3 files changed, 124 insertions(+)
create mode 100644 gnu/packages/patches/farstream-make.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index e29ff89d9e..d50db30ef1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -952,6 +952,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 cfb87178fb..e539f74ca7 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,89 @@
#: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-base" ,gst-plugins-base)))
+ (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 #5: 0004-gnu-python-nbxmpp-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 1666 bytes --]
From d0dcc62795533bcb74e01006fa28c6c4c3d22741 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 15:48:07 -0400
Subject: [PATCH 04/13] gnu: python-nbxmpp: Make some cosmetic changes.
* gnu/packages/messaging.scm (python-nbxmpp): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bbbf5d3330..8673ef7daa 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -705,19 +705,18 @@ simultaneously and therefore appear under the same nickname on IRC.")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "nbxmpp" version))
+ (uri
+ (pypi-uri "nbxmpp" version))
(sha256
- (base32
- "1vq89nhamciblyi5579bppnm4sb0zk5cg5hdipfpz174fxvl2wyd"))))
+ (base32 "1vq89nhamciblyi5579bppnm4sb0zk5cg5hdipfpz174fxvl2wyd"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; no tests
- (home-page "https://dev.gajim.org/gajim/python-nbxmpp")
(synopsis "Non-blocking Jabber/XMPP module")
- (description
- "The goal of this python library is to provide a way for Python
+ (description "The goal of this python library is to provide a way for Python
applications to use Jabber/XMPP networks in a non-blocking way. This library
was initially a fork of xmpppy, but uses non-blocking sockets.")
+ (home-page "https://dev.gajim.org/gajim/python-nbxmpp")
(license license:gpl3+)))
(define-public python2-nbxmpp
--
2.28.0
[-- Attachment #6: 0005-gnu-python-nbxmpp-Upgrade-to-1.0.2-and-revise-defini.patch --]
[-- Type: application/octet-stream, Size: 2006 bytes --]
From c47e16459c6fc7dbd3d2c9a318749095c756a305 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 15:53:26 -0400
Subject: [PATCH 05/13] gnu: python-nbxmpp: Upgrade to 1.0.2 and revise
definition accordingly.
* gnu/packages/messaging.scm (python-nbxmpp) [version]: Update to
1.0.2.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:tests?>: Remove argument.
[native-inputs]: Add glib:bin and python-setuptools.
[inputs]: Add glib, glib-networking, libsoup, python-idna,
python-precis-i18n and python-pygobject.
---
gnu/packages/messaging.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8673ef7daa..04de0123a7 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -701,17 +701,25 @@ simultaneously and therefore appear under the same nickname on IRC.")
(define-public python-nbxmpp
(package
(name "python-nbxmpp")
- (version "0.6.10")
+ (version "1.0.2")
(source
(origin
(method url-fetch)
(uri
(pypi-uri "nbxmpp" version))
(sha256
- (base32 "1vq89nhamciblyi5579bppnm4sb0zk5cg5hdipfpz174fxvl2wyd"))))
+ (base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
(build-system python-build-system)
- (arguments
- `(#:tests? #f)) ; no tests
+ (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 Jabber/XMPP module")
(description "The goal of this python library is to provide a way for Python
applications to use Jabber/XMPP networks in a non-blocking way. This library
--
2.28.0
[-- Attachment #7: 0006-gnu-python-nbxmpp-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1420 bytes --]
From 0afbdcd224575d09f3f515fab1c02e95db34fc56 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:00:25 -0400
Subject: [PATCH 06/13] gnu: python-nbxmpp: Update synopsis and description.
* gnu/packages/messaging.scm (python-nbxmpp) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 04de0123a7..bd3ce1e603 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -720,10 +720,10 @@ simultaneously and therefore appear under the same nickname on IRC.")
("python-idna" ,python-idna)
("python-precis-i18n" ,python-precis-i18n)
("python-pygobject" ,python-pygobject)))
- (synopsis "Non-blocking Jabber/XMPP module")
- (description "The goal of this python library is to provide a way for Python
-applications to use Jabber/XMPP networks in a non-blocking way. This library
-was initially a fork of xmpppy, but uses non-blocking sockets.")
+ (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+)))
--
2.28.0
[-- Attachment #8: 0007-gnu-gajim-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 3799 bytes --]
From 94780570549d1bd9dec0000de840fdbb994b6212 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:16:12 -0400
Subject: [PATCH 07/13] gnu: gajim: Make some cosmetic changes.
* gnu/packages/messaging.scm (gajim): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 54 ++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bd3ce1e603..c9ba0de5b3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -734,14 +734,15 @@ of xmpppy.")
(package
(name "gajim")
(version "1.1.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://gajim.org/downloads/"
- (version-major+minor version)
- "/gajim-" version ".tar.bz2"))
- (sha256
- (base32
- "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://gajim.org/downloads/"
+ (version-major+minor version)
+ "/gajim-" version ".tar.bz2"))
+ (sha256
+ (base32 "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -800,22 +801,25 @@ else [])"))
"/share/glib-2.0/schemas"))))
#t)))))
(native-search-paths
- (list (search-path-specification
- (variable "GAJIM_PLUGIN_PATH")
- (separator #f) ;single entry
- (files '("share/gajim/plugins")))
- ;; Gajim needs to use the propagated inputs of its plugins.
- (search-path-specification
- (variable "PYTHONPATH")
- (files (list (string-append
- "lib/python"
-
- ;; FIXME: Cannot use this expression as it would
- ;; introduce a circular dependency at the top level.
- ;; (version-major+minor (package-version python))
- "3.8"
-
- "/site-packages"))))))
+ (list
+ (search-path-specification
+ (variable "GAJIM_PLUGIN_PATH")
+ (separator #f) ;single entry
+ (files
+ (list
+ "share/gajim/plugins")))
+ ;; Gajim needs to use the propagated inputs of its plugins.
+ (search-path-specification
+ (variable "PYTHONPATH")
+ (files
+ (list
+ (string-append
+ "lib/python"
+ ;; FIXME: Cannot use this expression as it would
+ ;; introduce a circular dependency at the top level.
+ ;; (version-major+minor (package-version python))
+ "3.8"
+ "/site-packages"))))))
(native-inputs
`(("intltool" ,intltool)
("python-docutils" ,python-docutils)
@@ -838,13 +842,13 @@ else [])"))
("python-pygobject" ,python-pygobject)
("python-pyopenssl" ,python-pyopenssl)
("python-qrcode" ,python-qrcode)))
- (home-page "https://gajim.org/")
(synopsis "Jabber (XMPP) client")
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
Among its features are: a tabbed chat window and single window modes; support
for group chat (with Multi-User Chat protocol), invitation, chat to group chat
transformation; audio and video conferences; file transfer; TLS, GPG and
end-to-end encryption support; XML console.")
+ (home-page "https://gajim.org/")
(license license:gpl3)))
(define-public gajim-omemo
--
2.28.0
[-- Attachment #9: 0008-gnu-gajim-Upgrade-to-1.2.2-and-revise-definition-acc.patch --]
[-- Type: application/octet-stream, Size: 8232 bytes --]
From b4454aaf61a017c5cf7e0a688426da8cb995481d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:41:03 -0400
Subject: [PATCH 08/13] gnu: gajim: Upgrade to 1.2.2 and revise definition
accordingly.
* gnu/packages/messaging.scm (gajim) [version]: Update to 1.2.2.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:imported-modules>: New argument.
<#:modules>: New argument.
<#:phases>['wrap-gi-typelib-path]: Remove phase.
['install-icons]: Remove phase.
['wrap-gsettings-schema-dir]: Remove phase.
['check]: Modify phase.
['glib-or-gtk-compile-schemas]: New phase.
['glib-or-gtk-wrap]: New phase.
['wrap-env]: New phase.
[native-inputs]: Add gettext-minimal, glib:bin, gobject-introspection,
gtk+:bin, python-disutils-extra and python-setuptools. Remove intltool
and python-docutils.
[inputs]: Add avahi, dbus, farstream, geoclue, glib, glib-networking,
gsettings-desktop-schemas, gsound, gspell, gstreamer, gst-plugins-base,
gupnp-igd, libsoup, libxscrnsaver, network-manager, python-css-parser
and python-packaging. Remove adwaita-icon-theme, gtkspell3, hicolor-icon-theme,
libsecret, python-cssutils, python-dbus, python-gnupg and python-qrcode.
[propagated-inputs]: Add dconf.
---
gnu/packages/messaging.scm | 101 ++++++++++++++++++++-----------------
1 file changed, 54 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c9ba0de5b3..fdf1fa1460 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -69,6 +69,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gperf)
+ #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
@@ -733,19 +734,27 @@ of xmpppy.")
(define-public gajim
(package
(name "gajim")
- (version "1.1.3")
+ (version "1.2.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://gajim.org/downloads/"
(version-major+minor version)
- "/gajim-" version ".tar.bz2"))
+ "/gajim-" version ".tar.gz"))
(sha256
- (base32 "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"))))
+ (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))))
(build-system python-build-system)
(arguments
- `(#:phases
+ `(#: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
(add-after 'unpack 'add-plugin-dirs
(lambda _
@@ -759,46 +768,29 @@ else [])"))
#t))
(replace 'check
(lambda _
- (invoke "python" "./setup.py" "test" "-s" "test.no_gui")))
- (add-after 'install 'wrap-gi-typelib-path
+ ;; 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))
+ (add-after 'install 'wrap-env
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (name)
(let ((file (string-append out "/bin/" name))
+ (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program file
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- ;; For translations
- `("XDG_DATA_DIRS" ":" prefix
- (,(string-append (assoc-ref outputs "out") "/share"))))))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
'("gajim" "gajim-remote" "gajim-history-manager")))
- #t))
- (add-after 'install 'install-icons
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (adwaita (string-append
- (assoc-ref inputs "adwaita-icon-theme")
- "/share/icons/Adwaita"))
- (hicolor (string-append
- (assoc-ref inputs "hicolor-icon-theme")
- "/share/icons/hicolor"))
- (icons (string-append
- out "/lib/python"
- ,(version-major+minor (package-version python))
- "/site-packages/gajim/data/icons")))
- (with-directory-excursion icons
- (symlink adwaita "Adwaita")
- (copy-recursively hicolor "hicolor")))
- #t))
- (add-after 'install-icons 'wrap-gsettings-schema-dir
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (wrap-program (string-append (assoc-ref outputs "out")
- "/bin/gajim")
- ;; For GtkFileChooserDialog.
- `("GSETTINGS_SCHEMA_DIR" =
- (,(string-append (assoc-ref inputs "gtk+")
- "/share/glib-2.0/schemas"))))
#t)))))
(native-search-paths
(list
@@ -821,27 +813,42 @@ else [])"))
"3.8"
"/site-packages"))))))
(native-inputs
- `(("intltool" ,intltool)
- ("python-docutils" ,python-docutils)
+ `(("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)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
+ `(("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+)
- ("gtkspell3" ,gtkspell3)
- ("hicolor-icon-theme" ,hicolor-icon-theme)
- ("libsecret" ,libsecret)
- ("python-cssutils" ,python-cssutils)
- ("python-dbus" ,python-dbus)
- ("python-gnupg" ,python-gnupg)
+ ("gupnp-igd" ,gupnp-igd)
+ ("libsoup" ,libsoup)
+ ("libxss" ,libxscrnsaver)
+ ("network-manager" ,network-manager)
+ ("python-css-parser" ,python-css-parser)
("python-keyring" ,python-keyring)
("python-nbxmpp" ,python-nbxmpp)
+ ("python-packaging" ,python-packaging)
("python-pillow" ,python-pillow)
("python-precis-i18n" ,python-precis-i18n)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
- ("python-pyopenssl" ,python-pyopenssl)
- ("python-qrcode" ,python-qrcode)))
+ ("python-pyopenssl" ,python-pyopenssl)))
+ (propagated-inputs
+ `(("dconf" ,dconf)))
(synopsis "Jabber (XMPP) client")
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
Among its features are: a tabbed chat window and single window modes; support
--
2.28.0
[-- Attachment #10: 0009-gnu-gajim-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1329 bytes --]
From c17ce0845022be63d78fc8fbe16c3b5c8001b656 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:56:44 -0400
Subject: [PATCH 09/13] gnu: gajim: Update synopsis and description.
* gnu/packages/messaging.scm (gajim) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index fdf1fa1460..7250d37ca1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -849,12 +849,9 @@ else [])"))
("python-pyopenssl" ,python-pyopenssl)))
(propagated-inputs
`(("dconf" ,dconf)))
- (synopsis "Jabber (XMPP) client")
- (description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
-Among its features are: a tabbed chat window and single window modes; support
-for group chat (with Multi-User Chat protocol), invitation, chat to group chat
-transformation; audio and video conferences; file transfer; TLS, GPG and
-end-to-end encryption support; XML console.")
+ (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)))
--
2.28.0
[-- Attachment #11: 0010-gnu-gajim-omemo-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 2110 bytes --]
From 84bc3abb8872c609dfb7f6b1005c88ece703d014 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:06:01 -0400
Subject: [PATCH 10/13] gnu: gajim-omemo: Make some cosmetic changes.
* gnu/packages/messaging.scm (gajim-omemo): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 7250d37ca1..ed160f5733 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -859,14 +859,15 @@ client.")
(package
(name "gajim-omemo")
(version "2.7.7")
- (source (origin
- (method url-fetch/zipbomb)
- (uri (string-append
- "https://ftp.gajim.org/plugins_releases/omemo_"
- version ".zip"))
- (sha256
- (base32
- "17jl4blkq04ag3g0har6z1bmk36523d29s51g260wb1pywfb536h"))))
+ (source
+ (origin
+ (method url-fetch/zipbomb)
+ (uri
+ (string-append
+ "https://ftp.gajim.org/plugins_releases/omemo_"
+ version ".zip"))
+ (sha256
+ (base32 "17jl4blkq04ag3g0har6z1bmk36523d29s51g260wb1pywfb536h"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@@ -881,13 +882,12 @@ client.")
#t))))
(propagated-inputs
`(("python-axolotl" ,python-axolotl)))
+ (synopsis "Gajim OMEMO plugin")
+ (description "This package provides the Gajim OMEMO plugin. OMEMO is an
+XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption
+based on Axolotl and PEP.")
(home-page
"https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin")
- (synopsis "Gajim OMEMO plugin")
- (description
- "This package provides the Gajim OMEMO plugin. OMEMO is an XMPP
-Extension Protocol (XEP) for secure multi-client end-to-end encryption based
-on Axolotl and PEP.")
(license license:gpl3+)))
(define-public dino
--
2.28.0
[-- Attachment #12: 0011-gnu-gajim-omemo-Upgrade-to-2.7.9-and-revise-definiti.patch --]
[-- Type: application/octet-stream, Size: 1881 bytes --]
From 1c4fa71b6abd45618206b715c6fc0de02097bb2f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:11:11 -0400
Subject: [PATCH 11/13] gnu: gajim-omemo: Upgrade to 2.7.9 and revise
definition accordingly.
* gnu/packages/messaging.scm (gajim-omemo) [version]: Update to
2.7.9.
[source]<origin>[sha256]: Modify base32.
[propagated-inputs]: Add python-axolotl-curve25519, python-cryptography
and python-qrcode.
---
gnu/packages/messaging.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ed160f5733..8cd4631441 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -858,7 +858,7 @@ client.")
(define-public gajim-omemo
(package
(name "gajim-omemo")
- (version "2.7.7")
+ (version "2.7.9")
(source
(origin
(method url-fetch/zipbomb)
@@ -867,7 +867,7 @@ client.")
"https://ftp.gajim.org/plugins_releases/omemo_"
version ".zip"))
(sha256
- (base32 "17jl4blkq04ag3g0har6z1bmk36523d29s51g260wb1pywfb536h"))))
+ (base32 "19si2v5yrxpn2m0f684npsg0iiyl2h3r5hbxyrxv4k3acmfmhb3z"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@@ -881,7 +881,10 @@ client.")
(copy-recursively source share)
#t))))
(propagated-inputs
- `(("python-axolotl" ,python-axolotl)))
+ `(("python-axolotl" ,python-axolotl)
+ ("python-axolotl-curve25519" ,python-axolotl-curve25519)
+ ("python-cryptography" ,python-cryptography)
+ ("python-qrcode" ,python-qrcode)))
(synopsis "Gajim OMEMO plugin")
(description "This package provides the Gajim OMEMO plugin. OMEMO is an
XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption
--
2.28.0
[-- Attachment #13: 0012-gnu-gajim-omemo-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1272 bytes --]
From b44aa51ac8bbf6cb2b1cc4eaeb4f91dcc71b3c28 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:14:55 -0400
Subject: [PATCH 12/13] gnu: gajim-omemo: Update synopsis and description.
* gnu/packages/messaging.scm (gajim-omemo) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8cd4631441..fc7dc3ee89 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -885,10 +885,9 @@ client.")
("python-axolotl-curve25519" ,python-axolotl-curve25519)
("python-cryptography" ,python-cryptography)
("python-qrcode" ,python-qrcode)))
- (synopsis "Gajim OMEMO plugin")
- (description "This package provides the Gajim OMEMO plugin. OMEMO is an
-XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption
-based on Axolotl and PEP.")
+ (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+)))
--
2.28.0
[-- Attachment #14: 0013-gnu-Add-gajim-openpgp.patch --]
[-- Type: application/octet-stream, Size: 1952 bytes --]
From fb994812b209302823216dca8ef21f54e4225b58 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:17:23 -0400
Subject: [PATCH 13/13] gnu: Add gajim-openpgp.
* gnu/packages/messaging.scm (gajim-openpgp): New variable.
---
gnu/packages/messaging.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index fc7dc3ee89..75d1e18d67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -892,6 +892,40 @@ Encryption to Gajim.")
"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+)))
+
(define-public dino
(package
(name "dino")
--
2.28.0
^ permalink raw reply related [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 --]
From 2a3e98293e1d8bd3b37a26219f17b3dccd9c7e76 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 23 Sep 2020 00:01:13 -0400
Subject: [PATCH 01/13] 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 5c57ef2b6d..455c24af01 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -240,13 +240,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
[-- Attachment #3: 0002-gnu-Add-gupnp-igd.patch --]
[-- Type: application/octet-stream, Size: 2921 bytes --]
From 7e89c8dac71236fec530c801b65c796351de4a6f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 20 Sep 2020 04:11:09 -0400
Subject: [PATCH 02/13] 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 d6ab0fb984..e9c2dd1aa5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -214,6 +214,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 #4: 0003-gnu-Add-farstream.patch --]
[-- Type: application/octet-stream, Size: 6954 bytes --]
From ba65e5160a60bfe11c47aeb99bbe2523186f3921 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 22 Sep 2020 22:59:47 -0400
Subject: [PATCH 03/13] 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 e29ff89d9e..d50db30ef1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -952,6 +952,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 cfb87178fb..5116c48af3 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 #5: 0004-gnu-python-nbxmpp-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 1666 bytes --]
From dbab3d15381ebae7060078a7c5d6b0a9e9881b2b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 15:48:07 -0400
Subject: [PATCH 04/13] gnu: python-nbxmpp: Make some cosmetic changes.
* gnu/packages/messaging.scm (python-nbxmpp): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bbbf5d3330..8673ef7daa 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -705,19 +705,18 @@ simultaneously and therefore appear under the same nickname on IRC.")
(source
(origin
(method url-fetch)
- (uri (pypi-uri "nbxmpp" version))
+ (uri
+ (pypi-uri "nbxmpp" version))
(sha256
- (base32
- "1vq89nhamciblyi5579bppnm4sb0zk5cg5hdipfpz174fxvl2wyd"))))
+ (base32 "1vq89nhamciblyi5579bppnm4sb0zk5cg5hdipfpz174fxvl2wyd"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; no tests
- (home-page "https://dev.gajim.org/gajim/python-nbxmpp")
(synopsis "Non-blocking Jabber/XMPP module")
- (description
- "The goal of this python library is to provide a way for Python
+ (description "The goal of this python library is to provide a way for Python
applications to use Jabber/XMPP networks in a non-blocking way. This library
was initially a fork of xmpppy, but uses non-blocking sockets.")
+ (home-page "https://dev.gajim.org/gajim/python-nbxmpp")
(license license:gpl3+)))
(define-public python2-nbxmpp
--
2.28.0
[-- Attachment #6: 0005-gnu-python-nbxmpp-Upgrade-to-1.0.2-and-revise-defini.patch --]
[-- Type: application/octet-stream, Size: 2006 bytes --]
From 48c591fff1974c374e8c33ba23905656bf89b591 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 15:53:26 -0400
Subject: [PATCH 05/13] gnu: python-nbxmpp: Upgrade to 1.0.2 and revise
definition accordingly.
* gnu/packages/messaging.scm (python-nbxmpp) [version]: Update to
1.0.2.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:tests?>: Remove argument.
[native-inputs]: Add glib:bin and python-setuptools.
[inputs]: Add glib, glib-networking, libsoup, python-idna,
python-precis-i18n and python-pygobject.
---
gnu/packages/messaging.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8673ef7daa..04de0123a7 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -701,17 +701,25 @@ simultaneously and therefore appear under the same nickname on IRC.")
(define-public python-nbxmpp
(package
(name "python-nbxmpp")
- (version "0.6.10")
+ (version "1.0.2")
(source
(origin
(method url-fetch)
(uri
(pypi-uri "nbxmpp" version))
(sha256
- (base32 "1vq89nhamciblyi5579bppnm4sb0zk5cg5hdipfpz174fxvl2wyd"))))
+ (base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
(build-system python-build-system)
- (arguments
- `(#:tests? #f)) ; no tests
+ (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 Jabber/XMPP module")
(description "The goal of this python library is to provide a way for Python
applications to use Jabber/XMPP networks in a non-blocking way. This library
--
2.28.0
[-- Attachment #7: 0006-gnu-python-nbxmpp-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1420 bytes --]
From 30683b716222da1b69750bbe65d3aac0c5e70d2b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:00:25 -0400
Subject: [PATCH 06/13] gnu: python-nbxmpp: Update synopsis and description.
* gnu/packages/messaging.scm (python-nbxmpp) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 04de0123a7..bd3ce1e603 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -720,10 +720,10 @@ simultaneously and therefore appear under the same nickname on IRC.")
("python-idna" ,python-idna)
("python-precis-i18n" ,python-precis-i18n)
("python-pygobject" ,python-pygobject)))
- (synopsis "Non-blocking Jabber/XMPP module")
- (description "The goal of this python library is to provide a way for Python
-applications to use Jabber/XMPP networks in a non-blocking way. This library
-was initially a fork of xmpppy, but uses non-blocking sockets.")
+ (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+)))
--
2.28.0
[-- Attachment #8: 0007-gnu-gajim-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 3799 bytes --]
From 3b5be5eb4c22ac3b3e307e267453a46ec15e0dae Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:16:12 -0400
Subject: [PATCH 07/13] gnu: gajim: Make some cosmetic changes.
* gnu/packages/messaging.scm (gajim): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 54 ++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index bd3ce1e603..c9ba0de5b3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -734,14 +734,15 @@ of xmpppy.")
(package
(name "gajim")
(version "1.1.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://gajim.org/downloads/"
- (version-major+minor version)
- "/gajim-" version ".tar.bz2"))
- (sha256
- (base32
- "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://gajim.org/downloads/"
+ (version-major+minor version)
+ "/gajim-" version ".tar.bz2"))
+ (sha256
+ (base32 "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -800,22 +801,25 @@ else [])"))
"/share/glib-2.0/schemas"))))
#t)))))
(native-search-paths
- (list (search-path-specification
- (variable "GAJIM_PLUGIN_PATH")
- (separator #f) ;single entry
- (files '("share/gajim/plugins")))
- ;; Gajim needs to use the propagated inputs of its plugins.
- (search-path-specification
- (variable "PYTHONPATH")
- (files (list (string-append
- "lib/python"
-
- ;; FIXME: Cannot use this expression as it would
- ;; introduce a circular dependency at the top level.
- ;; (version-major+minor (package-version python))
- "3.8"
-
- "/site-packages"))))))
+ (list
+ (search-path-specification
+ (variable "GAJIM_PLUGIN_PATH")
+ (separator #f) ;single entry
+ (files
+ (list
+ "share/gajim/plugins")))
+ ;; Gajim needs to use the propagated inputs of its plugins.
+ (search-path-specification
+ (variable "PYTHONPATH")
+ (files
+ (list
+ (string-append
+ "lib/python"
+ ;; FIXME: Cannot use this expression as it would
+ ;; introduce a circular dependency at the top level.
+ ;; (version-major+minor (package-version python))
+ "3.8"
+ "/site-packages"))))))
(native-inputs
`(("intltool" ,intltool)
("python-docutils" ,python-docutils)
@@ -838,13 +842,13 @@ else [])"))
("python-pygobject" ,python-pygobject)
("python-pyopenssl" ,python-pyopenssl)
("python-qrcode" ,python-qrcode)))
- (home-page "https://gajim.org/")
(synopsis "Jabber (XMPP) client")
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
Among its features are: a tabbed chat window and single window modes; support
for group chat (with Multi-User Chat protocol), invitation, chat to group chat
transformation; audio and video conferences; file transfer; TLS, GPG and
end-to-end encryption support; XML console.")
+ (home-page "https://gajim.org/")
(license license:gpl3)))
(define-public gajim-omemo
--
2.28.0
[-- Attachment #9: 0008-gnu-gajim-Upgrade-to-1.2.2-and-revise-definition-acc.patch --]
[-- Type: application/octet-stream, Size: 8232 bytes --]
From 4059a1359c44e73d9f692afa991a0aa2be40be61 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:41:03 -0400
Subject: [PATCH 08/13] gnu: gajim: Upgrade to 1.2.2 and revise definition
accordingly.
* gnu/packages/messaging.scm (gajim) [version]: Update to 1.2.2.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:imported-modules>: New argument.
<#:modules>: New argument.
<#:phases>['wrap-gi-typelib-path]: Remove phase.
['install-icons]: Remove phase.
['wrap-gsettings-schema-dir]: Remove phase.
['check]: Modify phase.
['glib-or-gtk-compile-schemas]: New phase.
['glib-or-gtk-wrap]: New phase.
['wrap-env]: New phase.
[native-inputs]: Add gettext-minimal, glib:bin, gobject-introspection,
gtk+:bin, python-disutils-extra and python-setuptools. Remove intltool
and python-docutils.
[inputs]: Add avahi, dbus, farstream, geoclue, glib, glib-networking,
gsettings-desktop-schemas, gsound, gspell, gstreamer, gst-plugins-base,
gupnp-igd, libsoup, libxscrnsaver, network-manager, python-css-parser
and python-packaging. Remove adwaita-icon-theme, gtkspell3, hicolor-icon-theme,
libsecret, python-cssutils, python-dbus, python-gnupg and python-qrcode.
[propagated-inputs]: Add dconf.
---
gnu/packages/messaging.scm | 101 ++++++++++++++++++++-----------------
1 file changed, 54 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index c9ba0de5b3..fdf1fa1460 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -69,6 +69,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gperf)
+ #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages icu4c)
@@ -733,19 +734,27 @@ of xmpppy.")
(define-public gajim
(package
(name "gajim")
- (version "1.1.3")
+ (version "1.2.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://gajim.org/downloads/"
(version-major+minor version)
- "/gajim-" version ".tar.bz2"))
+ "/gajim-" version ".tar.gz"))
(sha256
- (base32 "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"))))
+ (base32 "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"))))
(build-system python-build-system)
(arguments
- `(#:phases
+ `(#: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
(add-after 'unpack 'add-plugin-dirs
(lambda _
@@ -759,46 +768,29 @@ else [])"))
#t))
(replace 'check
(lambda _
- (invoke "python" "./setup.py" "test" "-s" "test.no_gui")))
- (add-after 'install 'wrap-gi-typelib-path
+ ;; 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))
+ (add-after 'install 'wrap-env
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(for-each
(lambda (name)
(let ((file (string-append out "/bin/" name))
+ (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(wrap-program file
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- ;; For translations
- `("XDG_DATA_DIRS" ":" prefix
- (,(string-append (assoc-ref outputs "out") "/share"))))))
+ `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
'("gajim" "gajim-remote" "gajim-history-manager")))
- #t))
- (add-after 'install 'install-icons
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (adwaita (string-append
- (assoc-ref inputs "adwaita-icon-theme")
- "/share/icons/Adwaita"))
- (hicolor (string-append
- (assoc-ref inputs "hicolor-icon-theme")
- "/share/icons/hicolor"))
- (icons (string-append
- out "/lib/python"
- ,(version-major+minor (package-version python))
- "/site-packages/gajim/data/icons")))
- (with-directory-excursion icons
- (symlink adwaita "Adwaita")
- (copy-recursively hicolor "hicolor")))
- #t))
- (add-after 'install-icons 'wrap-gsettings-schema-dir
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (wrap-program (string-append (assoc-ref outputs "out")
- "/bin/gajim")
- ;; For GtkFileChooserDialog.
- `("GSETTINGS_SCHEMA_DIR" =
- (,(string-append (assoc-ref inputs "gtk+")
- "/share/glib-2.0/schemas"))))
#t)))))
(native-search-paths
(list
@@ -821,27 +813,42 @@ else [])"))
"3.8"
"/site-packages"))))))
(native-inputs
- `(("intltool" ,intltool)
- ("python-docutils" ,python-docutils)
+ `(("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)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
+ `(("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+)
- ("gtkspell3" ,gtkspell3)
- ("hicolor-icon-theme" ,hicolor-icon-theme)
- ("libsecret" ,libsecret)
- ("python-cssutils" ,python-cssutils)
- ("python-dbus" ,python-dbus)
- ("python-gnupg" ,python-gnupg)
+ ("gupnp-igd" ,gupnp-igd)
+ ("libsoup" ,libsoup)
+ ("libxss" ,libxscrnsaver)
+ ("network-manager" ,network-manager)
+ ("python-css-parser" ,python-css-parser)
("python-keyring" ,python-keyring)
("python-nbxmpp" ,python-nbxmpp)
+ ("python-packaging" ,python-packaging)
("python-pillow" ,python-pillow)
("python-precis-i18n" ,python-precis-i18n)
("python-pycairo" ,python-pycairo)
("python-pygobject" ,python-pygobject)
- ("python-pyopenssl" ,python-pyopenssl)
- ("python-qrcode" ,python-qrcode)))
+ ("python-pyopenssl" ,python-pyopenssl)))
+ (propagated-inputs
+ `(("dconf" ,dconf)))
(synopsis "Jabber (XMPP) client")
(description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
Among its features are: a tabbed chat window and single window modes; support
--
2.28.0
[-- Attachment #10: 0009-gnu-gajim-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1329 bytes --]
From 5c7101c526d026aed13aeb062a1b6b6d590f2973 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 16:56:44 -0400
Subject: [PATCH 09/13] gnu: gajim: Update synopsis and description.
* gnu/packages/messaging.scm (gajim) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index fdf1fa1460..7250d37ca1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -849,12 +849,9 @@ else [])"))
("python-pyopenssl" ,python-pyopenssl)))
(propagated-inputs
`(("dconf" ,dconf)))
- (synopsis "Jabber (XMPP) client")
- (description "Gajim is a feature-rich and easy to use Jabber/XMPP client.
-Among its features are: a tabbed chat window and single window modes; support
-for group chat (with Multi-User Chat protocol), invitation, chat to group chat
-transformation; audio and video conferences; file transfer; TLS, GPG and
-end-to-end encryption support; XML console.")
+ (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)))
--
2.28.0
[-- Attachment #11: 0010-gnu-gajim-omemo-Make-some-cosmetic-changes.patch --]
[-- Type: application/octet-stream, Size: 2110 bytes --]
From 974bd724c35458045fc354ea90474508fae01ab5 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:06:01 -0400
Subject: [PATCH 10/13] gnu: gajim-omemo: Make some cosmetic changes.
* gnu/packages/messaging.scm (gajim-omemo): Make some cosmetic changes.
---
gnu/packages/messaging.scm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 7250d37ca1..ed160f5733 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -859,14 +859,15 @@ client.")
(package
(name "gajim-omemo")
(version "2.7.7")
- (source (origin
- (method url-fetch/zipbomb)
- (uri (string-append
- "https://ftp.gajim.org/plugins_releases/omemo_"
- version ".zip"))
- (sha256
- (base32
- "17jl4blkq04ag3g0har6z1bmk36523d29s51g260wb1pywfb536h"))))
+ (source
+ (origin
+ (method url-fetch/zipbomb)
+ (uri
+ (string-append
+ "https://ftp.gajim.org/plugins_releases/omemo_"
+ version ".zip"))
+ (sha256
+ (base32 "17jl4blkq04ag3g0har6z1bmk36523d29s51g260wb1pywfb536h"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@@ -881,13 +882,12 @@ client.")
#t))))
(propagated-inputs
`(("python-axolotl" ,python-axolotl)))
+ (synopsis "Gajim OMEMO plugin")
+ (description "This package provides the Gajim OMEMO plugin. OMEMO is an
+XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption
+based on Axolotl and PEP.")
(home-page
"https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin")
- (synopsis "Gajim OMEMO plugin")
- (description
- "This package provides the Gajim OMEMO plugin. OMEMO is an XMPP
-Extension Protocol (XEP) for secure multi-client end-to-end encryption based
-on Axolotl and PEP.")
(license license:gpl3+)))
(define-public dino
--
2.28.0
[-- Attachment #12: 0011-gnu-gajim-omemo-Upgrade-to-2.7.9-and-revise-definiti.patch --]
[-- Type: application/octet-stream, Size: 1881 bytes --]
From 52e181cc5b9299a8bccd35c40bd19d272c89d11d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:11:11 -0400
Subject: [PATCH 11/13] gnu: gajim-omemo: Upgrade to 2.7.9 and revise
definition accordingly.
* gnu/packages/messaging.scm (gajim-omemo) [version]: Update to
2.7.9.
[source]<origin>[sha256]: Modify base32.
[propagated-inputs]: Add python-axolotl-curve25519, python-cryptography
and python-qrcode.
---
gnu/packages/messaging.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ed160f5733..8cd4631441 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -858,7 +858,7 @@ client.")
(define-public gajim-omemo
(package
(name "gajim-omemo")
- (version "2.7.7")
+ (version "2.7.9")
(source
(origin
(method url-fetch/zipbomb)
@@ -867,7 +867,7 @@ client.")
"https://ftp.gajim.org/plugins_releases/omemo_"
version ".zip"))
(sha256
- (base32 "17jl4blkq04ag3g0har6z1bmk36523d29s51g260wb1pywfb536h"))))
+ (base32 "19si2v5yrxpn2m0f684npsg0iiyl2h3r5hbxyrxv4k3acmfmhb3z"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@@ -881,7 +881,10 @@ client.")
(copy-recursively source share)
#t))))
(propagated-inputs
- `(("python-axolotl" ,python-axolotl)))
+ `(("python-axolotl" ,python-axolotl)
+ ("python-axolotl-curve25519" ,python-axolotl-curve25519)
+ ("python-cryptography" ,python-cryptography)
+ ("python-qrcode" ,python-qrcode)))
(synopsis "Gajim OMEMO plugin")
(description "This package provides the Gajim OMEMO plugin. OMEMO is an
XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption
--
2.28.0
[-- Attachment #13: 0012-gnu-gajim-omemo-Update-synopsis-and-description.patch --]
[-- Type: application/octet-stream, Size: 1272 bytes --]
From 4830d5ebb7e53d35d3d8a38579e7a5bdd164f5d0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:14:55 -0400
Subject: [PATCH 12/13] gnu: gajim-omemo: Update synopsis and description.
* gnu/packages/messaging.scm (gajim-omemo) [synopsis]: Modify.
[description]: Modify.
---
gnu/packages/messaging.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8cd4631441..fc7dc3ee89 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -885,10 +885,9 @@ client.")
("python-axolotl-curve25519" ,python-axolotl-curve25519)
("python-cryptography" ,python-cryptography)
("python-qrcode" ,python-qrcode)))
- (synopsis "Gajim OMEMO plugin")
- (description "This package provides the Gajim OMEMO plugin. OMEMO is an
-XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption
-based on Axolotl and PEP.")
+ (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+)))
--
2.28.0
[-- Attachment #14: 0013-gnu-Add-gajim-openpgp.patch --]
[-- Type: application/octet-stream, Size: 1952 bytes --]
From b71f60d4f99c8edb71a34cee1ec5922805510eed Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 15 Oct 2020 17:17:23 -0400
Subject: [PATCH 13/13] gnu: Add gajim-openpgp.
* gnu/packages/messaging.scm (gajim-openpgp): New variable.
---
gnu/packages/messaging.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index fc7dc3ee89..75d1e18d67 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -892,6 +892,40 @@ Encryption to Gajim.")
"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+)))
+
(define-public dino
(package
(name "dino")
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread