Attachment 589 Details for Bug 984 – Amarok 3.5.13: fix "konqueror side bar" build (FTBFS)

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] Amarok 3.5.13: fix "konqueror side bar" build (FTBFS)

amarok-3.5.13-cmake_konqsidebar.patch (text/plain), 1.07 KB, created by Francois Andriot on 2012-05-03 03:34:35 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2012-05-03 03:34:35 CDT

Size: 1.07 KB

patch

obsolete

>--- 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; } "

Actions: View | Diff

Attachments on bug 984: 585 | 586 | 587 | 588 | 589 | 591 | 592 | 593 | 594