guix_mirror_bot pushed a commit to branch master
in repository guix.
commit e92dafb302ca3a01538652f364cbd01f88d32853
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Feb 9 14:00:34 2026 +0900
gnu: jami: Update to 20260206.0.
* gnu/packages/jami.scm (libjami, jami): Update to 20260206.0.
* gnu/packages/patches/jami-libjami-cmake.patch: Update patch.
* gnu/packages/patches/jami-qwindowkit.patch
* gnu/packages/patches/libjami-pkgconf.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Change-Id: I9484cb85d8c82ebbc86be9046d155fa53bb6e07a
---
gnu/local.mk | 2 -
gnu/packages/jami.scm | 10 +--
gnu/packages/patches/jami-libjami-cmake.patch | 119 +++++++++++++++++++-------
gnu/packages/patches/jami-qwindowkit.patch | 35 --------
gnu/packages/patches/libjami-pkgconf.patch | 15 ----
5 files changed, 90 insertions(+), 91 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 2d914a7f5e..ff04a385d6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1652,7 +1652,6 @@ dist_patch_DATA =
\
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/ispell-for-linphone-cmake.patch \
%D%/packages/patches/jami-avutil-link.patch \
- %D%/packages/patches/jami-qwindowkit.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
%D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
@@ -1698,7 +1697,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \
%D%/packages/patches/libguestfs-syms.patch \
%D%/packages/patches/libinfinity-renew-test-certificate.patch \
- %D%/packages/patches/libjami-pkgconf.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 371f6c3659..1f0ca4455d 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -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 "20260126.0")
-(define %jami-daemon-commit "60f72b3b957c3d8fcaf5ee58771f7a01dd23a754")
+(define %jami-nightly-version "20260206.0")
+(define %jami-daemon-commit "55dd53736b9e6cd7204cc17e01d10d8a9276618f")
(define-public libjami
(package
@@ -96,8 +96,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "07l6zwwp385ryd41bnfga1p6qa640af7llvkx44b688wpj32ir6h"))
- (patches (search-patches "libjami-pkgconf.patch"))))
+ "13ira3yb3qwlk9gcd4slbdvrjfabdg5vbgdwsrqrp66m8ylvmnd7"))))
;; Reduce the output by about 2 MiB by splitting the seldom used 'jamid'
;; daemon binary to the "bin" output.
(outputs '("out" "bin" "debug"))
@@ -223,10 +222,9 @@ QSortFilterProxyModel conveniently exposed for QML.")
(file-name (git-file-name name version))
(sha256
(base32
- "0j1fx7a74hm5y6x301yppp1wg5h6wnmigpvp19rzvpnc64xffsqr"))
+ "1dcx4ckfrr9as2697vk20mmxcxq591hzim0dka9yxjspfkkkcbmh"))
(patches (search-patches
"jami-libjami-cmake.patch"
- "jami-qwindowkit.patch"
"jami-avutil-link.patch"))))
(build-system qt-build-system)
(outputs '("out" "debug"))
diff --git a/gnu/packages/patches/jami-libjami-cmake.patch
b/gnu/packages/patches/jami-libjami-cmake.patch
index 9fcefc7968..3c95b990b1 100644
--- a/gnu/packages/patches/jami-libjami-cmake.patch
+++ b/gnu/packages/patches/jami-libjami-cmake.patch
@@ -1,7 +1,5 @@
-Upstream-status: <https://review.jami.net/c/jami-client-qt/+/32711>
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80017d20..9ece96ef 100644
+index 979dae2a..21adb2fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ endif()
@@ -12,41 +10,43 @@ index 80017d20..9ece96ef 100644
endif()
# init some variables for includes, libs, etc.
-@@ -236,8 +235,8 @@ endif()
+@@ -226,11 +225,9 @@ submodules afterwards. You can do so by running \"git
submodule \
+ update --init\" in the repository.")
+ endif()
list(APPEND CMAKE_MODULE_PATH
${PROJECT_SOURCE_DIR}/extras/build/cmake/modules)
- if (NOT JAMICORE_AS_SUBDIR)
- find_package(LibJami REQUIRED)
+-if (NOT JAMICORE_AS_SUBDIR)
+- find_package(LibJami REQUIRED)
- if(LIBJAMI_FOUND)
- include_directories(${LIBJAMI_INCLUDE_DIR})
-+ if (NOT TARGET LibJami::LibJami)
-+ message(FATAL_ERROR "libjami could not be found")
- endif()
+- endif()
++find_package(LibJami REQUIRED)
++if (NOT TARGET LibJami::LibJami)
++ message(FATAL_ERROR "libjami could not be found")
endif()
-@@ -756,7 +755,7 @@ if(MSVC)
+ include(FindPython3)
+@@ -755,6 +752,8 @@ foreach(MODULE ${QT_MODULES})
+ list(APPEND QT_LIBS "Qt::${MODULE}")
+ endforeach()
+
++list(APPEND CLIENT_LIBS LibJami::LibJami)
++
+ if(MSVC)
+ # Makes it a GUI executable instead of a console application
+ set_target_properties(
+@@ -763,7 +762,6 @@ if(MSVC)
WIN32_EXECUTABLE TRUE)
list(APPEND CLIENT_LIBS
- ${LIBJAMI_LIB}
-+ LibJami::LibJami
${GNUTLS_LIB}
${LIBCLIENT_NAME}
${QT_LIBS}
-@@ -799,7 +798,8 @@ elseif (NOT APPLE)
- ${LIBNOTIFY_LIBRARIES}
- ${LIBGDKPIXBUF_LIBRARIES}
- ${GLIB_LIBRARIES}
-- ${GIO_LIBRARIES})
-+ ${GIO_LIBRARIES}
-+ LibJami::LibJami)
-
- install(
- TARGETS ${PROJECT_NAME}
diff --git a/extras/build/cmake/modules/FindLibJami.cmake
b/extras/build/cmake/modules/FindLibJami.cmake
-index ee2bf6d9..31ec9c02 100644
+index ee2bf6d9..92cd9e55 100644
--- a/extras/build/cmake/modules/FindLibJami.cmake
+++ b/extras/build/cmake/modules/FindLibJami.cmake
-@@ -14,17 +14,26 @@
+@@ -14,17 +14,38 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
@@ -57,11 +57,23 @@ index ee2bf6d9..31ec9c02 100644
-# LIBJAMI_LIB - path to libjami or libring library
+# Once done, this find module will set the LibJami::LibJami imported
+# target, which references all what is needed (headers, libraries,
-+# dependencies).
++# dependencies). A pure interface variant target, LibJami::Headers, is
++# also defined. It can be used if only the headers are required.
set(LIBJAMI_FOUND true)
++# Do not use ALIAS as these are not in the global scope.
++function(create_libjami_target backend_target)
++ add_library(LibJami::LibJami INTERFACE IMPORTED GLOBAL)
++ target_link_libraries(LibJami::LibJami INTERFACE ${backend_target})
++endfunction()
++
if(WITH_DAEMON_SUBMODULE)
++ if(JAMICORE_AS_SUBDIR)
++ create_libjami_target(jami-core)
++ message(STATUS "Using jami-core CMake project directly as libjami")
++ return()
++ endif()
set(LIBJAMI_INCLUDE_DIR ${DAEMON_DIR}/src/jami)
else()
+ # Preferably find libjami via pkg-config.
@@ -69,7 +81,7 @@ index ee2bf6d9..31ec9c02 100644
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(LIBJAMI QUIET IMPORTED_TARGET jami)
+ if(LIBJAMI_FOUND)
-+ add_library(LibJami::LibJami ALIAS PkgConfig::LIBJAMI)
++ create_libjami_target(PkgConfig::LIBJAMI)
+ message(STATUS "Found LibJami via pkg-config")
+ return()
+ endif()
@@ -78,36 +90,77 @@ index ee2bf6d9..31ec9c02 100644
find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
if(NOT LIBJAMI_INCLUDE_DIR)
message(STATUS "Jami daemon headers not found!
-@@ -109,5 +118,15 @@ endif()
+@@ -109,5 +130,16 @@ endif()
# Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})
+-message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
+-message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
+# Assemble a CMake imported target with the above information gathered
+# by other means than pkg-config.
+if(LIBJAMI_FOUND AND LIBJAMI_LIB AND LIBJAMI_INCLUDE_DIR)
-+ add_library(LibJami::LibJami UNKNOWN IMPORTED)
++ add_library(LibJami::LibJami UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(LibJami::LibJami PROPERTIES
+ IMPORTED_LOCATION "${LIBJAMI_LIB}"
+ INTERFACE_INCLUDE_DIRECTORIES "${LIBJAMI_INCLUDE_DIR}"
+ )
++ message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
++ message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
++else()
++ message(WARNING "Could not find Jami library")
+endif()
-+
- 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 04cdbc6d..0214d813 100644
+index 04cdbc6d..26744a6e 100644
--- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt
-@@ -47,9 +47,6 @@ endif()
+@@ -46,10 +46,6 @@ if(NOT DEFINED EXTRAS_DIR)
+ endif()
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
- find_package(LibJami REQUIRED)
+-find_package(LibJami REQUIRED)
-if(LIBJAMI_FOUND)
- include_directories(${LIBJAMI_INCLUDE_DIR})
-endif()
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
if(CMAKE_GENERATOR_SHORT MATCHES "Visual Studio ")
+@@ -202,10 +198,6 @@ Qt${QT_VERSION_MAJOR} enabled.")
+ add_subdirectory(qtwrapper)
+ include_directories(qtwrapper)
+
+- if(JAMICORE_AS_SUBDIR)
+- add_dependencies(qtwrapper jami-core)
+- endif()
+-
+ if(${VERBOSE_IPC} MATCHES true)
+ message(STATUS "Adding more debug output")
+ add_definitions(-DVERBOSE_IPC=true)
+@@ -454,16 +446,6 @@ add_library(${LIBCLIENT_NAME} STATIC
+ ${LIBCLIENT_HEADERS_API}
+ ${LIBCLIENT_HEADERS_MOC})
+
+-if(JAMICORE_AS_SUBDIR)
+- # Define the project dependencies depending on the build type.
+- if(ENABLE_LIBWRAP)
+- add_dependencies(qtwrapper jami-core)
+- add_dependencies(${LIBCLIENT_NAME} qtwrapper)
+- else()
+- add_dependencies(${LIBCLIENT_NAME} jami-core)
+- endif()
+-endif()
+-
+ foreach(QT_LIB ${QT_LIBS})
+ target_link_libraries(${LIBCLIENT_NAME} ${QT_LIB})
+ endforeach()
+@@ -479,6 +461,8 @@ if(ENABLE_LIBWRAP)
+ if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
+ target_link_libraries(${LIBCLIENT_NAME} ${AVUTIL_LIBRARY})
+ endif()
++else()
++ target_link_libraries(${LIBCLIENT_NAME} LibJami::LibJami)
+ endif()
+ if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
+ target_link_libraries(${LIBCLIENT_NAME} -lpthread)
diff --git a/src/libclient/qtwrapper/CMakeLists.txt
b/src/libclient/qtwrapper/CMakeLists.txt
index c412112f..ba4bd5cb 100644
--- a/src/libclient/qtwrapper/CMakeLists.txt
diff --git a/gnu/packages/patches/jami-qwindowkit.patch
b/gnu/packages/patches/jami-qwindowkit.patch
deleted file mode 100644
index a256bb317d..0000000000
--- a/gnu/packages/patches/jami-qwindowkit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31456>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80017d20..30b10471 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -101,13 +101,13 @@ endif()
-
- # qwindowkit (frameless window)
- add_fetch_content(
-- TARGET qwindowkit
-+ TARGET QWindowKit
- URL https://github.com/stdware/qwindowkit.git
- BRANCH d4536ebe12dd35504abdba66986daf21c0aee805
- PATCHES ${QWINDOWKIT_PATCHES}
- OPTIONS ${QWINDOWKIT_OPTIONS}
- )
--list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
-+
- list(APPEND CLIENT_LIBS QWindowKit::Quick)
-
- # If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 33a892b8..502a9434 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -61,7 +61,7 @@ target_include_directories(test_common_obj PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/src)
- target_link_directories(test_common_obj PRIVATE ${CLIENT_LINK_DIRS})
--target_link_libraries(test_common_obj ${QML_TEST_LIBS})
-+target_link_libraries(test_common_obj ${QML_TEST_LIBS} ${CLIENT_LIBS})
- target_compile_definitions(test_common_obj PRIVATE BUILD_TESTING="ON")
-
- set(COMMON_TESTS_SOURCES
diff --git a/gnu/packages/patches/libjami-pkgconf.patch
b/gnu/packages/patches/libjami-pkgconf.patch
deleted file mode 100644
index 34639fe28a..0000000000
--- a/gnu/packages/patches/libjami-pkgconf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-status: <https://review.jami.net/c/jami-daemon/+/32709>
-
-diff --git a/jami.pc.in b/jami.pc.in
-index fb8bac58a..3b741e7ed 100644
---- a/jami.pc.in
-+++ b/jami.pc.in
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/jami
-
- Name: jami
- Description: Jami core library and daemon
