trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: April 2013

Re: [trinity-devel] tdelibs FTBFS

From: "Darrell Anderson" <darrella@...>
Date: Tue, 09 Apr 2013 15:40:51 -0500
On Tue, 09 Apr 2013 15:00:40 -0500 "Darrell Anderson" 
<darrella@...> wrote:
>tdelibs/tdecore/tdehardwaredevices.cpp:72:25: fatal error: 
>tqdbusdata.h: No such file or directory
>
>/opt/trinity/include/dbus-1-tqt/tqdbusdata.h exists.
>
>Changing -DBUILD_UPOWER=OFF resolves the failure but I want upower 
>support.

I think the following patch solves the problem. I'm guessing by the 
tdehardwaredevices.cpp comments the upower includes should be used 
only when WITH_NETWORK_MANAGER_BACKEND=ON.

Tim, please provide a sanity check. :)

====================================================
diff -urN tdelibs/tdecore/tdehardwaredevices.cpp 
tdelibs.new/tdecore/tdehardwaredevices.cpp
--- tdelibs/tdecore/tdehardwaredevices.cpp	2013-04-05 
22:37:52.000000000 -0500
+++ tdelibs.new/tdecore/tdehardwaredevices.cpp	2013-04-09 
15:34:13.299824842 -0500
@@ -64,16 +64,17 @@
 #include "config.h"
 
 #ifdef WITH_NETWORK_MANAGER_BACKEND
-	#include "networkbackends/network-manager/network-manager.h"
-#endif // WITH_NETWORK_MANAGER_BACKEND
+#include "networkbackends/network-manager/network-manager.h"
 
-// uPower integration
+// uPower integration for NETWORK_MANAGER_BACKEND
 #ifdef WITH_UPOWER
-	#include <tqdbusdata.h>
-	#include <tqdbusmessage.h>
-	#include <tqdbusproxy.h>
-	#include <tqdbusvariant.h>
-	#include <tqdbusconnection.h>
+#include <tqdbusdata.h>
+#include <tqdbusmessage.h>
+#include <tqdbusproxy.h>
+#include <tqdbusvariant.h>
+#include <tqdbusconnection.h>
+#endif // uPower integration
+
 #endif // WITH_NETWORK_MANAGER_BACKEND
 
 // BEGIN BLOCK
====================================================

Darrell