smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: require libportal 0.9.1

Browse source
This commit is contained in:
sithlord48 2026-02-25 18:42:11 -05:00 committed by Nick Bolton
parent d392547fd8
commit 9188d4b1c1
5 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -99,7 +99,7 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
# Set lib versions # Set lib versions
set(REQUIRED_OPENSSL_VERSION 3.0) set(REQUIRED_OPENSSL_VERSION 3.0)
set(REQUIRED_LIBEI_VERSION 1.3) set(REQUIRED_LIBEI_VERSION 1.3)
set(REQUIRED_LIBPORTAL_VERSION 0.8) set(REQUIRED_LIBPORTAL_VERSION 0.9.1)
set(REQUIRED_QT_VERSION 6.7.0) set(REQUIRED_QT_VERSION 6.7.0)
if (WIN32) if (WIN32)

2
docs/dev/build.md
View file

@ -4,7 +4,7 @@ To build Deskflow you will a minimum of:
- [cmake] 3.24+ - [cmake] 3.24+
- [Qt] 6.7.0+ - [Qt] 6.7.0+
- [openssl] 3.0+ - [openssl] 3.0+
- [libportal] 0.8+ (linux, bsd) - [libportal] 0.9.1+ (linux, bsd)
- [libei] 1.3+ (linux, bsd) - [libei] 1.3+ (linux, bsd)
- [google_test] ^ - [google_test] ^

3
src/lib/gui/core/WaylandWarnings.cpp
View file

@ -15,9 +15,8 @@ namespace deskflow::gui::core {
void WaylandWarnings::showOnce(QWidget *parent) void WaylandWarnings::showOnce(QWidget *parent)
{ {
const auto mode = Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>(); const auto mode = Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>();
const bool portalIcProblem = !m_hasPortalInputCapture && mode == Settings::CoreMode::Server;
if (!m_hasEi || !m_hasPortal || portalIcProblem) { if (!m_hasEi || !m_hasPortal || mode == Settings::CoreMode::Server) {
if (!m_errorShown) { if (!m_errorShown) {
m_errorShown = true; m_errorShown = true;
messages::showWaylandLibraryError(parent); messages::showWaylandLibraryError(parent);

6
src/lib/gui/core/WaylandWarnings.h
View file

@ -32,12 +32,6 @@ private:
#else #else
const bool m_hasPortal = false; const bool m_hasPortal = false;
#endif #endif
#if HAVE_LIBPORTAL_INPUTCAPTURE
const bool m_hasPortalInputCapture = true;
#else
const bool m_hasPortalInputCapture = false;
#endif
}; };
} // namespace deskflow::gui::core } // namespace deskflow::gui::core

2
src/lib/platform/CMakeLists.txt
View file

@ -177,7 +177,7 @@ if(UNIX)
if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10") if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10")
target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1) target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1)
endif() endif()
target_compile_definitions(platform PUBLIC WINAPI_LIBEI WINAPI_LIBPORTAL HAVE_LIBPORTAL_INPUTCAPTURE) target_compile_definitions(platform PUBLIC WINAPI_LIBEI WINAPI_LIBPORTAL)
target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS}) target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS})
target_link_libraries( target_link_libraries(
platform platform