Browse Source

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

Slávek Banko 5 years ago
parent
commit
1f3832a136

+ 1
- 1
CMakeLists.txt View File

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

+ 4
- 10
ConfigureChecks.cmake View File

@@ -269,8 +269,8 @@ find_package( TDE )
269 269
 
270 270
 
271 271
 
272
-# dbus (tdm, ksmserver)
273
-if( BUILD_TDM OR BUILD_KSMSERVER )
272
+# dbus (tdm)
273
+if( BUILD_TDM )
274 274
 
275 275
   pkg_search_module( DBUS dbus-1 )
276 276
   if( NOT DBUS_FOUND )
@@ -280,15 +280,9 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
280 280
 endif( )
281 281
 
282 282
 
283
-# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
284
-if( BUILD_TDM OR BUILD_KSMSERVER OR BUILD_KICKER OR (BUILD_TDEIOSLAVES AND WITH_HAL) )
283
+# dbus-tqt (ksmserver, kicker, tdeioslaves(media))
284
+if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) )
285 285
 
286
-  if( BUILD_KSMSERVER AND WITH_UPOWER )
287
-    pkg_check_modules( DBUS_1_TQT dbus-1-tqt )
288
-    if( NOT DBUS_1_TQT_FOUND )
289
-      tde_message_fatal( "dbus-tqt-1 is required, but was not found on your system" )
290
-    endif( )
291
-  endif( )
292 286
   # check for dbus-tqt
293 287
   # dbus-tqt need Qt flags
294 288
   pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )

+ 0
- 1
kcontrol/krdb/CMakeLists.txt View File

@@ -23,7 +23,6 @@ include_directories(
23 23
 
24 24
 link_directories(
25 25
   ${TQT_LIBRARY_DIRS}
26
-  ${DBUS_TQT_LIBRARY_DIRS}
27 26
 )
28 27
 
29 28
 ##### other data ################################

+ 0
- 1
khelpcenter/CMakeLists.txt View File

@@ -22,7 +22,6 @@ include_directories(
22 22
 
23 23
 link_directories(
24 24
   ${TQT_LIBRARY_DIRS}
25
-  ${DBUS_TQT_LIBRARY_DIRS}
26 25
 )
27 26
 
28 27
 

+ 0
- 1
khotkeys/kcontrol/CMakeLists.txt View File

@@ -23,7 +23,6 @@ include_directories(
23 23
 
24 24
 link_directories(
25 25
   ${TQT_LIBRARY_DIRS}
26
-  ${DBUS_TQT_LIBRARY_DIRS}
27 26
 )
28 27
 
29 28
 

+ 2
- 2
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -104,15 +104,15 @@
104 104
 
105 105
 #include "config.h"
106 106
 
107
+#ifdef COMPILE_HALBACKEND
107 108
 #ifndef NO_QT3_DBUS_SUPPORT
108 109
 /* We acknowledge the the dbus API is unstable */
109 110
 #define DBUS_API_SUBJECT_TO_CHANGE
110 111
 #include <dbus/connection.h>
111 112
 #endif // NO_QT3_DBUS_SUPPORT
112 113
 
113
-#ifdef COMPILE_HALBACKEND
114 114
 #include <hal/libhal.h>
115
-#endif
115
+#endif // COMPILE_HALBACKEND
116 116
 
117 117
 #define WAIT_BEFORE_QUERYING 700
118 118
 

+ 2
- 2
kicker/kicker/ui/k_new_mnu.h View File

@@ -45,15 +45,15 @@
45 45
 
46 46
 #include <config.h>
47 47
 
48
+#ifdef COMPILE_HALBACKEND
48 49
 #ifndef NO_QT3_DBUS_SUPPORT
49 50
 /* We acknowledge the the dbus API is unstable */
50 51
 #define DBUS_API_SUBJECT_TO_CHANGE
51 52
 #include <dbus/connection.h>
52 53
 #endif // NO_QT3_DBUS_SUPPORT
53 54
 
54
-#ifdef COMPILE_HALBACKEND
55 55
 #include <hal/libhal.h>
56
-#endif
56
+#endif // COMPILE_HALBACKEND
57 57
 
58 58
 class KickerClientMenu;
59 59
 class KickoffTabBar;

+ 0
- 1
kicker/taskmanager/CMakeLists.txt View File

@@ -38,7 +38,6 @@ include_directories(
38 38
 
39 39
 link_directories(
40 40
   ${TQT_LIBRARY_DIRS}
41
-  ${DBUS_TQT_LIBRARY_DIRS}
42 41
 )
43 42
 
44 43
 

+ 0
- 1
kreadconfig/CMakeLists.txt View File

@@ -16,7 +16,6 @@ include_directories(
16 16
 
17 17
 link_directories(
18 18
   ${TQT_LIBRARY_DIRS}
19
-  ${DBUS_TQT_LIBRARY_DIRS}
20 19
 )
21 20
 
22 21
 

+ 1
- 3
ksmserver/CMakeLists.txt View File

@@ -23,14 +23,12 @@ include_directories(
23 23
   ${CMAKE_SOURCE_DIR}/tdmlib
24 24
   ${TDE_INCLUDE_DIR}
25 25
   ${TQT_INCLUDE_DIRS}
26
-  ${DBUS_1_TQT_INCLUDE_DIRS}
27 26
   ${DBUS_TQT_INCLUDE_DIRS}
28 27
   ${HAL_INCLUDE_DIRS}
29 28
 )
30 29
 
31 30
 link_directories(
32 31
   ${TQT_LIBRARY_DIRS}
33
-  ${DBUS_1_TQT_LIBRARY_DIRS}
34 32
   ${DBUS_TQT_LIBRARY_DIRS}
35 33
 )
36 34
 
@@ -50,5 +48,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC
50 48
     main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
51 49
     legacy.cpp startup.cpp shutdown.cpp client.cpp
52 50
     KSMServerInterface.skel server.skel timed.ui
53
-  LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES}
51
+  LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
54 52
 )

+ 2
- 11
ksmserver/shutdowndlg.h View File

@@ -34,20 +34,15 @@ class TDEAction;
34 34
 
35 35
 #include <config.h>
36 36
 
37
-#ifdef WITH_UPOWER
38
-	#include <tqdbusconnection.h>
39
-#else
40
-	#warning test
37
+#ifdef COMPILE_HALBACKEND
41 38
 	#ifndef NO_QT3_DBUS_SUPPORT
42 39
 	/* We acknowledge the the dbus API is unstable */
43 40
 	#define DBUS_API_SUBJECT_TO_CHANGE
44 41
 	#include <dbus/connection.h>
45 42
 	#endif // NO_QT3_DBUS_SUPPORT
46 43
 
47
-	#ifdef COMPILE_HALBACKEND
48 44
 	#include <hal/libhal.h>
49
-	#endif
50
-#endif // WITH_UPOWER
45
+#endif // COMPILE_HALBACKEND
51 46
 
52 47
 // The (singleton) widget that makes/fades the desktop gray.
53 48
 class KSMShutdownFeedback : public TQWidget
@@ -153,14 +148,10 @@ private:
153 148
 	TQString m_bootOption;
154 149
 	TQPopupMenu *targets;
155 150
 	TQStringList rebootOptions;
156
-#ifdef WITH_UPOWER
157
-	TQT_DBusConnection m_dbusConn;
158
-#else
159 151
 #ifdef COMPILE_HALBACKEND
160 152
 	LibHalContext* m_halCtx;
161 153
 	DBusConnection *m_dbusConn;
162 154
 #endif
163
-#endif // WITH_UPOWER
164 155
 	bool m_lockOnResume;
165 156
 	int* m_selection;
166 157
 };

+ 0
- 1
kstart/CMakeLists.txt View File

@@ -17,7 +17,6 @@ include_directories(
17 17
 
18 18
 link_directories(
19 19
   ${TQT_LIBRARY_DIRS}
20
-  ${DBUS_TQT_LIBRARY_DIRS}
21 20
 )
22 21
 
23 22
 

+ 0
- 1
nsplugins/CMakeLists.txt View File

@@ -20,7 +20,6 @@ include_directories(
20 20
 
21 21
 link_directories(
22 22
   ${TQT_LIBRARY_DIRS}
23
-  ${DBUS_TQT_LIBRARY_DIRS}
24 23
 )
25 24
 
26 25
 

+ 0
- 1
tdeinit/CMakeLists.txt View File

@@ -17,7 +17,6 @@ include_directories(
17 17
 
18 18
 link_directories(
19 19
   ${TQT_LIBRARY_DIRS}
20
-  ${DBUS_TQT_LIBRARY_DIRS}
21 20
 )
22 21
 
23 22
 

+ 0
- 1
tdeioslave/thumbnail/CMakeLists.txt View File

@@ -33,7 +33,6 @@ include_directories(
33 33
 
34 34
 link_directories(
35 35
   ${TQT_LIBRARY_DIRS}
36
-  ${DBUS_TQT_LIBRARY_DIRS}
37 36
 )
38 37
 
39 38
 

+ 3
- 3
tdm/backend/CMakeLists.txt View File

@@ -14,11 +14,11 @@
14 14
 include_directories(
15 15
   ${CMAKE_CURRENT_BINARY_DIR}
16 16
   ${CMAKE_BINARY_DIR}
17
-  ${DBUS_TQT_INCLUDE_DIRS}
17
+  ${DBUS_INCLUDE_DIRS}
18 18
 )
19 19
 
20 20
 link_directories(
21
-  ${DBUS_TQT_LIBRARY_DIRS}
21
+  ${DBUS_LIBRARY_DIRS}
22 22
 )
23 23
 
24 24
 ##### tdm (executable) ##########################
@@ -43,6 +43,6 @@ tde_add_executable( tdm
43 43
     process.c protodpy.c reset.c resource.c rpcauth.c
44 44
     server.c session.c sessreg.c socket.c streams.c
45 45
     util.c xdmauth.c xdmcp.c
46
-  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
46
+  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
47 47
   DESTINATION ${BIN_INSTALL_DIR}
48 48
 )

+ 0
- 9
tdm/backend/client.c View File

@@ -95,10 +95,6 @@ extern int loginsuccess( const char *User, const char *Host, const char *Tty, ch
95 95
 #define log_to_audit_system(l,h,d,s)	do { ; } while (0)
96 96
 #endif
97 97
 
98
-#ifdef WITH_CONSOLE_KIT
99
-#include "consolekit.h"
100
-#endif
101
-
102 98
 /*
103 99
  * Session data, mostly what struct verify_info was for
104 100
  */
@@ -1315,11 +1311,6 @@ StartClient()
1315 1311
 		env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
1316 1312
 	}
1317 1313
 #endif
1318
-#ifdef WITH_CONSOLE_KIT
1319
-	if (ck_session_cookie != NULL) {
1320
-		env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
1321
-	}
1322
-#endif
1323 1314
 	userEnviron = inheritEnv( env, envvars );
1324 1315
 	env = systemEnv( p->pw_name );
1325 1316
 	systemEnviron = setEnv( env, "HOME", p->pw_dir );

+ 0
- 1
tqt3integration/utils/CMakeLists.txt View File

@@ -21,7 +21,6 @@ include_directories(
21 21
 
22 22
 link_directories(
23 23
   ${TQT_LIBRARY_DIRS}
24
-  ${DBUS_TQT_LIBRARY_DIRS}
25 24
 )
26 25
 
27 26
 ##### gen (internal executable) ########################

+ 0
- 1
twin/clients/default/CMakeLists.txt View File

@@ -20,7 +20,6 @@ include_directories(
20 20
 
21 21
 link_directories(
22 22
   ${TQT_LIBRARY_DIRS}
23
-  ${DBUS_TQT_LIBRARY_DIRS}
24 23
 )
25 24
 
26 25
 

+ 0
- 1
twin/clients/redmond/CMakeLists.txt View File

@@ -18,7 +18,6 @@ include_directories(
18 18
 
19 19
 link_directories(
20 20
   ${TQT_LIBRARY_DIRS}
21
-  ${DBUS_TQT_LIBRARY_DIRS}
22 21
 )
23 22
 
24 23
 

+ 0
- 1
twin/data/CMakeLists.txt View File

@@ -16,7 +16,6 @@ include_directories(
16 16
 
17 17
 link_directories(
18 18
   ${TQT_LIBRARY_DIRS}
19
-  ${DBUS_TQT_LIBRARY_DIRS}
20 19
 )
21 20
 
22 21
 

+ 0
- 1
twin/lib/CMakeLists.txt View File

@@ -18,7 +18,6 @@ include_directories(
18 18
 
19 19
 link_directories(
20 20
   ${TQT_LIBRARY_DIRS}
21
-  ${DBUS_TQT_LIBRARY_DIRS}
22 21
 )
23 22
 
24 23
 

Loading…
Cancel
Save