From 2f060dcfe6fef851bf38b30bedb33c3beceda332 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 9 Sep 2025 13:18:43 +0200 Subject: [PATCH] Fix building with KUnifiedPush on Android I made sure it doesn't include KDBusService and removed the if check in CMake. --- .kde-ci.yml | 6 +++++- CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.kde-ci.yml b/.kde-ci.yml index 9f425547b..3db298c2b 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -28,11 +28,15 @@ Dependencies: 'frameworks/kio': '@latest-kf6' 'frameworks/kwindowsystem': '@latest-kf6' 'frameworks/kstatusnotifieritem': '@latest-kf6' + + - 'on': ['Linux', 'FreeBSD', 'Android'] + 'require': + 'libraries/kunifiedpush': '@latest-kf6' + - 'on': ['Linux', 'FreeBSD'] 'require': 'frameworks/kdbusaddons': '@latest-kf6' 'frameworks/purpose': '@latest-kf6' - 'libraries/kunifiedpush': '@latest-kf6' - 'on': ['Linux'] 'require': diff --git a/CMakeLists.txt b/CMakeLists.txt index adf609310..25e5fb49c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION option(WITH_UNIFIEDPUSH "Build with KUnifiedPush support" ON) -if (ANDROID OR APPLE OR WIN32 OR HAIKU) +if (APPLE OR WIN32 OR HAIKU) set(WITH_UNIFIEDPUSH OFF) endif()