Attachment 1436 Details for Bug 1594 – Updated patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Updated patch

tdelibs-fix-ftbfs-on-some-tricky-options.diff (text/plain), 3.01 KB, created by Darrell on 2013-08-01 16:46:41 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2013-08-01 16:46:41 CDT

Size: 3.01 KB

patch

obsolete

>diff -urN tdelibs/tdecore/CMakeLists.txt tdelibs.new/tdecore/CMakeLists.txt
>--- tdelibs/tdecore/CMakeLists.txt	2013-08-01 14:56:39.000000000 -0500
>+++ tdelibs.new/tdecore/CMakeLists.txt	2013-08-01 15:31:00.641653105 -0500
>@@ -19,14 +19,15 @@
>   set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
> endif()
> 
>+if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
>+    WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT )
>+  list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} )
>+  list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
>+  list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} )
>+endif( )
>+
> if( WITH_UPOWER )
>   add_definitions( -DWITH_UPOWER )
>-  set ( TDEUPOWER_INCLUDE_DIRECTORIES
>-    ${DBUS_TQT_INCLUDE_DIRS}
>-  )
>-  set ( TDEUPOWER_LIBRARIES
>-    ${DBUS_TQT_LIBRARIES}
>-  )
> endif( )
> 
> if( WITH_UDISKS )
>@@ -48,14 +49,12 @@
> 
> if( WITH_NETWORK_MANAGER_BACKEND )
>   add_subdirectory( networkbackends/network-manager/dbus )
>-  set ( TDENM_INCLUDE_DIRECTORIES
>-    ${DBUS_TQT_INCLUDE_DIRS}
>+  list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS
>     ${NM_UTIL_INCLUDE_DIRS}
>-    "${CMAKE_BINARY_DIR}/tdecore/networkbackends/network-manager/dbus"
>+    "${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus"
>   )
>-  set ( TDENM_LIBRARIES
>+  list( APPEND TDEHW_CUSTOM_LIBRARIES
>     tdenm_dbus-static
>-    ${DBUS_TQT_LIBRARIES}
>   )
>   set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp )
> endif( WITH_NETWORK_MANAGER_BACKEND )
>@@ -75,8 +74,7 @@
>   ${LIBART_INCLUDE_DIRS}
>   ${LIBIDN_INCLUDE_DIRS}
>   ${GAMIN_INCLUDEDIR}
>-  ${TDENM_INCLUDE_DIRECTORIES}
>-  ${TDEUPOWER_INCLUDE_DIRECTORIES}
>+  ${TDEHW_CUSTOM_INCLUDE_DIRS}
> )
> 
> link_directories(
>@@ -84,6 +82,7 @@
>   ${LIBIDN_LIBRARY_DIRS}
>   ${GAMIN_LIBDIR}
>   ${LIBART_LIBRARY_DIRS}
>+  ${TDEHW_CUSTOM_LIBRARY_DIRS}
> )
> 
> ##### headers ###################################
>@@ -178,7 +177,7 @@
>   SOURCES ${${target}_SRCS}
>   VERSION 4.2.0
>   EMBED tdecorenetwork-static
>-  LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES}
>+  LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES}
>   DEPENDENCIES dcopidl dcopidl2cpp
>   DESTINATION ${LIB_INSTALL_DIR}
> )
>diff -urN tdelibs/tdecore/tdehardwaredevices.cpp tdelibs.new/tdecore/tdehardwaredevices.cpp
>--- tdelibs/tdecore/tdehardwaredevices.cpp	2013-08-01 14:56:39.000000000 -0500
>+++ tdelibs.new/tdecore/tdehardwaredevices.cpp	2013-08-01 15:31:47.805415639 -0500
>@@ -70,7 +70,7 @@
> #endif // WITH_NETWORK_MANAGER_BACKEND
> 
> // uPower and uDisks2 integration
>-#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2)
>+#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_CONSOLEKIT)
> 	#include <tqdbusdata.h>
> 	#include <tqdbusmessage.h>
> 	#include <tqdbusproxy.h>

Actions: View | Diff

Attachments on bug 1594: 1403 | 1404 | 1428 | 1436