mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
8237f4e997
* gnu/packages/jami.scm (%jami-version): Rename to... (%jami-nightly-version): ... this. Update to 20231222.2. (%jami-daemon-commit): New variable. (%jami-sources): Delete variable. (libjami) Adjust source to use %jami-nightly-version, %jami-daemon-commit. [source]: Fetch from git. Apply libjami-ac-config-files.patch. [arguments] <make-flags>: Skip ut_media_player test. <phases>: Add extend-scheduler-test-timeout and extend-scheduler-test-timeout phases. [inputs]: Replace dbus-c++ with sdbus-c++. Add dhtnet. Replace libgit2 with libgit2-1.6. (jami): Set version to %jami-nightly-version. [source]: Fetch from git. Apply new jami-qml-tests-discovery.patch, jami-skip-tests-requiring-internet.patch and jami-unbundle-dependencies.patch patches. [arguments] <configure-flags>: Add -DWITH_DAEMON_SUBMODULE=OFF. <phases>: Delete change-directory/maybe. Adjust check phase. Add fake-x11-environment, copy-3rdparty-source-dependencies and disable-problematic-tests phases. [inputs]: Add md4c and tidy-html. * gnu/packages/patches/jami-qml-tests-discovery.patch: New file. * gnu/packages/patches/libjami-ac-config-files.patch: Likewise. * gnu/packages/patches/jami-skip-tests-requiring-internet.patch: Likewise. * gnu/packages/patches/jami-unbundle-dependencies.patch: Likewise. * gnu/packages/patches/jami-libjami-headers-search.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/patches/jami-disable-integration-tests.patch: Adjust patch. Series-changes: 2 - Update Jami to latest nightly version (20231222.2) Change-Id: If30f1178bdfa29c4ea3e54dbb7997e360788adae
91 lines
3.6 KiB
Diff
91 lines
3.6 KiB
Diff
It was applied, then reverted (by mistake?) in 4d2c55348bc014.
|
|
|
|
It's been resubmitted here:
|
|
https://lists.gnu.org/archive/html/jami/2024-01/msg00005.html
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8d71b84b..36729698 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -136,7 +136,7 @@ set(CMAKE_MODULE_PATH
|
|
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
|
|
find_package(LibJami REQUIRED)
|
|
if(LIBJAMI_FOUND)
|
|
- include_directories(${LIBJAMI_INCLUDE_DIRS})
|
|
+ include_directories(${LIBJAMI_INCLUDE_DIR})
|
|
endif()
|
|
|
|
include(FindPython3)
|
|
diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake
|
|
index 5cce45fc..11746cd8 100644
|
|
--- a/extras/build/cmake/modules/FindLibJami.cmake
|
|
+++ b/extras/build/cmake/modules/FindLibJami.cmake
|
|
@@ -20,30 +20,19 @@
|
|
|
|
# Once done, this find module will set:
|
|
#
|
|
-# LIBJAMI_INCLUDE_DIRS - libjami include directories
|
|
+# LIBJAMI_INCLUDE_DIR - libjami include directory
|
|
# LIBJAMI_FOUND - whether it was able to find the include directories
|
|
# LIBJAMI_LIB - path to libjami or libring library
|
|
|
|
set(LIBJAMI_FOUND true)
|
|
|
|
if(WITH_DAEMON_SUBMODULE)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${DAEMON_DIR}/src/jami)
|
|
+ set(LIBJAMI_INCLUDE_DIR ${DAEMON_DIR}/src/jami)
|
|
else()
|
|
- if(EXISTS ${LIBJAMI_INCLUDE_DIR}/jami.h)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_INCLUDE_DIR})
|
|
- elseif(EXISTS ${LIBJAMI_BUILD_DIR}/jami/jami.h)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_BUILD_DIR}/jami)
|
|
- elseif(EXISTS ${RING_INCLUDE_DIR}/jami.h)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${RING_INCLUDE_DIR})
|
|
- elseif(EXISTS ${RING_BUILD_DIR}/jami/jami.h)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
|
|
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
|
|
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h)
|
|
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami)
|
|
- else()
|
|
+ find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
|
|
+ if(NOT LIBJAMI_INCLUDE_DIR)
|
|
message(STATUS "Jami daemon headers not found!
|
|
-Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
|
|
+To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE")
|
|
set(LIBJAMI_FOUND false)
|
|
endif()
|
|
endif()
|
|
@@ -115,5 +104,5 @@ 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_DIRS})
|
|
+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 144efaf5..cb87fc2a 100644
|
|
--- a/src/libclient/CMakeLists.txt
|
|
+++ b/src/libclient/CMakeLists.txt
|
|
@@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
|
|
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
|
|
find_package(LibJami REQUIRED)
|
|
if(LIBJAMI_FOUND)
|
|
- include_directories(${LIBJAMI_INCLUDE_DIRS})
|
|
+ include_directories(${LIBJAMI_INCLUDE_DIR})
|
|
endif()
|
|
|
|
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
|
|
diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt
|
|
index 46887051..a20658ad 100644
|
|
--- a/src/libclient/qtwrapper/CMakeLists.txt
|
|
+++ b/src/libclient/qtwrapper/CMakeLists.txt
|
|
@@ -46,7 +46,7 @@ else()
|
|
endif()
|
|
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
|
-include_directories(${LIBJAMI_INCLUDE_DIRS})
|
|
+include_directories(${LIBJAMI_INCLUDE_DIR})
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)
|
|
|