mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-20 09:10:30 +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://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1506
|
|
Upstream-status: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/2073
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e802357f..6d2dccfb 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -696,12 +696,19 @@ add_subdirectory(3rdparty/SortFilterProx
|
|
|
|
# ZXing-cpp configuration
|
|
-set(BUILD_EXAMPLES OFF CACHE BOOL "")
|
|
-set(BUILD_BLACKBOX_TESTS OFF CACHE BOOL "")
|
|
-add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
|
|
+pkg_check_modules(zxing IMPORTED_TARGET zxing)
|
|
+if(zxing_FOUND)
|
|
+ message(STATUS "Using system-provided ZXing-cpp")
|
|
+ list(APPEND CLIENT_INCLUDE_DIRS ${zxing_INCLUDE_DIRS})
|
|
+ list(APPEND CLIENT_LIBS PkgConfig::zxing)
|
|
+else()
|
|
+ set(BUILD_EXAMPLES OFF CACHE BOOL "")
|
|
+ set(BUILD_BLACKBOX_TESTS OFF CACHE BOOL "")
|
|
+ add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
|
|
|
|
# Add ZXing-cpp to includes and libraries
|
|
-list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
|
|
-list(APPEND CLIENT_LIBS ZXing)
|
|
+ list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
|
|
+ list(APPEND CLIENT_LIBS ZXing)
|
|
+endif()
|
|
|
|
# common executable sources
|
|
qt_add_executable(
|
|
|
|
base-commit: a4300308dc8d03d59f620bb5fed753df5cf31ed9
|
|
--
|
|
2.41.0
|
|
|