mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
5bd2569bd1
* gnu/packages/patches/linphone-desktop-without-sdk.patch: Delete file. * gnu/packages/patches/linphone-desktop-ispell.patch: New file. * gnu/packages/patches/linphone-desktop-qtkeychain.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/linphone.scm (linphone-desktop): Update to 5.2.6. [source]: Remove linphone-desktop-without-sdk.patch patch. Add linphone-desktop-cmake-belcard.patch, linphone-desktop-cmake-find-modules.patch, linphone-desktop-ispell.patch and linphone-desktop-qtkeychain.patch patches. [arguments] <configure-flags>: Add -DLINPHONEAPP_VERSION, -DLinphoneCxx_TARGET=liblinphone++ and -DLINPHONE_QT_ONLY=YES and -DCMAKE_INSTALL_INCLUDEDIR flags. Remove -DCMAKE_INSTALL_PREFIX flag. <phases>: Remove pre-configure phase. [inputs]: Remove belr. Add ispell-for-linphone, qtkeychain and qtmultimedia-5. Fixes: #1836 Change-Id: I8cbee339c02367a4fb1a3019700702743caaf983
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
Retrieved from https://git.pld-linux.org/?p=packages/linphone.git;a=blob_plain;f=linphone-qtkeychain.patch;hb=HEAD
|
|
|
|
--- linphone-desktop-5.2.2/CMakeLists.txt.orig 2024-03-11 18:30:37.000000000 +0100
|
|
+++ linphone-desktop-5.2.2/CMakeLists.txt 2024-03-31 17:21:32.069621299 +0200
|
|
@@ -168,7 +168,7 @@ add_option(OPTION_LIST LIBSECRET_SUPPORT
|
|
if(WIN32)
|
|
add_cache(OPTION_LIST QTKEYCHAIN_TARGET_NAME "Override Qt5Keychain library name for a workaround with windeployqt" "EQt5Keychain")
|
|
else()
|
|
- add_cache(OPTION_LIST QTKEYCHAIN_TARGET_NAME "Override Qt5Keychain library name" "Qt5Keychain")
|
|
+ add_cache(OPTION_LIST QTKEYCHAIN_TARGET_NAME "Override Qt5Keychain library name" "qt5keychain")
|
|
endif()
|
|
if(WIN32)
|
|
add_option(OPTION_LIST ENABLE_OPENSSL_EXPORT "Enable OpenSSL deployment" YES)
|
|
--- linphone-desktop-5.2.2/linphone-app/CMakeLists.txt.orig 2024-03-31 16:15:24.501115462 +0200
|
|
+++ linphone-desktop-5.2.2/linphone-app/CMakeLists.txt 2024-03-31 16:27:54.837050544 +0200
|
|
@@ -118,10 +118,7 @@ set(APP_TARGETS ${LinphoneCxx_TARGET}
|
|
####################################
|
|
|
|
if(ENABLE_QT_KEYCHAIN)
|
|
- find_package(QtKeychain)
|
|
- if(NOT QtKeychain_FOUND)
|
|
- find_package(${QTKEYCHAIN_TARGET_NAME} CONFIG REQUIRED)
|
|
- endif()
|
|
+ find_package(Qt5Keychain)
|
|
|
|
add_compile_definitions("ENABLE_QT_KEYCHAIN")
|
|
if(QtKeychain_USE_BUILD_INTERFACE)
|
|
@@ -197,7 +194,7 @@ if(ENABLE_VIDEO)
|
|
endif()
|
|
if( ENABLE_QT_KEYCHAIN)
|
|
if(NOT QTKEYCHAIN_TARGET_NAME)
|
|
- set(QTKEYCHAIN_TARGET_NAME "Qt5Keychain")
|
|
+ set(QTKEYCHAIN_TARGET_NAME "qt5keychain")
|
|
endif()
|
|
list(APPEND APP_TARGETS ${QTKEYCHAIN_TARGET_NAME})
|
|
endif()
|