[PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way

--- a/gnu/packages/qt.scm

- (prepend bash-minimal libxcb md4c)

--- a/gnu/packages/qt.scm

--- a/gnu/packages/qt.scm

- ;; XXX: There are many test failures, because the test suite

- ;; requires a real X server (a virtual one such as Xvfb is not

- ;; enough) or a functional network. It's also quite expensive to

- ;; build and run.

- ((#:tests? _ #f) #f)

- ninja wayland-protocols)))

--- a/gnu/packages/qt.scm

- (package (inherit qtbase-5)

- (method url-fetch)

- (uri (qt5-urls name version))

- (sha256

- (base32

- "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))

--- a/gnu/packages/audio.scm

- (arguments

- `(#:tests? #f)) ;; no tests

- qtbase-5

- qtsvg-5))

--- a/gnu/packages/qt.scm

--- a/gnu/packages/audio.scm

- qtquickcontrols)) ;for Qt examples

--- a/gnu/packages/display-managers.scm

- qtquickcontrols

--- a/gnu/packages/documentation.scm

- ("qtquickcontrols" ,qtquickcontrols)

--- a/gnu/packages/education.scm

- qtquickcontrols

--- a/gnu/packages/engineering.scm

- qtquickcontrols

--- a/gnu/packages/finance.scm

- ("qtquickcontrols" ,qtquickcontrols)

--- a/gnu/packages/jami.scm

- qtquickcontrols

--- a/gnu/packages/kde-multimedia.scm

- qtquickcontrols

- qtquickcontrols

--- a/gnu/packages/kde.scm

- qtquickcontrols

- ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement

- qtquickcontrols

--- a/gnu/packages/linphone.scm

- qtquickcontrols

--- a/gnu/packages/messaging.scm

- qtquickcontrols

--- a/gnu/packages/qt.scm

- (list perl qtdeclarative-5 qtquickcontrols qtserialport))

-(define-public qtquickcontrols

- qtquickcontrols

- "qtquickcontrols"

--- a/gnu/packages/telephony.scm

- qtquickcontrols

--- a/gnu/packages/text-editors.scm

- qtquickcontrols

--- a/gnu/packages/video.scm

- qtquickcontrols

--- a/gnu/packages/vpn.scm

- ("qtquickcontrols" ,qtquickcontrols)

--- a/gnu/packages/qt.scm

--- a/gnu/packages/animation.scm

- (qt '("qt" "qtmultimedia")))

- ("qtmultimedia" ,qtmultimedia)

- (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5))

--- a/gnu/packages/astronomy.scm

- qtmultimedia

--- a/gnu/packages/education.scm

- qtmultimedia

- (list qtbase-5 qtmultimedia))

- qtmultimedia

- qtmultimedia

--- a/gnu/packages/emulators.scm

- qtmultimedia

--- a/gnu/packages/engineering.scm

- ("qtmultimedia" ,qtmultimedia)))

--- a/gnu/packages/games.scm

- qtmultimedia

- (list qtbase-5 qtmultimedia qtsvg-5))

- qtmultimedia

- (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib))

--- a/gnu/packages/graphics.scm

- qtmultimedia

--- a/gnu/packages/irc.scm

- qtmultimedia

--- a/gnu/packages/jami.scm

- qtmultimedia

--- a/gnu/packages/kde-frameworks.scm

- qtmultimedia

--- a/gnu/packages/kde-multimedia.scm

- qtmultimedia

- qtmultimedia

- qtmultimedia

--- a/gnu/packages/kde.scm

- qtmultimedia

- qtmultimedia

- qtmultimedia

--- a/gnu/packages/messaging.scm

- ("qtmultimedia" ,qtmultimedia)

- qtmultimedia

- (list qtbase-5 qtmultimedia))

- qtmultimedia

- qtmultimedia

- ("qtmultimedia" ,qtmultimedia)

--- a/gnu/packages/mpd.scm

- qtmultimedia

--- a/gnu/packages/music.scm

- qtmultimedia

- '("qtbase" "qtmultimedia" "qtsvg-5")))

- '("qtmultimedia"))))

- qtmultimedia

--- a/gnu/packages/networking.scm

- qtmultimedia

--- a/gnu/packages/qt.scm

- (list qtbase-5 qtmultimedia))

-(define-public qtmultimedia

- (package (inherit qtsvg-5)

- (list perl qtdeclarative qtmultimedia qtxmlpatterns))

- qtmultimedia

- ("qtmultimedia" ,qtmultimedia)

- ("qtmultimedia" ,qtmultimedia)

- qtmultimedia

- "qtmultimedia"

--- a/gnu/packages/radio.scm

- ("qtmultimedia" ,qtmultimedia)

- qtmultimedia

- ("qtmultimedia" ,qtmultimedia)

- (list qtbase-5 qtmultimedia))

- qtmultimedia

- qtmultimedia

- (list opus qcustomplot qtbase-5 qtmultimedia qtserialport))

--- a/gnu/packages/text-editors.scm

- qtmultimedia

- '("qtsvg-5" "qtmultimedia"))))))))))

--- a/gnu/packages/video.scm

- qtmultimedia

--- a/gnu/packages/qt.scm

--- a/gnu/packages/qt.scm

--- a/gnu/packages/admin.scm

- (prepend qtbase-5 qtsvg)))

- (qt '("qtbase" "qtsvg")))

--- a/gnu/packages/animation.scm

- (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg))

--- a/gnu/packages/audio.scm

- qtsvg

- ;; qtsvg is still on version 5; use qtbase-5 to match

- qtsvg))

--- a/gnu/packages/backup.scm

- qtsvg))

--- a/gnu/packages/bioinformatics.scm

- (list qtbase-5 qtsvg))

--- a/gnu/packages/bittorrent.scm

- ("qtsvg" ,qtsvg)

--- a/gnu/packages/display-managers.scm

- qtsvg

--- a/gnu/packages/ebook.scm

- ;; lacks 'svg'. Adding qtsvg doesn't fix it, so I'm not sure how

--- a/gnu/packages/education.scm

- qtsvg

- qtsvg

--- a/gnu/packages/electronics.scm

- qtsvg))

--- a/gnu/packages/engineering.scm

- (list boost muparser freetype qtbase-5 qtsvg))

- ("qtsvg" ,qtsvg)

- (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg sqlite))

- qtsvg))

- (list qtbase-5 qtsvg zlib))

- qtsvg

- qtsvg

- qtsvg))

--- a/gnu/packages/finance.scm

- qtsvg

- ("qtsvg" ,qtsvg)

--- a/gnu/packages/game-development.scm

- (list qtbase-5 qtdeclarative qtsvg zlib))

--- a/gnu/packages/games.scm

- qtsvg

- (list qtbase-5 qtsvg))

- qtsvg

- (list qtbase-5 qtmultimedia qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg

- qtsvg

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

- qtsvg))

--- a/gnu/packages/display-managers.scm

- qtquickcontrols2

--- a/gnu/packages/education.scm

- qtquickcontrols2

- qtquickcontrols2

--- a/gnu/packages/engineering.scm

- qtquickcontrols2

--- a/gnu/packages/finance.scm

- ("qtquickcontrols2",qtquickcontrols2)

--- a/gnu/packages/jami.scm

- qtquickcontrols2))

--- a/gnu/packages/kde-frameworks.scm

- qtquickcontrols2

- qtquickcontrols2))

- ("qtquickcontrols2" ,qtquickcontrols2)

--- a/gnu/packages/kde-multimedia.scm

- qtquickcontrols2

- qtquickcontrols2 ; not listed as dependency

--- a/gnu/packages/kde.scm

- qtquickcontrols2

- ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement

- qtquickcontrols2

--- a/gnu/packages/linphone.scm

- qtquickcontrols2

--- a/gnu/packages/messaging.scm

- qtquickcontrols2

- qtquickcontrols2

- qtquickcontrols2

--- a/gnu/packages/music.scm

- qtquickcontrols2

--- a/gnu/packages/qt.scm

-(define-public qtquickcontrols2

- qtquickcontrols2

- "qtquickcontrols2"

--- a/gnu/packages/radio.scm

- qtquickcontrols2

- qtquickcontrols2

--- a/gnu/packages/security-token.scm

- qtquickcontrols2

--- a/gnu/packages/sync.scm

- qtquickcontrols2

--- a/gnu/packages/terminals.scm

- (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal))

- "qtquickcontrols2"))))))))

--- a/gnu/packages/video.scm

- qtquickcontrols2

--- a/gnu/packages/vpn.scm

- ("qtquickcontrols2" ,qtquickcontrols2)

--- a/gnu/packages/audio.scm

- qtdeclarative

- qtdeclarative

--- a/gnu/packages/display-managers.scm

- qtdeclarative

--- a/gnu/packages/documentation.scm

- ("qtdeclarative" ,qtdeclarative)

--- a/gnu/packages/education.scm

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative

--- a/gnu/packages/engineering.scm

- qtdeclarative

- qtdeclarative

--- a/gnu/packages/fcitx5.scm

- ("qtdeclarative" ,qtdeclarative)

--- a/gnu/packages/finance.scm

- ("qtdeclarative" ,qtdeclarative)

--- a/gnu/packages/game-development.scm

- (list qtbase-5 qtdeclarative qtsvg-5 zlib))

- ("qtdeclarative" ,qtdeclarative)

--- a/gnu/packages/games.scm

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative))

- qtdeclarative

- qtdeclarative))

- qtdeclarative))

- qtdeclarative))

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative))

- qtdeclarative))

- qtdeclarative))

- qtdeclarative

- qtdeclarative

- qtdeclarative))

- qtdeclarative))

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative))

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative

- qtdeclarative))

- qtdeclarative

- qtdeclarative))

- qtdeclarative))

- qtdeclarative

- qtdeclarative))

- qtdeclarative

--- a/gnu/packages/geo.scm

- qtdeclarative

- qtdeclarative

--- a/gnu/packages/image-processing.scm

- '("qtbase" "qtdeclarative"))))))))))

- qtdeclarative

--- a/gnu/packages/image-viewers.scm

- qtdeclarative

--- a/gnu/packages/qt.scm

--- a/gnu/packages/qt.scm

--- a/gnu/packages/audio.scm

- qtwebsockets))

--- a/gnu/packages/games.scm

- qtwebsockets

--- a/gnu/packages/qt.scm

-(define-public qtwebsockets

- (list perl qtdeclarative-5 qtwebsockets))

- (list mesa qtbase-5 qtdeclarative-5 qtwebsockets zlib))

- ("qtwebsockets" ,qtwebsockets)

- qtwebsockets

- "qtwebsockets"

--- a/gnu/packages/radio.scm

- qtwebsockets

- qtwebsockets

--- a/gnu/packages/security-token.scm

- qtwebsockets

--- a/gnu/packages/sync.scm

- qtwebsockets

--- a/gnu/packages/video.scm

- qtwebsockets

--- a/gnu/packages/qt.scm

--- a/gnu/packages/audio.scm

- qtwebchannel

--- a/gnu/packages/documentation.scm

- ("qtwebchannel" ,qtwebchannel)

--- a/gnu/packages/education.scm

- qtwebchannel

- qtwebchannel

--- a/gnu/packages/engineering.scm

- qtwebchannel

--- a/gnu/packages/fcitx5.scm

- ("qtwebchannel" ,qtwebchannel)

--- a/gnu/packages/geo.scm

- qtwebchannel

--- a/gnu/packages/image-viewers.scm

- qtwebchannel

--- a/gnu/packages/jami.scm

- qtwebchannel

--- a/gnu/packages/kde-pim.scm

- qtwebchannel

- qtwebchannel

- qtwebchannel

- qtwebchannel

- qtwebchannel

--- a/gnu/packages/kde.scm

- qtwebchannel

- qtwebchannel

--- a/gnu/packages/messaging.scm

- (list qtbase-5 qtdeclarative-5 qtwebchannel))

--- a/gnu/packages/qt.scm

-(define-public qtwebchannel

- qtwebchannel

- ("qtwebchannel" ,qtwebchannel)

- ("qtwebchannel" ,qtwebchannel)

- ("qtwebchannel" ,qtwebchannel)

- qtwebchannel

- "qtwebchannel"

--- a/gnu/packages/sync.scm

- qtwebchannel

--- a/gnu/packages/text-editors.scm

- qtwebchannel))

--- a/gnu/packages/web.scm

- qtwebchannel

--- a/gnu/packages/qt.scm

--- a/gnu/packages/qt.scm

--- a/gnu/packages/audio.scm

- (list qtwebengine))

--- a/gnu/packages/documentation.scm

- (assoc-ref inputs "qtwebengine")

- ("qtwebengine" ,qtwebengine)

--- a/gnu/packages/ebook.scm

- qtwebengine

--- a/gnu/packages/education.scm

- ;; qtwebengine.

- qtwebengine

- ;; `qtwebengine' is included in `pyqtwebengine', included here for easy

- ("qtwebengine" ,qtwebengine)))

- qtwebengine

--- a/gnu/packages/emacs-xyz.scm

- ;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+

--- a/gnu/packages/engineering.scm

- qtwebengine

--- a/gnu/packages/fcitx5.scm

- ("qtwebengine" ,qtwebengine)))

--- a/gnu/packages/geo.scm

- qtwebengine

--- a/gnu/packages/image-viewers.scm

- qtwebengine

--- a/gnu/packages/jami.scm

- qtwebengine

--- a/gnu/packages/kde-pim.scm

- qtwebengine

- qtwebengine

- qtwebengine

- qtwebengine))

- qtwebengine))

- qtwebengine))

--- a/gnu/packages/kde.scm

- (assoc-ref inputs "qtwebengine")

- qtwebengine

- qtwebengine

--- a/gnu/packages/messaging.scm

- (list qtwebengine))

--- a/gnu/packages/qt.scm

-(define-public qtwebengine

- ;; TODO: Try removing "gn" too for future versions of qtwebengine.

- ;; work. Replace with the full path to the qtwebengine

- ;; FIXME: Building qtwebengine 5.12.2 with

- ("qtwebengine" ,qtwebengine)))

- qtwebengine

- "qtwebengine"

--- a/gnu/packages/sync.scm

- (list qtwebengine))

--- a/gnu/packages/text-editors.scm

- (list qtwebengine))

--- a/gnu/packages/vpn.scm

- (assoc-ref inputs "qtwebengine")

- qtwebengine))

--- a/gnu/packages/web-browsers.scm

- ;; While qtwebengine is provided by python-pyqtwebengine, it's

- qtwebengine))

- `(;; FIXME: With the existance of qtwebengine, tests can now run. But

- (assoc-ref inputs "qtwebengine")

--- a/gnu/packages/web.scm

- (assoc-ref inputs "qtwebengine")

- qtwebengine

--- a/gnu/packages/qt.scm

--- a/gnu/packages/jami.scm

- ;; The test suite fails to link when building libjami as a shared library:

- ;; "testAccount_factory.cpp:(.text+0xc52): undefined reference to

- ;; `jami::AccountFactory::AccountFactory()'.

- #:configure-flags #~(list "--disable-agent"

--- a/gnu/packages/jami.scm

-;;; Note: this package will eventually be absorbed into jami itself (the Qt

-;;; client).

-(define-public jami-libclient

- (package

- (name "jami-libclient")

- (version %jami-version)

- (source %jami-sources)

- (build-system cmake-build-system)

- (outputs '("out" "debug"))

- (arguments

- (list

- #:tests? #f ;no test suite

- #:configure-flags

- #~(list (string-append "-DRING_XML_INTERFACES_DIR="

- #$(this-package-input "libjami")

- "/share/dbus-1/interfaces")

- (string-append "-DRING_BUILD_DIR="

- #$(this-package-input "libjami")

- "/include")

- ;; Call to the libraries directly instead of going through DBus

- ;; to avoid issues (see: https://issues.guix.gnu.org/48538).

- "-DENABLE_LIBWRAP=true")

- #:phases

- #~(modify-phases %standard-phases

- (add-after 'unpack 'change-directory/maybe

- (lambda _

- ;; Allow building from the tarball or a git checkout.

- (false-if-exception (chdir "lrc")))))))

- (native-inputs (list qttools vulkan-headers))

- (inputs (list ffmpeg-jami libjami libxkbcommon network-manager))

- (propagated-inputs (list qtbase)) ;qt included in several installed headers

- (synopsis "Jami client library")

- (description "This package provides a library common to all Jami clients.

-Jami is a secure and distributed voice, video and chat communication platform

-that requires no centralized server and leaves the power of privacy in the

-hands of the user. It supports the SIP and IAX protocols, as well as

-decentralized calling using P2P-DHT.")

- (home-page "https://jami.net")

- (license license:gpl3+)))

-

-;;; Remove when 2023 comes.

-(define-public libringclient

- (deprecated-package "libringclient" jami-libclient))

-

- jami-libclient

- (list jami-libclient

- libnotify

--- a/gnu/packages/animation.scm

- (list qttools))

--- a/gnu/packages/astronomy.scm

- ("qttools" ,qttools)))

--- a/gnu/packages/audio.scm

- (list pkg-config qttools))

- (list pkg-config qttools))

- (list ableton-link pkg-config qttools xorg-server-for-tests))

- (list qttools pkg-config))

- qttools))

--- a/gnu/packages/benchmark.scm

- (native-inputs (list extra-cmake-modules qttools))

--- a/gnu/packages/bittorrent.scm

- (list pkg-config qttools))

--- a/gnu/packages/connman.scm

- (list qttools))

--- a/gnu/packages/databases.scm

- (native-inputs (list qttools))

--- a/gnu/packages/display-managers.scm

- (list extra-cmake-modules pkg-config qttools))

--- a/gnu/packages/djvu.scm

- (list autoconf automake libtool pkg-config qttools))

--- a/gnu/packages/education.scm

- qttools

- (list qttools))

- (list qttools))

--- a/gnu/packages/electronics.scm

- (list pkg-config qttools))

--- a/gnu/packages/emulators.scm

- (list pkg-config qttools))

--- a/gnu/packages/engineering.scm

- (list pkg-config qttools))

- (list qttools ; for lrelease

- qttools

- (native-inputs (list qttools))

--- a/gnu/packages/finance.scm

- qttools))

- ;; up executables residing in 'qttools', so we specify them here.

- (assoc-ref %build-inputs "qttools")

- (assoc-ref %build-inputs "qttools")

- qttools))

- qttools))

- qttools))

- ;; up executables residing in 'qttools', so we specify them here.

- (assoc-ref %build-inputs "qttools")

- (assoc-ref %build-inputs "qttools")

- (list qttools))

- (list pkg-config qttools util-linux)) ; provides the hexdump command for tests

--- a/gnu/packages/game-development.scm

- (list qttools))

- (assoc-ref inputs "qttools")

--- a/gnu/packages/games.scm

- qttools

- (list pkg-config qttools))

- ("qttools" ,qttools)))

- ("qttools" ,qttools)

- (list clang-9 ghc pkg-config qttools))

- (list qttools))

--- a/gnu/packages/geo.scm

- (list qttools))

- (list pkg-config qttools))

- ("qttools" ,qttools)))

--- a/gnu/packages/qt.scm

--- a/gnu/local.mk

- %D%/packages/patches/jami-fix-crash-on-quit.patch \

- %D%/packages/patches/jami-images-loading.patch \

- %D%/packages/patches/jami-memory-usage.patch \

- %D%/packages/patches/jami-libclient-audio-managers.patch \

--- a/gnu/packages/jami.scm

-(define %jami-version "20211223.2.37be4c3")

- "client-uwp"))))

- (patches (search-patches "jami-libclient-audio-managers.patch"

- "jami-fix-crash-on-quit.patch"

- "jami-images-loading.patch"

- "jami-memory-usage.patch"))

- "12h4a0nj3gh05w64gkywrrb64agrhn6y3q4b9cqnhvr1vdkzlj0h"))))

- (string-append "ring-project/daemon/contrib/src/"

- "libopusenc-enable-FEC"

- ;; user scripts too, until more generalized Scheme bindings are made

- ;; (see: test/agent/README.md).

- ;; FIXME: Fails to link when building libjami as a shared library:

- ;; bindings.cpp:(.text+0x24): undefined reference to `jami::Logger::log

- ;; [...].

- #:configure-flags #~(list "--disable-agent" "--enable-debug")

- (inputs

- (list libjami network-manager))

- (propagated-inputs

- (list qtbase-5)) ;Qt is included in several installed headers

--- a/gnu/packages/patches/jami-fix-crash-on-quit.patch

-Retrieved from:

-https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/83f68573324a453a6d26e025fd6439f175a79d1b.diff.

-

-With the 'client-qt' prefix added to match the file hierarchy of the release tarball.

-

-diff --git a/client-qt/src/mainapplication.cpp b/client-qt/src/mainapplication.cpp

-index 0c3209fc6fa7c528bec197f1cf9332758170441c..278f19287b86dd2c916935ab0930cbe0abb35d26 100644

---- a/client-qt/src/mainapplication.cpp

-+++ b/client-qt/src/mainapplication.cpp

-@@ -155,7 +155,11 @@ MainApplication::MainApplication(int& argc, char** argv)

- QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); });

- }

-

--MainApplication::~MainApplication() {}

-+MainApplication::~MainApplication()

-+{

-+ engine_.reset();

-+ lrcInstance_.reset();

-+}

-

- bool

- MainApplication::init()

-diff --git a/src/mainapplication.h b/src/mainapplication.h

-index 51306be829478b9fbc1c61a08aeb96938be26dac..4047e3abb3cfd3e6250387a37fa5a896e9bc4161 100644

---- a/client-qt/src/mainapplication.h

-+++ b/client-qt/src/mainapplication.h

-@@ -80,7 +80,6 @@ private:

- private:

- QScopedPointer<QFile> debugFile_;

- QScopedPointer<QQmlApplicationEngine> engine_;

--- a/gnu/packages/patches/jami-images-loading.patch

-From be9dd0d0d8cb4556cd930edd783c0a1699565ac0 Mon Sep 17 00:00:00 2001

-From: kkostiuk <kateryna.kostiuk@savoirfairelinux.com>

-Date: Mon, 1 Nov 2021 17:39:23 -0400

-Subject: [PATCH] conversation: fix long loading time for images

-

-Change-Id: Id88cfbd571f4b504f258758bd13b4e4a91bf1b49

----

- .../DataTransferMessageDelegate.qml | 52 +++++++++++++++++--

- src/messagesadapter.cpp | 20 +++++--

- src/messagesadapter.h | 2 +-

- 3 files changed, 66 insertions(+), 8 deletions(-)

-

-diff --git a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml

-index 7875e01..2e7dcc0 100644

---- a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml

-+++ b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml

-@@ -252,10 +252,11 @@ Loader {

- Loader {

- id: localMediaCompLoader

- anchors.right: isOutgoing ? parent.right : undefined

-+ asynchronous: true

- width: sourceComponent.width

- height: sourceComponent.height

- sourceComponent: mediaInfo.isImage !== undefined ?

-- imageComp :

-+ imageComp : mediaInfo.isAnimatedImage !== undefined ? animatedImageComp :

- avComp

- Component {

- id: avComp

-@@ -302,9 +303,9 @@ Loader {

- }

- }

- Component {

-- id: imageComp

-+ id: animatedImageComp

- AnimatedImage {

-- id: img

-+ id: animatedImg

- anchors.right: isOutgoing ? parent.right : undefined

- property real minSize: 192

- property real maxSize: 256

-@@ -327,6 +328,51 @@ Loader {

- anchors.fill: parent

- }

- layer.enabled: true

-+ layer.effect: OpacityMask {

-+ maskSource: MessageBubble {

-+ out: isOutgoing

-+ type: seq

-+ width: animatedImg.width

-+ height: animatedImg.height

-+ radius: msgRadius

-+ }

-+ }

-+ HoverHandler {

-+ target : parent

-+ onHoveredChanged: {

-+ localMediaMsgItem.hoveredLink = hovered ? animatedImg.source : ""

-+ }

-+ cursorShape: Qt.PointingHandCursor

-+ }

-+ }

-+ }

-+

-+ Component {

-+ id: imageComp

-+ Image {

-+ id: img

-+ anchors.right: isOutgoing ? parent.right : undefined

-+ property real minSize: 192

-+ property real maxSize: 256

-+ cache: true

-+ fillMode: Image.PreserveAspectCrop

-+ mipmap: true

-+ antialiasing: true

-+ autoTransform: false

-+ asynchronous: true

-+ source: "file:///" + Body

-+ property real aspectRatio: implicitWidth / implicitHeight

-+ property real adjustedWidth: Math.min(maxSize,

-+ Math.max(minSize,

-+ innerContent.width - senderMargin))

-+ width: adjustedWidth

-+ height: Math.ceil(adjustedWidth / aspectRatio)

-+ Rectangle {

-+ color: JamiTheme.previewImageBackgroundColor

-+ z: -1

-+ anchors.fill: parent

-+ }

-+ layer.enabled: true

- layer.effect: OpacityMask {

- maskSource: MessageBubble {

- out: isOutgoing

-diff --git a/client-qt/src/messagesadapter.cpp b/client-qt/src/messagesadapter.cpp

-index 91f8eed..ba38e53 100644

---- a/client-qt/src/messagesadapter.cpp

-+++ b/client-qt/src/messagesadapter.cpp

-@@ -458,13 +458,24 @@ MessagesAdapter::conversationTypersUrlToName(const QSet<QString>& typersSet)

- return nameList;

- }

-

--bool

-+QVariantMap

- MessagesAdapter::isLocalImage(const QString& msg)

- {

- QImageReader reader;

- reader.setDecideFormatFromContent(true);

- reader.setFileName(msg);

-- return !reader.read().isNull();

-+ QByteArray fileFormat = reader.format();

-+ if (fileFormat == "gif") {

-+ return {{"isAnimatedImage", true}};

-+ }

-+ QList<QByteArray> supportedFormats = reader.supportedImageFormats();

-+ auto iterator = std::find_if(supportedFormats.begin(),

-+ supportedFormats.end(),

-+ [fileFormat](QByteArray format) { return format == fileFormat; });

-+ if (iterator != supportedFormats.end()) {

-+ return {{"isImage", true}};

-+ }

-+ return {{"isImage", false}};

- }

-

- QVariantMap

-@@ -476,8 +487,9 @@ MessagesAdapter::getMediaInfo(const QString& msg)

- "<%1 style='width:100%;height:%2;outline:none;background-color:#f1f3f4;"

- "object-fit:cover;' "

- "controls controlsList='nodownload' src='file://%3' type='%4'/></body>";

-- if (isLocalImage(msg)) {

-- return {{"isImage", true}};

-+ QVariantMap fileInfo = isLocalImage(msg);

-+ if (fileInfo["isImage"].toBool() || fileInfo["isAnimatedImage"].toBool()) {

-+ return fileInfo;

- }

- QRegularExpression vPattern("[^\\s]+(.*?)\\.(avi|mov|webm|webp|rmvb)$",

- QRegularExpression::CaseInsensitiveOption);

-diff --git a/client-qt/src/messagesadapter.h b/client-qt/src/messagesadapter.h

-index bfa4e62..1965c5e 100644

---- a/client-qt/src/messagesadapter.h

-+++ b/client-qt/src/messagesadapter.h

-@@ -101,7 +101,7 @@ protected:

- Q_INVOKABLE void deleteInteraction(const QString& interactionId);

- Q_INVOKABLE void copyToDownloads(const QString& interactionId, const QString& displayName);

- Q_INVOKABLE void userIsComposing(bool isComposing);

-- Q_INVOKABLE bool isLocalImage(const QString& msg);

-+ Q_INVOKABLE QVariantMap isLocalImage(const QString& msg);

- Q_INVOKABLE QVariantMap getMediaInfo(const QString& msg);

- Q_INVOKABLE bool isRemoteImage(const QString& msg);

- Q_INVOKABLE QString getFormattedTime(const quint64 timestamp);

---

-GitLab

-

--- a/gnu/packages/patches/jami-libclient-audio-managers.patch

-From f5e4619d02526d961c14012a6cae1a091aa149d4 Mon Sep 17 00:00:00 2001

-From: Sébastien Blin <sebastien.blin@savoirfairelinux.com>

-Date: Thu, 27 Jan 2022 13:48:32 -0500

-Subject: [PATCH] misc: link getSupportedAudioManagers

-q

-Change-Id: I897e49cd131d3cbffef9fb1d5c9be3c0bc9bcb3f

-GitLab: #495

----

-

-diff --git a/lrc/src/qtwrapper/configurationmanager_wrap.h b/lrc/src/qtwrapper/configurationmanager_wrap.h

-index a680138..2807f8a 100644

---- a/lrc/src/qtwrapper/configurationmanager_wrap.h

-+++ b/lrc/src/qtwrapper/configurationmanager_wrap.h

-@@ -526,8 +526,7 @@

-

- QStringList getSupportedAudioManagers()

- {

-- QStringList temp;

-- return temp;

-+ return convertStringList(DRing::getSupportedAudioManagers());

- }

-

- QStringList getSupportedTlsMethod()

--- a/gnu/packages/patches/jami-memory-usage.patch

-From e796b3325d95b5ddd6162b5513c8325210f41fc5 Mon Sep 17 00:00:00 2001

-From: Sébastien Blin <sebastien.blin@savoirfairelinux.com>

-Date: Wed, 26 Jan 2022 11:37:07 -0500

-Subject: [PATCH] datatransferimage: improve memory usage

-

-+ Reduce listview caching' size by 50%

-+ use sourceSize to compress images and speedup loading

-+ use autoTransform: true to rotate images when needed

-

-Change-Id: Idf1babdc73f43aa6a79b89428c25c5d06856c0ef

-GitLab: #649

----

-

-diff --git a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml

-index d017c03..ca5913e 100644

---- a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml

-+++ b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml

-@@ -255,9 +255,13 @@

- asynchronous: true

- width: sourceComponent.width

- height: sourceComponent.height

-- sourceComponent: mediaInfo.isImage !== undefined ?

-- imageComp : mediaInfo.isAnimatedImage !== undefined ? animatedImageComp :

-- avComp

-+ sourceComponent: {

-+ if (mediaInfo.isImage)

-+ return imageComp

-+ if (mediaInfo.isAnimatedImage)

-+ return animatedImageComp

-+ return avComp

-+ }

- Component {

- id: avComp

-

--- a/gnu/packages/kde-internet.scm

- qtnetworkauth

--- a/gnu/packages/kde-pim.scm

- qtnetworkauth

--- a/gnu/packages/kde.scm

- qtnetworkauth

--- a/gnu/packages/qt.scm

-(define-public qtnetworkauth

--- a/gnu/packages/jami.scm

- `(#:tests? #f ;no test suite

- #:phases

- (modify-phases %standard-phases

- (add-after 'unpack 'change-directory/maybe

- (lambda _

- ;; Allow building from the tarball or a git checkout.

- (false-if-exception (chdir "client-qt"))))

- (add-after 'change-directory/maybe 'fix-version-string

- (lambda _

- (substitute* "src/version.h"

- (("VERSION_STRING")

- "BUILD_DATE") ;to avoid a redefinition error

- (("// clang-format on.*" anchor)

- (string-append "const char VERSION_STRING[] = \""

- ,version "\";\n"

- anchor)))))

- (add-after 'change-directory/maybe 'use-desktop-opengl

- ;; TODO: Remove after next release; this is no longer specified in

- ;; the source following the update to Qt 6.

- (lambda _

- (substitute* "src/main.cpp"

- (("Qt::AA_UseOpenGLES")

- "Qt::AA_UseDesktopOpenGL")))))))

- (list pkg-config python qttools-5 doxygen graphviz))

- (list libnotify

- qtsvg-5

- qtwebengine-5

- qtwebchannel-5

- qtmultimedia-5

- qtdeclarative-5

- qtgraphicaleffects

- qtquickcontrols-5

- qtquickcontrols2-5))

--- a/gnu/packages/qt.scm

--- a/guix/build-system/qt.scm

--- a/guix/build/qt-utils.scm

-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>

-(define (variables-for-wrapping base-directories output-directory)

- ;; The following variables can be extended by the user, but not

- ;; overridden, to ensure proper operation.

- '("QT_PLUGIN_PATH" prefix directory "/lib/qt5/plugins")

- '("QML2_IMPORT_PATH" prefix directory "/lib/qt5/qml")

- '("QTWEBENGINEPROCESS_PATH" = regular

- "/lib/qt5/libexec/QtWebEngineProcess"))))

- qt-wrap-excluded-inputs)

- output-dir)))

- (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs))

- #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs))

- #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)

--- a/gnu/packages/jami.scm

-(define-public jami-gnome

- (package

- (name "jami-gnome")

- (version %jami-version)

- (source %jami-sources)

- (outputs '("out" "debug"))

- (build-system cmake-build-system)

- (arguments

- `(#:tests? #f ;no test suite

- #:imported-modules (,@%cmake-build-system-modules

- (guix build glib-or-gtk-build-system))

- #:modules ((guix build cmake-build-system)

- ((guix build glib-or-gtk-build-system) #:prefix gtk:)

- (guix build utils))

- #:phases

- (modify-phases %standard-phases

- (add-after 'unpack 'change-directory/maybe

- (lambda _

- ;; Allow building from the tarball or a git checkout.

- (false-if-exception (chdir "client-gnome"))))

- (add-after 'change-directory/maybe 'fix-webkit-detection

- (lambda _

- (substitute* "CMakeLists.txt"

- (("WEBKIT webkit2gtk-4.0")

- "WEBKIT webkit2gtk-4.1"))))

- (add-after 'change-directory/maybe 'fix-version-string

- (lambda _

- (substitute* "CMakeLists.txt"

- (("^# Set VERSION.*" anchor)

- (string-append anchor

- "set(PROJECT_VERSION \"" ,version "\")\n")))))

- (add-after 'install 'glib-or-gtk-compile-schemas

- (assoc-ref gtk:%standard-phases 'glib-or-gtk-compile-schemas))

- (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap

- (assoc-ref gtk:%standard-phases 'glib-or-gtk-wrap)))))

- (inputs

- (list clutter

- clutter-gtk

- gtk+

- libcanberra

- libappindicator

- libnotify

- network-manager

- qrencode

- sqlite

- webkitgtk))

- (native-inputs

- (list pkg-config

- gettext-minimal

- `(,glib "bin"))) ;for glib-compile-resources

- (synopsis "Jami client for GNOME")

- (description "This package provides a Jami client for the GNOME desktop.

-Jami is a secure and distributed voice, video and chat communication platform

-that requires no centralized server and leaves the power of privacy in the

-hands of the user. It supports the SIP and IAX protocols, as well as

-decentralized calling using P2P-DHT.")

- (home-page "https://jami.net")

- (license license:gpl3+)))

-