diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-06-24 19:50:32 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-06-24 19:50:32 +0200 |
| commit | b4359e8bf97799f83dc1ca62744db7cfcc81bc87 (patch) | |
| tree | 3346872613490cc467c19e1645d0026c1221bce7 /redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch | |
| parent | 4cc71d79c5718d59078d06c497a56d7c05b41576 (diff) | |
| download | tde-packaging-b4359e8bf97799f83dc1ca62744db7cfcc81bc87.tar.gz tde-packaging-b4359e8bf97799f83dc1ca62744db7cfcc81bc87.zip | |
RPM Packaging: rename directories
Diffstat (limited to 'redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch')
| -rw-r--r-- | redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch b/redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch new file mode 100644 index 000000000..7808af3d9 --- /dev/null +++ b/redhat/tdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch @@ -0,0 +1,37 @@ +--- kdebase/ConfigureChecks.cmake.afterlibdetect.ORI 2012-09-06 20:46:34.705339175 +0200 ++++ kdebase/ConfigureChecks.cmake 2012-09-06 20:47:12.331548001 +0200 +@@ -229,19 +229,21 @@ + tde_message_fatal( "dbus-1 is required, but was not found on your system" ) + endif( ) + +- # check for dbus-tqt +- pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) +- tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +- set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) +- set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) +- check_cxx_source_compiles(" +- #include <tqt.h> +- #include <dbus/connection.h> +- int main(int, char**) { return 0; } " +- HAVE_DBUS_QT3_07 ) +- tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +- if( NOT HAVE_DBUS_QT3_07 ) +- tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) ++ if( BUILD_TSAK ) ++ # check for dbus-tqt ++ pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) ++ tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) ++ set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}) ++ set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ) ++ check_cxx_source_compiles(" ++ #include <tqt.h> ++ #include <dbus/connection.h> ++ int main(int, char**) { return 0; } " ++ HAVE_DBUS_QT3_07 ) ++ tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) ++ if( NOT HAVE_DBUS_QT3_07 ) ++ tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) ++ endif( ) + endif( ) + + endif( ) |