build: require libportal 0.9.1

CMakeLists.txt

@@ -99,7 +99,7 @@ message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 # Set lib versions
 set(REQUIRED_OPENSSL_VERSION 3.0)
 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)
 
 if (WIN32)

docs/dev/build.md

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

src/lib/gui/core/WaylandWarnings.cpp

@@ -15,9 +15,8 @@ namespace deskflow::gui::core {
 void WaylandWarnings::showOnce(QWidget *parent)
 {
   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) {
       m_errorShown = true;
       messages::showWaylandLibraryError(parent);

src/lib/gui/core/WaylandWarnings.h

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

src/lib/platform/CMakeLists.txt

@@ -177,7 +177,7 @@ if(UNIX)
     if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10")
       target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1)
     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_link_libraries(
       platform