diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-10-21 19:27:55 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-10-21 19:27:55 +0200 |
| commit | eebed6b614c52895321754908c05b5082f531b85 (patch) | |
| tree | 56bf0c5f54512c2fd8ed02cbe16d1da83b723461 /redhat/kdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch | |
| parent | 59daf455b483742c6c47099652117074df37889a (diff) | |
| download | tde-packaging-eebed6b614c52895321754908c05b5082f531b85.tar.gz tde-packaging-eebed6b614c52895321754908c05b5082f531b85.zip | |
RHEL/Fedora/MGA/MDV/Suse: update main and libraries for TDE 3.5.13.1
Diffstat (limited to 'redhat/kdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch')
| -rw-r--r-- | redhat/kdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/redhat/kdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch b/redhat/kdebase/kdebase-3.5.13-do_not_require_dbustqt_if_no_tsak.patch new file mode 100644 index 000000000..7808af3d9 --- /dev/null +++ b/redhat/kdebase/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( ) |