diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2011-11-26 22:40:28 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2011-11-26 22:40:28 +0100 |
| commit | 3135d23944c42bd3c5478f5a7f4add85d8c8bbaa (patch) | |
| tree | 6a64026eddaa401f387542a8c14ee45c2651d4d6 /redhat/applications/amarok/amarok-3.5.13-cmake_konqsidebar.patch | |
| parent | 3e075d9948911d74cf0ff0a373224bfce6e6bc75 (diff) | |
| download | tde-packaging-3135d23944c42bd3c5478f5a7f4add85d8c8bbaa.tar.gz tde-packaging-3135d23944c42bd3c5478f5a7f4add85d8c8bbaa.zip | |
RHEL/Fedora: add 'konqueror side bar' to amarok, enable amarok build on RHEL 5
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; } " |