qtkeychain/patches/nodbus.patch

   1 --- a/CMakeLists.txt
   2 +++ b/CMakeLists.txt
   3 @@ -62,15 +62,6 @@
   4      set(QTANDROIDEXTRAS_LIBRARIES ${Qt5AndroidExtras_LIBRARIES})
   5    endif()
   6
   7 -  if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
   8 -    find_package(Qt5 COMPONENTS DBus REQUIRED)
   9 -    include_directories(${Qt5DBus_INCLUDE_DIRS})
  10 -    set(QTDBUS_LIBRARIES ${Qt5DBus_LIBRARIES})
  11 -    macro(qt_add_dbus_interface)
  12 -      qt5_add_dbus_interface(${ARGN})
  13 -    endmacro()
  14 -  endif()
  15 -
  16    if(BUILD_TRANSLATIONS)
  17      find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
  18      macro(qt_add_translation)
  19 @@ -97,15 +88,6 @@
  20      set(QTANDROIDEXTRAS_LIBRARIES ${Qt6AndroidExtras_LIBRARIES})
  21    endif()
  22
  23 -  if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
  24 -    find_package(Qt6 COMPONENTS DBus REQUIRED)
  25 -    include_directories(${Qt6DBus_INCLUDE_DIRS})
  26 -    set(QTDBUS_LIBRARIES ${Qt6DBus_LIBRARIES})
  27 -    macro(qt_add_dbus_interface)
  28 -      qt6_add_dbus_interface(${ARGN})
  29 -    endmacro()
  30 -  endif()
  31 -
  32    if(BUILD_TRANSLATIONS)
  33      find_package(Qt6 COMPONENTS LinguistTools REQUIRED)
  34      macro(qt_add_translation)
  35 @@ -181,10 +163,9 @@
  36          list(APPEND qtkeychain_LIBRARIES_PRIVATE ${LIBSECRET_LIBRARIES})
  37      endif()
  38
  39 -    add_definitions(-DKEYCHAIN_DBUS=1)
  40 +    add_definitions(-DKEYCHAIN_DBUS=0)
  41      list(APPEND qtkeychain_SOURCES keychain_unix.cpp gnomekeyring.cpp libsecret.cpp plaintextstore.cpp)
  42 -    qt_add_dbus_interface(qtkeychain_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KWallet.xml kwallet_interface KWalletInterface)
  43 -    list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
  44 +    list(APPEND qtkeychain_LIBRARIES)
  45  endif()
  46
  47  if(ANDROID)
  48 @@ -283,9 +264,6 @@
  49    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt${QTKEYCHAIN_VERSION_INFIX}KeychainConfigVersion.cmake"
  50    SOVERSION ${QTKEYCHAIN_VERSION})
  51
  52 -if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
  53 -    set(PRI_EXTRA_DEPS "dbus")
  54 -endif()
  55  ecm_generate_pri_file(BASE_NAME Qt${QTKEYCHAIN_VERSION_INFIX}Keychain
  56    LIB_NAME ${QTKEYCHAIN_TARGET_NAME}
  57    DEPS "core ${PRI_EXTRA_DEPS}"