diff options
Diffstat (limited to 'gnu/packages/messaging.scm')
| -rw-r--r-- | gnu/packages/messaging.scm | 104 |
1 files changed, 63 insertions, 41 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eee082ed8e..47798c3586 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> -;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Mason Hock <chaosmonk@riseup.net> @@ -232,8 +232,8 @@ XMPP-based sessions.") ("libidn" ,libidn) ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtmultimedia-5" ,qtmultimedia-5) + ("qtsvg-5" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("x11" ,libx11) @@ -1476,12 +1476,12 @@ default.") (inputs (list kirigami knotifications qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtlocation - qtquickcontrols2 - qtsvg - qtmultimedia + qtquickcontrols2-5 + qtsvg-5 + qtmultimedia-5 qtxmlpatterns qqc2-desktop-style qxmpp @@ -1810,7 +1810,7 @@ instant messenger with audio and video chat capabilities.") ,(list (search-input-directory inputs "lib/qt5/plugins/")))))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ffmpeg filteraudio @@ -1826,7 +1826,7 @@ instant messenger with audio and video chat capabilities.") openal qrencode qtbase-5 - qtsvg + qtsvg-5 sqlcipher)) (home-page "https://qtox.github.io/") (synopsis "Tox chat client using Qt") @@ -2325,7 +2325,7 @@ notifications, and Python scripting support.") (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs")))) (build-system cmake-build-system) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") #:tests? #f)) ; no tests @@ -2340,7 +2340,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.7.0") + (version "0.8.0") (source (origin (method git-fetch) @@ -2349,7 +2349,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kgz9i3xgyk1a82sv48a1m8gdxg0cl5pgd5imgwy519vvjlkwv48")))) + (base32 "0gkzgq6rzanvgyk47d25nqz7m0lwa3kz5pc0m4w0ada38xwhy2j9")))) (arguments `(#:configure-flags (list @@ -2385,7 +2385,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.9.3") + (version "0.10.0") (source (origin (method git-fetch) @@ -2394,7 +2394,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1941jvk72qy9g41cs2p3d6fphkg8ccjlsiclwymvzdyi7s3ilml7")) + (base32 "1n7czmv8mamaphpr2cnppddpgmb914pjd7msxng0fim6w7bhil14")) (modules '((guix build utils))) (snippet '(begin @@ -2413,13 +2413,15 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unbundle-dependencies - (lambda _ - (let ((single-app #$(this-package-input "single-application-qt5"))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((libSingleApplication.a + (search-input-file inputs "lib/libSingleApplication.a")) + (httplib.h (search-input-file inputs "include/httplib.h"))) (substitute* "CMakeLists.txt" ;; Remove include and source dirs,replace with the correct one - (("third_party/blurhash/blurhash.cpp") "") - (("third_party/cpp-httplib-0.5.12") - (string-append "\"" single-app "/include\"")) + (("third_party/blurhash/blurhash\\.[ch]pp") "") + (("third_party/cpp-httplib-0\\.5\\.12") + (dirname httplib.h)) (("add_subdirectory.*third_party/SingleApplication.*") "") ;; Link using the correct static/shared libs (("SingleApplication::SingleApplication") @@ -2427,7 +2429,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ;; Dynamic libraries "httplib" "\n" "blurhash" "\n" ;; Static library - single-app "/lib/libSingleApplication.a")))))) + libSingleApplication.a)))))) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. @@ -2457,18 +2459,18 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") mtxclient openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtgraphicaleffects - qtmultimedia - qtquickcontrols2 - qtsvg + qtmultimedia-5 + qtquickcontrols2-5 + qtsvg-5 spdlog single-application-qt5 xcb-util-wm zlib)) (native-inputs - (list asciidoc doxygen graphviz pkg-config qttools)) + (list asciidoc doxygen graphviz pkg-config qttools-5)) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") (description "@code{Nheko} want to provide a native desktop app for the @@ -2497,12 +2499,12 @@ notification, emojis, E2E encryption, and voip calls.") (inputs (list libqmatrixclient qtbase-5 - qtdeclarative - qtmultimedia - qtquickcontrols - qtquickcontrols2 - qtsvg - qttools + qtdeclarative-5 + qtmultimedia-5 + qtquickcontrols-5 + qtquickcontrols2-5 + qtsvg-5 + qttools-5 xdg-utils)) (arguments `(#:tests? #f)) ; no tests @@ -2782,6 +2784,8 @@ asynchronicity.") (url "https://github.com/google/libphonenumber") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches + "libphonenumber-reproducible-build.patch")) (sha256 (base32 "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9")))) @@ -2803,20 +2807,25 @@ validating international phone numbers.") (home-page "https://github.com/google/libphonenumber") (license license:asl2.0))) - (define-public chatty (package (name "chatty") - (version "0.4.0") + (version "0.6.7") (source (origin (method git-fetch) (uri (git-reference (url "https://source.puri.sm/Librem5/chatty.git") - (commit (string-append "v" version)))) + (commit (string-append "v" version)) + ;; Fetch the required subprojects, notably libcmatrix + ;; which has no releases and is developed in tandem. + ;; Note: this also pulls in libgd, and embeds functionality + ;; from it that is not part of the public API, making + ;; unbundling difficult. + (recursive? #true))) (file-name (git-file-name name version)) (sha256 (base32 - "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d")))) + "11q07vjrrjf3k00kk41vm79brpq0qigz7l328br3g0li979kz32v")))) (build-system meson-build-system) (arguments '(#:phases @@ -2824,12 +2833,25 @@ validating international phone numbers.") (add-after 'unpack 'skip-updating-desktop-database (lambda _ (substitute* "meson.build" - (("meson.add_install_script.*") ""))))))) + (("meson.add_install_script.*") "")))) + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; One test requires a running Xorg server. Start one. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; HOME must be writable for writing configuration files. + (setenv "HOME" "/tmp"))))))) (native-inputs - (list gettext-minimal `(,glib "bin") pkg-config protobuf)) + (list gettext-minimal + `(,glib "bin") + pkg-config + protobuf + xorg-server-for-tests)) (inputs (list feedbackd folks + gnome-desktop gsettings-desktop-schemas gspell json-glib @@ -2910,9 +2932,9 @@ as phones, embedded computers or microcontrollers.") "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (propagated-inputs - (list qtwebengine)) + (list qtwebengine-5)) (home-page "https://movim.eu/") (synopsis "Desktop Application for Movim") (description @@ -3039,8 +3061,8 @@ social and chat platform.") ("qite" ,qite) ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) - ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtmultimedia-5" ,qtmultimedia-5) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("usrsctp" ,usrsctp) ("x11" ,libx11) |