Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at devShellTools-shell 96 lines 3.3 kB view raw
1diff --git a/actexec/CMakeLists.txt b/actexec/CMakeLists.txt 2index 49d8128..e8bfa16 100644 3--- a/actexec/CMakeLists.txt 4+++ b/actexec/CMakeLists.txt 5@@ -40,7 +40,7 @@ endif() 6 7 setup_target(${PROJECT}) 8 9-find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia TextToSpeech REQUIRED) 10+find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia REQUIRED) 11 12 target_link_directories(${PROJECT} 13 PRIVATE 14@@ -75,7 +75,6 @@ target_link_libraries( 15 Qt6::Widgets 16 Qt6::Core5Compat 17 Qt6::Multimedia 18- Qt6::TextToSpeech 19 ${LIBNOTIFY_LIBRARIES} 20 ) 21 22diff --git a/actiona/CMakeLists.txt b/actiona/CMakeLists.txt 23index d03d650..222b2f9 100644 24--- a/actiona/CMakeLists.txt 25+++ b/actiona/CMakeLists.txt 26@@ -125,7 +125,7 @@ endif() 27 28 setup_target(${PROJECT}) 29 30-find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia TextToSpeech REQUIRED) 31+find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Qml Network Widgets Core5Compat Multimedia REQUIRED) 32 33 target_link_directories(${PROJECT} 34 PRIVATE 35@@ -162,7 +162,6 @@ target_link_libraries( 36 Qt6::Widgets 37 Qt6::Core5Compat 38 Qt6::Multimedia 39- Qt6::TextToSpeech 40 ${LIBNOTIFY_LIBRARIES} 41 ${LIBX11_LIBRARIES} 42 $<$<PLATFORM_ID:Windows>:shlwapi> 43diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt 44index a3019b1..6d9430c 100644 45--- a/actions/system/CMakeLists.txt 46+++ b/actions/system/CMakeLists.txt 47@@ -67,8 +67,6 @@ set(HEADERS 48 ${HEADERS_PREFIX}/actions/playsoundinstance.hpp 49 ${HEADERS_PREFIX}/actions/systemdefinition.hpp 50 ${HEADERS_PREFIX}/actions/systeminstance.hpp 51- ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp 52- ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp 53 ${HEADERS_PREFIX}/code/mediaplaylist.hpp 54 ${HEADERS_PREFIX}/code/notify.hpp 55 ${HEADERS_PREFIX}/code/process.hpp 56@@ -140,7 +138,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS 57 DBus 58 Multimedia 59 MultimediaWidgets 60- TextToSpeech 61 REQUIRED) 62 63 target_link_directories(${PROJECT} 64@@ -167,7 +164,6 @@ target_link_libraries(${PROJECT} 65 Qt6::DBus 66 Qt6::Multimedia 67 Qt6::MultimediaWidgets 68- Qt6::TextToSpeech 69 ${LIBNOTIFY_LIBRARIES} 70 ${BLUEZ_LIBRARIES} 71 $<$<PLATFORM_ID:Windows>:Bthprops> 72diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp 73index ea045e3..a5af35a 100644 74--- a/actions/system/src/actionpacksystem.hpp 75+++ b/actions/system/src/actionpacksystem.hpp 76@@ -32,10 +32,6 @@ 77 #include "actions/playsounddefinition.hpp" 78 #include "actions/findimagedefinition.hpp" 79 80-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) 81-#include "actions/texttospeechdefinition.hpp" 82-#endif 83- 84 #include "code/system.hpp" 85 #include "code/mediaplaylist.hpp" 86 #include "code/notify.hpp" 87@@ -64,9 +60,6 @@ public: 88 addActionDefinition(new Actions::DetachedCommandDefinition(this)); 89 addActionDefinition(new Actions::PlaySoundDefinition(this)); 90 addActionDefinition(new Actions::FindImageDefinition(this)); 91-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) 92- addActionDefinition(new Actions::TextToSpeechDefinition(this)); 93-#endif 94 } 95 96 QString id() const override { return QStringLiteral("system"); }