Bug#868132: Needless build dependency on kdelibs5-dev

[Alexander Volkov]

16.01.2018 20:10, Samuel Thibault пишет:
> It actually completely breaks qt-at-spi, see #887431
>
> So it seems qt-at-spi does need at least the kde4_add_library etc.
> things.
>
> This package is going to get removed with the qt4 removal anyway, so
> marking as wontfix.
>
> Samuel
Hi,

Sorry for incorrect patch.
I apply the working one (with enabled automoc) for history.
-------------- next part --------------
--- a/src/bridge.cpp
+++ b/src/bridge.cpp
@@ -21,7 +21,7 @@
 #include "bridge.h"
 
 #include <qaccessible2.h>
-#include <kcomponentdata.h>
+//#include <kcomponentdata.h>
 
 #include "atspiadaptor.h"
 
@@ -54,7 +54,7 @@
     }
 
     // This gives us translations
-    KComponentData componentData("qtatspi_qt");
+    //KComponentData componentData("qtatspi_qt");
 
     qSpiInitializeStructTypes();
     qSpiInitializeConstantMappings();
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,9 +28,9 @@
 # headers are needed from there for the types used in dbus
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
-kde4_add_library(qspiaccessiblebridge SHARED ${qspiaccessiblebridge_SRCS})
+add_library(qspiaccessiblebridge SHARED ${qspiaccessiblebridge_SRCS})
 
-target_link_libraries(qspiaccessiblebridge ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} ${KDE4_KDECORE_LIBS})
+target_link_libraries(qspiaccessiblebridge ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
 
 install(TARGETS qspiaccessiblebridge DESTINATION ${QTATSPI_QT_PLUGIN_INSTALL_DIR}/accessiblebridge/)
 
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,14 @@
 #option(KDE4_BUILD_TESTS  "Build the tests" ON)
 
 find_package(Qt4 4.8 REQUIRED)
-find_package(KDE4)
-include(KDE4Defaults)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT4_INCLUDES}  ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${KDE4_INCLUDES})
+set(CMAKE_AUTOMOC ON)
+
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT4_INCLUDES}  ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR})
 
 # Require libatspi2-core headers for building:
 include(FindPkgConfig)
@@ -23,6 +27,4 @@
 
 add_subdirectory(src)
 add_subdirectory(translations)
-add_subdirectory(tests)
-add_subdirectory(examples)