mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-26 20:20:32 +02:00
3aedf8dac3
* gnu/packages/jami.scm (libjami): Update to 20251003.0 Remove obsolete patches. (jami): Update version to 20251003.0. [source]: Update patches. [#:configure-flags]: Add -DJAMICORE_AS_SUBDIR=OFF. (jami-docs): Update to 0.0.0-4.d7930e5. * gnu/packages/patches/jami-find-package-avutil.patch: New file. * gnu/packages/patches/jami-enable-testing.patch: Remove file. * gnu/packages/patches/jami-qwindowkit.patch: Remove file. * gnu/packages/patches/jami-unbundle-dependencies.patch: Remove file. * gnu/packages/patches/jami-unittests-fix-build.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Update registered patches. Change-Id: I8420045d97aac93fdc7f33ec64a0f6f06d3763f0 Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
Upstream-status: https://lists.gnu.org/archive/html/jami/2024-03/msg00008.html
|
|
|
|
This makes it possible to use the system-provided qwindowkit library.
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 29bfde9a..3b4c7a92 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 758b00cb6c2d924be3a1ea137ec366dc33a5132d
|
|
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 c5228ccf..816f97a7 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
|