mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
2a7ba05feb
* gnu/packages/patches/jami.scm (libjami): Update to 20250610.0. [source]: Unregister libgit2 patch. [inputs]: Delete guile-3.0. [arguments] <#:configure-flags>: Delete --enable-agent. (jami): Update to 20250610.0. [source]: Add patch. [native-inputs]: Add git. [inputs]: Add hunspell and zxing-cpp. * gnu/packages/patches/jami-qwindowkit.patch, gnu/packages/patches/jami-unbundle-dependencies.patch: Update for jami 20250610.0. * gnu/local.mk: Unregister patch. Register new patch. * gnu/packages/patches/libjami-libgit2-compatibility.patch: Remove file. * gnu/packages/patches/jami-disable-webengine.patch: New file. Fixes: <https://issues.guix.gnu.org/76231> Change-Id: I118454aa7c214271725358928b751f4d43cac2db Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
37 lines
1.2 KiB
Diff
37 lines
1.2 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 6d2dccfb..8dedff50 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -100,13 +100,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)
|
|
|
|
set(CMAKE_AUTOMOC ON)
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index b2730b71..4960899e 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -48,7 +48,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
|