mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 12:05:19 -06:00
3b8d7b10ae
* gnu/packages/jami.scm (libjami): Update to 20251212.0. [source]: Add libjami-pkgconf.patch and libjami-simdutf.patch patches. [inputs]: Add simdutf. (jami) Update to 20251212.0. [source]: Remove jami-unbundle-dependencies.patch, jami-libjami-headers-search.patch, jami-skip-tests-requiring-internet.patch and jami-find-package-avutil.patch; add jami-allow-system-zxing-cpp.patch, jami-libjami-cmake.patch and jami-avutil-link.patch patches. [inputs]: Delete qrencode. * gnu/packages/patches/jami-allow-system-zxing-cpp.patch: New file. * gnu/packages/patches/jami-avutil-link.patch: Likewise. * gnu/packages/patches/jami-libjami-cmake.patch: Likewise. * gnu/packages/patches/libjami-pkgconf.patch: Likewise. * gnu/packages/patches/libjami-simdutf.patch: Likewise. * gnu/packages/patches/jami-find-package-avutil.patch: Delete file. * gnu/packages/patches/jami-libjami-headers-search.patch: Likewise. * gnu/packages/patches/jami-skip-tests-requiring-internet.patch: Likewise. * gnu/packages/patches/jami-unbundle-dependencies.patch: Likewise. * gnu/packages/patches/libjami-ac-config-files.patch: Likewise. * gnu/packages/patches/libjami-sdbus-cpp-v2.patch: Likewise. * gnu/packages/patches/jami-qwindowkit.patch: Update upstream status. * gnu/local.mk (dist_patch_DATA): Update accordingly. Change-Id: I03ff9f4a892e1fead81d2c6e547f1c0cf405eb5f
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31456>
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c046b597..366758f5 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 a1aeb22f..94f558e0 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
|