diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-26 20:42:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-26 20:42:07 -0600 |
commit | 310ff4808430a884db897dd9ff7572ddeb708e49 (patch) | |
tree | 278e814cebc389725d8b55b8e1db25d9e01afadc /redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch | |
parent | 1b03583b3c6545e21a13a75f63647de2b6aa12d4 (diff) | |
parent | e3e089f270bf52f03b63c663b9c9f39976f3b2e8 (diff) | |
download | tde-packaging-310ff4808430a884db897dd9ff7572ddeb708e49.tar.gz tde-packaging-310ff4808430a884db897dd9ff7572ddeb708e49.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch')
-rw-r--r-- | redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch b/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch new file mode 100644 index 000000000..43c858eec --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch @@ -0,0 +1,25 @@ +--- ConfigureChecks.cmake.ORI 2011-11-26 21:50:35.425026387 +0100 ++++ ConfigureChecks.cmake 2011-11-26 22:24:21.307053676 +0100 +@@ -88,7 +88,12 @@ + + pkg_search_module( SDL sdl ) + if( NOT SDL_FOUND ) +- tde_message_fatal( "SDL are required, but not found on your system" ) ++ check_include_file( SDL/SDL.h HAVE_SDL_H ) ++ if( NOT HAVE_SDL_H ) ++ tde_message_fatal( "SDL are required, but not found on your system" ) ++ endif ( ) ++ set ( SDL_INCLUDE_DIRS /usr/include/SDL ) ++ set ( SDL_LIBRARIES SDL pthread ) + endif( ) + + pkg_search_module( LIBVISUAL libvisual-0.4 ) +@@ -163,7 +168,7 @@ + set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} ) + set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} ) + set( CMAKE_REQUIRED_FLAGS "-include tqt.h" ) +- set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} ) ++ set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${QT_LIBRARY_DIRS} ${TQT_LIBRARIES} ) + check_cxx_source_compiles(" + #include <konqsidebarplugin.h> + int main(int, char**) { return 0; } " |