diff options
Diffstat (limited to 'gnu/packages/messaging.scm')
| -rw-r--r-- | gnu/packages/messaging.scm | 80 |
1 files changed, 36 insertions, 44 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ebb9bc17b3..2fa1c45f98 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 Jack Hill <jackhill@jackhill.us> -;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Giovanni Biscuolo <g@xelera.eu> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> @@ -210,43 +210,29 @@ XMPP-based sessions.") (build-system meson-build-system) (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-ncurses-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "meson.build" - (("'/usr'") - (string-append "'" - (assoc-ref inputs "ncurses") - "'"))))) - (add-before 'configure 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "doc" - (substitute* "libgnt-docs.xml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))))) - (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")))))))) + (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-ncurses-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("'/usr'") + (string-append "'" #$(this-package-input "ncurses") + "'"))))) + (add-after 'install 'move-doc + (lambda _ + (mkdir-p (string-append #$output:doc "/share")) + (rename-file + (string-append #$output "/share/gtk-doc") + (string-append #$output:doc "/share/gtk-doc"))))))) (native-inputs - `(("docbook-xml" ,docbook-xml-4.1.2) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config))) - (inputs - (list ncurses)) - (propagated-inputs - `(("glib" ,glib) - ("libxml" ,libxml2) - ("python" ,python-2))) + (list docbook-xml-4.1.2 + `(,glib "bin") + gobject-introspection + gtk-doc + pkg-config)) + (inputs (list ncurses)) + (propagated-inputs (list glib libxml2 python-2)) (synopsis "GLib Ncurses Toolkit") (description "GNT is an ncurses toolkit for creating text-mode graphical user interfaces in a fast and easy way. It is based on GLib and ncurses.") @@ -417,7 +403,7 @@ TCP sessions from existing clients.") (define-public poezio (package (name "poezio") - (version "0.13.2") + (version "0.14") (source (origin (method git-fetch) @@ -429,10 +415,11 @@ TCP sessions from existing clients.") (file-name (git-file-name name version)) (sha256 - (base32 "0p92k8ssjsgavyfv1fd5cgzyw87dmdd84vaz7zvfsf5crvpr1mkf")))) + (base32 "15vlmymqlcf94h1g6dvgzjvj15c47dqsm78qs40wl2dlwspvqkxj")))) (build-system python-build-system) (arguments - (list #:phases + (list #:tests? #f ; tests fails without the OTR plugin + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ @@ -443,7 +430,6 @@ TCP sessions from existing clients.") (list pkg-config python-setuptools python-sphinx)) (inputs (list python-mpd2 - python-potr python-pyasn1 python-pyasn1-modules python-pygments @@ -461,7 +447,7 @@ made in a configuration file or directly from the client. You'll find the light, fast, geeky and anonymous spirit of IRC while using a powerful, standard and open protocol.") (home-page "https://poez.io/en/") - (license license:zlib))) + (license license:gpl3+))) (define-public libotr (package @@ -474,6 +460,12 @@ powerful, standard and open protocol.") version ".tar.gz")) (sha256 (base32 "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb")) + (modules '((guix build utils))) + (snippet + ;; Add missing #include that causes a build failure with glibc 2.35. + #~(substitute* "tests/regression/client/client.c" + (("_GNU_SOURCE" all) + (string-append all "\n#include <sys/socket.h>\n")))) (patches (search-patches "libotr-test-auth-fix.patch")))) (build-system gnu-build-system) @@ -1374,7 +1366,7 @@ Encryption to Gajim.") vala)) (inputs (list adwaita-icon-theme - atk + at-spi2-core bash-minimal cairo librsvg @@ -1396,7 +1388,7 @@ Encryption to Gajim.") libsignal-protocol-c libsoup libsrtp ;for calls support - pango-next ;gtk4 wants pango 1.50+ + pango ;gtk4 wants pango 1.50+ qrencode sqlite webrtc-audio-processing)) ;for A/V support |