gnu: jami: Update to 20220726.1515.da8d1da.
* gnu/packages/jami.scm (jami): Update to 20220726.1515.da8d1da. [configure-flags]: New argument. [phases]{fix-version-string}: Adjust file name. {use-desktop-opengl}: Delete obsolete phase. {patch-source}: New phase. [native-inputs]: Add googletest and vulkan-headers. Replace qttools-5 with qttools. [inputs]: Add libxkbcommon, qt5compat, qtnetworkauth, qtpositioning and vulkan-loader. Remove qtwebengine-5, qtwebchannel-5, qtgraphicaleffects, qtquickcontrols-5 and qtquickcontrols2-5. Update qtsvg-5, qtmultimedia-5 and qtdeclarative-5 to their Qt 6 equivalent.
This commit is contained in:
parent
f80f1667f1
commit
ccf6401d05
@ -482,43 +482,68 @@ protocols, as well as decentralized calling using P2P-DHT.")
|
|||||||
(build-system qt-build-system)
|
(build-system qt-build-system)
|
||||||
(outputs '("out" "debug"))
|
(outputs '("out" "debug"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ;no test suite
|
(list
|
||||||
#:phases
|
#:qtbase qtbase
|
||||||
(modify-phases %standard-phases
|
#:tests? #f ;see comment below
|
||||||
(add-after 'unpack 'change-directory/maybe
|
#:configure-flags
|
||||||
(lambda _
|
;; The test suite fails to build with:
|
||||||
;; Allow building from the tarball or a git checkout.
|
;; "../../../client-qt/src/app/utils.h:29:10: fatal error: QLabel: No
|
||||||
(false-if-exception (chdir "client-qt"))))
|
;; such file or directory".
|
||||||
(add-after 'change-directory/maybe 'fix-version-string
|
#~(list "-DENABLE_TESTS=OFF"
|
||||||
(lambda _
|
"-DWITH_WEBENGINE=OFF" ;reduce transitive closure size by 450 MiB
|
||||||
(substitute* "src/version.h"
|
;; Use libwrap to link directly to libjami instead of
|
||||||
(("VERSION_STRING")
|
;; communicating via D-Bus to jamid, the Jami daemon.
|
||||||
"BUILD_DATE") ;to avoid a redefinition error
|
"-DENABLE_LIBWRAP=ON"
|
||||||
(("// clang-format on.*" anchor)
|
(string-append "-DLIBJAMI_XML_INTERFACES_DIR="
|
||||||
(string-append "const char VERSION_STRING[] = \""
|
#$(this-package-input "libjami")
|
||||||
,version "\";\n"
|
"/share/dbus-1/interfaces")
|
||||||
anchor)))))
|
(string-append "-DLIBJAMI_INCLUDE_DIR="
|
||||||
(add-after 'change-directory/maybe 'use-desktop-opengl
|
#$(this-package-input "libjami") "/include/jami"))
|
||||||
;; TODO: Remove after next release; this is no longer specified in
|
#:phases
|
||||||
;; the source following the update to Qt 6.
|
#~(modify-phases %standard-phases
|
||||||
(lambda _
|
(add-after 'unpack 'change-directory/maybe
|
||||||
(substitute* "src/main.cpp"
|
(lambda _
|
||||||
(("Qt::AA_UseOpenGLES")
|
;; Allow building from the tarball or a git checkout.
|
||||||
"Qt::AA_UseDesktopOpenGL")))))))
|
(false-if-exception (chdir "client-qt"))))
|
||||||
|
(add-after 'change-directory/maybe 'fix-version-string
|
||||||
|
(lambda _
|
||||||
|
(substitute* "src/app/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 'patch-source
|
||||||
|
(lambda _
|
||||||
|
(substitute* "src/libclient/CMakeLists.txt"
|
||||||
|
;; Fix submitted upstream (see:
|
||||||
|
;; https://review.jami.net/c/jami-client-qt/+/21830).
|
||||||
|
(("target_link_libraries\\(\\$\\{LIBCLIENT_NAME} qtwrapper.*" all)
|
||||||
|
(string-append
|
||||||
|
all " target_link_libraries(${LIBCLIENT_NAME} avutil)\n"))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config python qttools-5 doxygen graphviz))
|
(list googletest
|
||||||
|
pkg-config
|
||||||
|
python
|
||||||
|
qttools
|
||||||
|
doxygen
|
||||||
|
graphviz
|
||||||
|
vulkan-headers))
|
||||||
(inputs
|
(inputs
|
||||||
(list libnotify
|
(list ffmpeg-jami
|
||||||
|
libjami
|
||||||
|
libnotify
|
||||||
|
libxkbcommon
|
||||||
network-manager
|
network-manager
|
||||||
qrencode
|
qrencode
|
||||||
qtsvg-5
|
qt5compat
|
||||||
qtwebengine-5
|
qtdeclarative
|
||||||
qtwebchannel-5
|
qtmultimedia
|
||||||
qtmultimedia-5
|
qtnetworkauth
|
||||||
qtdeclarative-5
|
qtpositioning
|
||||||
qtgraphicaleffects
|
qtsvg
|
||||||
qtquickcontrols-5
|
vulkan-loader))
|
||||||
qtquickcontrols2-5))
|
|
||||||
(home-page "https://jami.net")
|
(home-page "https://jami.net")
|
||||||
(synopsis "Qt Jami client")
|
(synopsis "Qt Jami client")
|
||||||
(description "This package provides the Jami Qt client. Jami is a secure
|
(description "This package provides the Jami Qt client. Jami is a secure
|
||||||
|
Loading…
Reference in New Issue
Block a user