guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 009e23549e925044d3457c5818ed10809d7eee77
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Thu Jan 29 09:44:44 2026 +0900
gnu: jami: Update to 20260126.0.
* gnu/packages/jami.scm (%jami-nightly-version): Bump to 20260126.0.
(%jami-daemon-commit): Update commit.
(libjami): Update to 20260126.0.
[source] <patches>: Delete libjami-simdutf.patch.
[build-system]: Switch to meson.
[#:configure-flags]: Adjust accordingly.
[#:make-flags]: Delete argument.
[#:phases] {sanitize-jami.pc}: New phase.
{delete-static-libraries}: Delete phase.
[native-inputs]: Delete autoconf, automake and libtool.
(jami): Update to 20260126.0.
[source] <patches>: Delete jami-allow-system-zxing-cpp.patch.
[#:configure-flags]: Delete -DENABLE_LIBWRAP=ON.
* gnu/packages/patches/jami-libjami-cmake.patch: Rebase.
* gnu/packages/patches/jami-qwindowkit.patch: Rebase.
* gnu/packages/patches/jami-allow-system-zxing-cpp.patch: Delete file.
* gnu/packages/patches/libjami-simdutf.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Change-Id: I0dc68c620bb11df5f9b31a71a7c514af4624b50e
---
gnu/local.mk | 2 -
gnu/packages/jami.scm | 70 ++++++++--------------
.../patches/jami-allow-system-zxing-cpp.patch | 32 ----------
gnu/packages/patches/jami-libjami-cmake.patch | 17 +++---
gnu/packages/patches/jami-qwindowkit.patch | 6 +-
gnu/packages/patches/libjami-simdutf.patch | 51 ----------------
6 files changed, 38 insertions(+), 140 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 241729add7..daa177a222 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1647,7 +1647,6 @@ dist_patch_DATA =
\
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/ispell-for-linphone-cmake.patch \
- %D%/packages/patches/jami-allow-system-zxing-cpp.patch \
%D%/packages/patches/jami-avutil-link.patch \
%D%/packages/patches/jami-qwindowkit.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
@@ -1696,7 +1695,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libguestfs-syms.patch \
%D%/packages/patches/libinfinity-renew-test-certificate.patch \
%D%/packages/patches/libjami-pkgconf.patch \
- %D%/packages/patches/libjami-simdutf.patch \
%D%/packages/patches/libmaus2-fix-gcc-13-require-include-cstdint.patch
\
%D%/packages/patches/libretro-dolphin-emu-data.patch \
%D%/packages/patches/libretro-dolphin-emu-gc-font-tool.patch \
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 672a8f15d8..a1244cbb7b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -65,7 +65,7 @@
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
#:use-module (guix build-system copy)
- #:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system qt)
#:use-module (guix download)
#:use-module (guix gexp)
@@ -81,8 +81,8 @@
;;; When updating Jami, make sure that the patches used for ffmpeg-jami are up
;;; to date with those listed in
;;;
<https://git.jami.net/savoirfairelinux/jami-daemon/-/blob/master/contrib/src/ffmpeg/rules.mak>.
-(define %jami-nightly-version "20251212.0")
-(define %jami-daemon-commit "663dc3f7b625abcd05e516d819c70fd883a3c9f2")
+(define %jami-nightly-version "20260126.0")
+(define %jami-daemon-commit "60f72b3b957c3d8fcaf5ee58771f7a01dd23a754")
(define-public libjami
(package
@@ -91,49 +91,32 @@
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://review.jami.net/jami-daemon";)
- (commit %jami-daemon-commit)))
+ (url "https://review.jami.net/jami-daemon";)
+ (commit %jami-daemon-commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "1379vq5afqgrjgwhl2qwapzrs9irjsxr2gzm35jrsg31rms5xgzb"))
- (patches (search-patches "libjami-pkgconf.patch"
- "libjami-simdutf.patch"))))
- (outputs '("out" "bin" "debug")) ;"bin' contains jamid
- (build-system gnu-build-system)
+ "07l6zwwp385ryd41bnfga1p6qa640af7llvkx44b688wpj32ir6h"))
+ (patches (search-patches "libjami-pkgconf.patch"))))
+ ;; Reduce the output by about 2 MiB by splitting the seldom used 'jamid'
+ ;; daemon binary to the "bin" output.
+ (outputs '("out" "bin" "debug"))
+ (build-system meson-build-system)
(arguments
(list
- ;; XXX: The test suites reportedly takes 2 h 30 to run by upstream's CI.
- ;; Many tests also fail, within and without the containerized
- ;; environment. Some issues have recently been fixed, so try again in
- ;; the next release. More problematically, it currently fails to build
- ;; at all (see:
<https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1168>).
+ #:configure-flags
+ #~(list "-Dinterfaces=library,dbus"
+ ;; The test suite currently fails to build (see:
+ ;;
<https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1168>).
+ "-Dtests=false")
#:tests? #f
- ;; The agent links the daemon binary with libguile, which enables the
- ;; execution of test plans described in Scheme. It may be useful in
- ;; user scripts too, until more general purpose Scheme bindings are made
- ;; available (see: test/agent/README.md).
- ;; FIXME: compiling the agent currently fails (see:
- ;; <https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1139>).
- #:configure-flags #~(list "--disable-agent" "--enable-debug")
- #:make-flags #~(list"V=1") ;build verbosely
#: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 "daemon"))))
- (add-after 'install 'delete-static-libraries
- ;; Remove 100+ MiB of static libraries. "--disable-static" cannot
- ;; be used as the test suite requires access to private symbols
- ;; not included in the shared library.
- (lambda _
- (for-each delete-file
- (find-files (string-append #$output "/lib")
- "\\.a$"))))
(add-after 'install 'move-jamid
- ;; This reduces the size of the main output, due to not depending
- ;; on sdbus-c++.
(lambda* (#:key outputs #:allow-other-keys)
(let ((libexec (string-append #$output:bin "/libexec"))
(share (string-append #$output:bin "/share")))
@@ -142,12 +125,16 @@
(string-append libexec "/jamid"))
(mkdir-p share)
(rename-file (search-input-directory outputs "share/dbus-1")
- (string-append share "/dbus-1"))))))))
+ (string-append share "/dbus-1")))))
+ (add-after 'install 'sanitize-jami.pc
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; The Meson-generated pkg-config file adds most inputs to
+ ;; Requires.private, which is unnecessary for our shared library
+ ;; use and would require propagating them.
+ (substitute* (search-input-file outputs "lib/pkgconfig/jami.pc")
+ (("^Requires.private:.*") "")))))))
(native-inputs
- (list autoconf
- automake
- cppunit
- libtool
+ (list cppunit
perl ;to generate manpages with pod2man
pkg-config
which))
@@ -157,7 +144,6 @@
dhtnet
eudev
ffmpeg-jami
- ;guile-3.0
jack-1
jsoncpp
libarchive
@@ -237,9 +223,8 @@ QSortFilterProxyModel conveniently exposed for QML.")
(file-name (git-file-name name version))
(sha256
(base32
- "13mpv62pw4f8cb9h8qaplxkn2ydsy9d2fr4v4p54r225ynzbq04h"))
+ "0j1fx7a74hm5y6x301yppp1wg5h6wnmigpvp19rzvpnc64xffsqr"))
(patches (search-patches
- "jami-allow-system-zxing-cpp.patch"
"jami-libjami-cmake.patch"
"jami-qwindowkit.patch"
"jami-avutil-link.patch"))))
@@ -256,9 +241,6 @@ QSortFilterProxyModel conveniently exposed for QML.")
;; Disable the webengine since it grows the closure size by
;; about 450 MiB and requires more resources.
"-DWITH_WEBENGINE=OFF"
- ;; Use libwrap to link directly to libjami instead of
- ;; communicating via D-Bus to jamid, the Jami daemon.
- "-DENABLE_LIBWRAP=ON"
;; Ensure FetchContent contribs are looked from the system.
"-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS")
#:phases
diff --git a/gnu/packages/patches/jami-allow-system-zxing-cpp.patch
b/gnu/packages/patches/jami-allow-system-zxing-cpp.patch
deleted file mode 100644
index 98020613b1..0000000000
--- a/gnu/packages/patches/jami-allow-system-zxing-cpp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31461>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c046b597..3251762e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -714,13 +714,18 @@ else()
- endif()
-
- # ZXing-cpp configuration
--set(ZXING_EXAMPLES OFF CACHE BOOL "")
--set(ZXING_BLACKBOX_TESTS OFF CACHE BOOL "")
--add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
--
--# Add ZXing-cpp to includes and libraries
--list(APPEND CLIENT_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
--list(APPEND CLIENT_LIBS ZXing)
-+pkg_check_modules(zxing IMPORTED_TARGET zxing)
-+if(zxing_FOUND)
-+ message(STATUS "Using system-provided ZXing-cpp")
-+ list(APPEND CLIENT_INCLUDE_DIRS ${zxing_INCLUDE_DIRS})
-+ list(APPEND CLIENT_LIBS PkgConfig::zxing)
-+else()
-+ set(ZXING_EXAMPLES OFF CACHE BOOL "")
-+ set(ZXING_BLACKBOX_TESTS OFF CACHE BOOL "")
-+ add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
-+ list(APPEND CLIENT_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
-+ list(APPEND CLIENT_LIBS ZXing)
-+endif()
-
- # common executable sources
- qt_add_executable(
diff --git a/gnu/packages/patches/jami-libjami-cmake.patch
b/gnu/packages/patches/jami-libjami-cmake.patch
index db9b134a17..9fcefc7968 100644
--- a/gnu/packages/patches/jami-libjami-cmake.patch
+++ b/gnu/packages/patches/jami-libjami-cmake.patch
@@ -1,7 +1,7 @@
Upstream-status: <https://review.jami.net/c/jami-client-qt/+/32711>
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c046b597..8ee7b16d 100644
+index 80017d20..9ece96ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ endif()
@@ -12,17 +12,18 @@ index c046b597..8ee7b16d 100644
endif()
# init some variables for includes, libs, etc.
-@@ -236,9 +235,6 @@ endif()
+@@ -236,8 +235,8 @@ endif()
list(APPEND CMAKE_MODULE_PATH
${PROJECT_SOURCE_DIR}/extras/build/cmake/modules)
if (NOT JAMICORE_AS_SUBDIR)
find_package(LibJami REQUIRED)
- if(LIBJAMI_FOUND)
- include_directories(${LIBJAMI_INCLUDE_DIR})
-- endif()
++ if (NOT TARGET LibJami::LibJami)
++ message(FATAL_ERROR "libjami could not be found")
+ endif()
endif()
- include(FindPython3)
-@@ -751,7 +747,7 @@ if(MSVC)
+@@ -756,7 +755,7 @@ if(MSVC)
WIN32_EXECUTABLE TRUE)
list(APPEND CLIENT_LIBS
@@ -31,7 +32,7 @@ index c046b597..8ee7b16d 100644
${GNUTLS_LIB}
${LIBCLIENT_NAME}
${QT_LIBS}
-@@ -794,7 +790,8 @@ elseif (NOT APPLE)
+@@ -799,7 +798,8 @@ elseif (NOT APPLE)
${LIBNOTIFY_LIBRARIES}
${LIBGDKPIXBUF_LIBRARIES}
${GLIB_LIBRARIES}
@@ -94,7 +95,7 @@ index ee2bf6d9..31ec9c02 100644
message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
-index 5c35e402..94d77523 100644
+index 04cdbc6d..0214d813 100644
--- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt
@@ -47,9 +47,6 @@ endif()
@@ -108,7 +109,7 @@ index 5c35e402..94d77523 100644
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
if(CMAKE_GENERATOR_SHORT MATCHES "Visual Studio ")
diff --git a/src/libclient/qtwrapper/CMakeLists.txt
b/src/libclient/qtwrapper/CMakeLists.txt
-index 761278c9..b4b5a708 100644
+index c412112f..ba4bd5cb 100644
--- a/src/libclient/qtwrapper/CMakeLists.txt
+++ b/src/libclient/qtwrapper/CMakeLists.txt
@@ -39,7 +39,6 @@ else()
diff --git a/gnu/packages/patches/jami-qwindowkit.patch
b/gnu/packages/patches/jami-qwindowkit.patch
index 2946de7765..a256bb317d 100644
--- a/gnu/packages/patches/jami-qwindowkit.patch
+++ b/gnu/packages/patches/jami-qwindowkit.patch
@@ -1,7 +1,7 @@
Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31456>
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c046b597..366758f5 100644
+index 80017d20..30b10471 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,13 +101,13 @@ endif()
@@ -11,7 +11,7 @@ index c046b597..366758f5 100644
- TARGET qwindowkit
+ TARGET QWindowKit
URL https://github.com/stdware/qwindowkit.git
- BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d
+ BRANCH d4536ebe12dd35504abdba66986daf21c0aee805
PATCHES ${QWINDOWKIT_PATCHES}
OPTIONS ${QWINDOWKIT_OPTIONS}
)
@@ -21,7 +21,7 @@ index c046b597..366758f5 100644
# If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index a1aeb22f..94f558e0 100644
+index 33a892b8..502a9434 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -61,7 +61,7 @@ target_include_directories(test_common_obj PRIVATE
diff --git a/gnu/packages/patches/libjami-simdutf.patch
b/gnu/packages/patches/libjami-simdutf.patch
deleted file mode 100644
index cb0c4bc418..0000000000
--- a/gnu/packages/patches/libjami-simdutf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream-status: <https://review.jami.net/c/jami-daemon/+/32708>
-
-diff --git a/configure.ac b/configure.ac
-index 055151670..f6e4ae978 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -590,6 +590,8 @@ PKG_CHECK_MODULES([SECP256K1], [libsecp256k1 >= 0.1],,
- PKG_CHECK_MODULES([FMT], [fmt >= 7.0],,
- AC_MSG_FAILURE([Missing {fmt}]))
-
-+PKG_CHECK_MODULES([SIMDUTF], [simdutf])
-+
- # SHM
- dnl check for shm
- AS_IF([test "x$with_dbus" == xyes],
-diff --git a/meson.build b/meson.build
-index c0f98c7f8..3ad0bd0ba 100644
---- a/meson.build
-+++ b/meson.build
-@@ -32,6 +32,7 @@ deplibavutil = dependency('libavutil', version: '>=
55.75.100')
- depfmt = dependency('fmt', version: '>= 5.3')
- depyamlcpp = dependency('yaml-cpp', version: '>= 0.5.1')
- depjsoncpp = dependency('jsoncpp', version: '>= 1.6.5')
-+depsimdutf = dependency('simdutf')
- depzlib = dependency('zlib')
-
- if get_option('interfaces').contains('dbus')
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8d874223e..cee546126 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -52,6 +52,7 @@ libjami_la_LIBADD += \
- $(FMT_LIBS) \
- $(LIBSSL_LIBS) \
- $(LIBCRYPTO_LIBS) \
-+ $(SIMDUTF_LIBS) \
- $(ZLIB_LIBS)
-
- # XXX: It seems this should be the default value when otherwise left
-diff --git a/src/meson.build b/src/meson.build
-index 22d026abc..bfc809cba 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -140,6 +140,7 @@ libjami_dependencies = [
- depfmt,
- depyamlcpp,
- depjsoncpp,
-+ depsimdutf,
- depzlib,
- depopenssl
- ]
