diff options
| author | Maxim Cournoyer <[email protected]> | 2024-03-26 16:44:05 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2024-04-03 18:05:12 -0400 |
| commit | 64e1797e213d69c62b5f33bc6d5fe5ae107209e6 (patch) | |
| tree | 931fe960747048f3c01f9e4149b728871202a4b2 /gnu/packages/patches/jami-unbundle-dependencies.patch | |
| parent | 4a301dae2bb33782933e2f112005b5d0ea813e62 (diff) | |
gnu: jami: Update to 20240325.0.
* gnu/packages/jami.scm
(libjami): Update to 20240325.0.
[make-flags]: Reinstate ut_media_player test.
[phases]: Remove obsolete extend-scheduler-test-timeout phase.
(jami): Update to 20240325.0.
[source]: Remove jami-qml-tests-discovery patch. Add jami-qwindowkit and
jami-tests-qtwebengine-ifdef-to-if patches.
[configure-flags]: Add -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS.
Replace -DENABLE_TESTS=ON with -DBUILD_TESTING=ON.
[phases] <check>: Update comment for QML test suite.
[native-inputs]: Add qthttpserver and qtwebsockets.
[inputs]: Add qwindowkit.
* gnu/packages/patches/jami-qml-tests-discovery.patch: Delete file.
* gnu/packages/patches/jami-unbundle-dependencies.patch: Update patch.
* gnu/packages/patches/jami-qwindowkit.patch: New file.
* gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
Change-Id: I5d47bdfd2aabab5baff44db8436051a9890cba6d
Diffstat (limited to 'gnu/packages/patches/jami-unbundle-dependencies.patch')
| -rw-r--r-- | gnu/packages/patches/jami-unbundle-dependencies.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/patches/jami-unbundle-dependencies.patch b/gnu/packages/patches/jami-unbundle-dependencies.patch index dab82b26cb..2732087daf 100644 --- a/gnu/packages/patches/jami-unbundle-dependencies.patch +++ b/gnu/packages/patches/jami-unbundle-dependencies.patch @@ -16,13 +16,14 @@ Change-Id: I637959fefce6a21b0ee73a793acb6c3c42dcdce0 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 38e7a4e2..3f1bd599 100644 +index e802357f..6d2dccfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -545,19 +545,33 @@ add_subdirectory(3rdparty/SortFilterProxyModel) +@@ -600,20 +600,34 @@ add_subdirectory(3rdparty/SortFilterProxyModel) set(SFPM_OBJECTS $<TARGET_OBJECTS:SortFilterProxyModel>) # md4c +-set(BUILD_MD2HTML_EXECUTABLE OFF CACHE BOOL "Don't build md2html executable" FORCE) -set(BUILD_SHARED_LIBS OFF CACHE BOOL "Don't build shared md4c library" FORCE) -add_subdirectory(3rdparty/md4c EXCLUDE_FROM_ALL) -list(APPEND CLIENT_LINK_DIRS ${MD4C_BINARY_DIR}/src) @@ -34,6 +35,7 @@ index 38e7a4e2..3f1bd599 100644 + list(APPEND CLIENT_LIBS md4c::md4c-html) +else() + message("Using bundled md4c-html library") ++ set(BUILD_MD2HTML_EXECUTABLE OFF CACHE BOOL "Don't build md2html executable" FORCE) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Don't build shared md4c library" FORCE) + add_subdirectory(3rdparty/md4c EXCLUDE_FROM_ALL) + list(APPEND CLIENT_LINK_DIRS ${MD4C_BINARY_DIR}/src) |