Browse Source

Removed unnecessary dependency on dbus-tqt and dbus-1-tqt

pull/2/head
Slávek Banko 9 years ago
parent
commit
1f3832a136
  1. 2
      CMakeLists.txt
  2. 14
      ConfigureChecks.cmake
  3. 1
      kcontrol/krdb/CMakeLists.txt
  4. 1
      khelpcenter/CMakeLists.txt
  5. 1
      khotkeys/kcontrol/CMakeLists.txt
  6. 4
      kicker/kicker/ui/k_new_mnu.cpp
  7. 4
      kicker/kicker/ui/k_new_mnu.h
  8. 1
      kicker/taskmanager/CMakeLists.txt
  9. 1
      kreadconfig/CMakeLists.txt
  10. 4
      ksmserver/CMakeLists.txt
  11. 13
      ksmserver/shutdowndlg.h
  12. 1
      kstart/CMakeLists.txt
  13. 1
      nsplugins/CMakeLists.txt
  14. 1
      tdeinit/CMakeLists.txt
  15. 1
      tdeioslave/thumbnail/CMakeLists.txt
  16. 6
      tdm/backend/CMakeLists.txt
  17. 9
      tdm/backend/client.c
  18. 1
      tqt3integration/utils/CMakeLists.txt
  19. 1
      twin/clients/default/CMakeLists.txt
  20. 1
      twin/clients/redmond/CMakeLists.txt
  21. 1
      twin/data/CMakeLists.txt
  22. 1
      twin/lib/CMakeLists.txt

2
CMakeLists.txt

@ -117,7 +117,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
# WITH_ARTS affects libkonq khotkeys
# WITH_I8K affects ksysguard
# WITH_SENSORS affects ksysguard
# WITH_HAL affects tdeioslaves(media) ksmserver
# WITH_HAL affects tdeioslaves(media) ksmserver kicker
# WITH_TDEHWLIB affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
# WITH_LIBRAW1394 affects kcontrol(view1394)
# WITH_PAM affects tdm kdesktop kcheckpass

14
ConfigureChecks.cmake

@ -269,8 +269,8 @@ find_package( TDE )
# dbus (tdm, ksmserver)
if( BUILD_TDM OR BUILD_KSMSERVER )
# dbus (tdm)
if( BUILD_TDM )
pkg_search_module( DBUS dbus-1 )
if( NOT DBUS_FOUND )
@ -280,15 +280,9 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
endif( )
# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
if( BUILD_TDM OR BUILD_KSMSERVER OR BUILD_KICKER OR (BUILD_TDEIOSLAVES AND WITH_HAL) )
# dbus-tqt (ksmserver, kicker, tdeioslaves(media))
if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) )
if( BUILD_KSMSERVER AND WITH_UPOWER )
pkg_check_modules( DBUS_1_TQT dbus-1-tqt )
if( NOT DBUS_1_TQT_FOUND )
tde_message_fatal( "dbus-tqt-1 is required, but was not found on your system" )
endif( )
endif( )
# check for dbus-tqt
# dbus-tqt need Qt flags
pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )

1
kcontrol/krdb/CMakeLists.txt

@ -23,7 +23,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)
##### other data ################################

1
khelpcenter/CMakeLists.txt

@ -22,7 +22,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
khotkeys/kcontrol/CMakeLists.txt

@ -23,7 +23,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

4
kicker/kicker/ui/k_new_mnu.cpp

@ -104,15 +104,15 @@
#include "config.h"
#ifdef COMPILE_HALBACKEND
#ifndef NO_QT3_DBUS_SUPPORT
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/connection.h>
#endif // NO_QT3_DBUS_SUPPORT
#ifdef COMPILE_HALBACKEND
#include <hal/libhal.h>
#endif
#endif // COMPILE_HALBACKEND
#define WAIT_BEFORE_QUERYING 700

4
kicker/kicker/ui/k_new_mnu.h

@ -45,15 +45,15 @@
#include <config.h>
#ifdef COMPILE_HALBACKEND
#ifndef NO_QT3_DBUS_SUPPORT
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/connection.h>
#endif // NO_QT3_DBUS_SUPPORT
#ifdef COMPILE_HALBACKEND
#include <hal/libhal.h>
#endif
#endif // COMPILE_HALBACKEND
class KickerClientMenu;
class KickoffTabBar;

1
kicker/taskmanager/CMakeLists.txt

@ -38,7 +38,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
kreadconfig/CMakeLists.txt

@ -16,7 +16,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

4
ksmserver/CMakeLists.txt

@ -23,14 +23,12 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdmlib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${DBUS_1_TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
${HAL_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_1_TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)
@ -50,5 +48,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC
main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
legacy.cpp startup.cpp shutdown.cpp client.cpp
KSMServerInterface.skel server.skel timed.ui
LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES}
LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
)

13
ksmserver/shutdowndlg.h

@ -34,20 +34,15 @@ class TDEAction;
#include <config.h>
#ifdef WITH_UPOWER
#include <tqdbusconnection.h>
#else
#warning test
#ifdef COMPILE_HALBACKEND
#ifndef NO_QT3_DBUS_SUPPORT
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/connection.h>
#endif // NO_QT3_DBUS_SUPPORT
#ifdef COMPILE_HALBACKEND
#include <hal/libhal.h>
#endif
#endif // WITH_UPOWER
#endif // COMPILE_HALBACKEND
// The (singleton) widget that makes/fades the desktop gray.
class KSMShutdownFeedback : public TQWidget
@ -153,14 +148,10 @@ private:
TQString m_bootOption;
TQPopupMenu *targets;
TQStringList rebootOptions;
#ifdef WITH_UPOWER
TQT_DBusConnection m_dbusConn;
#else
#ifdef COMPILE_HALBACKEND
LibHalContext* m_halCtx;
DBusConnection *m_dbusConn;
#endif
#endif // WITH_UPOWER
bool m_lockOnResume;
int* m_selection;
};

1
kstart/CMakeLists.txt

@ -17,7 +17,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
nsplugins/CMakeLists.txt

@ -20,7 +20,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
tdeinit/CMakeLists.txt

@ -17,7 +17,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
tdeioslave/thumbnail/CMakeLists.txt

@ -33,7 +33,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

6
tdm/backend/CMakeLists.txt

@ -14,11 +14,11 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${DBUS_TQT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIRS}
)
link_directories(
${DBUS_TQT_LIBRARY_DIRS}
${DBUS_LIBRARY_DIRS}
)
##### tdm (executable) ##########################
@ -43,6 +43,6 @@ tde_add_executable( tdm
process.c protodpy.c reset.c resource.c rpcauth.c
server.c session.c sessreg.c socket.c streams.c
util.c xdmauth.c xdmcp.c
LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)

9
tdm/backend/client.c

@ -95,10 +95,6 @@ extern int loginsuccess( const char *User, const char *Host, const char *Tty, ch
#define log_to_audit_system(l,h,d,s) do { ; } while (0)
#endif
#ifdef WITH_CONSOLE_KIT
#include "consolekit.h"
#endif
/*
* Session data, mostly what struct verify_info was for
*/
@ -1310,11 +1306,6 @@ StartClient()
if (krbtkfile[0] != '\0')
env = setEnv( env, "KRBTKFILE", krbtkfile );
#endif
#ifdef WITH_CONSOLE_KIT
if (ck_session_cookie != NULL) {
env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
}
#endif
#ifdef WITH_CONSOLE_KIT
if (ck_session_cookie != NULL) {
env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );

1
tqt3integration/utils/CMakeLists.txt

@ -21,7 +21,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)
##### gen (internal executable) ########################

1
twin/clients/default/CMakeLists.txt

@ -20,7 +20,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
twin/clients/redmond/CMakeLists.txt

@ -18,7 +18,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
twin/data/CMakeLists.txt

@ -16,7 +16,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

1
twin/lib/CMakeLists.txt

@ -18,7 +18,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
${DBUS_TQT_LIBRARY_DIRS}
)

Loading…
Cancel
Save