Index: head/sysutils/k3b-kde4/files/patch-CMakeLists.txt =================================================================== --- head/sysutils/k3b-kde4/files/patch-CMakeLists.txt (revision 437043) +++ head/sysutils/k3b-kde4/files/patch-CMakeLists.txt (revision 437044) @@ -1,15 +1,26 @@ +Hunk 1: Pass -std=c99 when building with clang as well as GCC. +Hunk 2: Stop adding the doc/ directory twice, there is another entry for it + at the end of the file. --- CMakeLists.txt.orig 2014-11-04 18:43:47 UTC +++ CMakeLists.txt @@ -106,10 +106,10 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN) include(CMakePushCheckState) cmake_push_check_state() - if(CMAKE_COMPILER_IS_GNUCC) + if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") # FindKDE4Internal.cmake screws things up set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c99) - endif(CMAKE_COMPILER_IS_GNUCC) + endif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") if(FFMPEG_INCLUDE_DIR_OLD_STYLE) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR_OLD_STYLE}) +@@ -339,7 +339,6 @@ add_subdirectory( libk3b ) + add_subdirectory( src ) + add_subdirectory( kioslaves ) + add_subdirectory( plugins ) +-add_subdirectory( doc ) + if(BUILD_K3BSETUP) + add_subdirectory(k3bsetup) + endif(BUILD_K3BSETUP) Index: head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake =================================================================== --- head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake (revision 437043) +++ head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake (revision 437044) @@ -1,18 +1,13 @@ --- cmake/modules/FindMuse.cmake.orig 2014-11-04 18:37:31 UTC +++ cmake/modules/FindMuse.cmake -@@ -15,13 +15,10 @@ if( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES +@@ -15,9 +15,7 @@ if( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES endif( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES ) include(CheckIncludeFiles) -check_include_files(mpc/mpcdec.h HAVE_MPC_MPCDEC_H) -check_include_files(mpcdec/mpcdec.h HAVE_MPCDEC_MPCDEC_H) -check_include_files(musepack/musepack.h HAVE_MUSEPACK_MUSEPACK_H) +set ( HAVE_MPC_MPCDEC_H 1 ) if( HAVE_MPC_MPCDEC_H ) -- find_path( MUSE_INCLUDE_DIR mpc/mpcdec.h ) -- find_library( MUSE_LIBRARIES NAMES mpcdec ) -+ set( MUSE_LIBRARIES mpcdec ) - set( MPC_HEADER_FILE "" ) - elseif( HAVE_MPCDEC_MPCDEC_H ) - find_path( MUSE_INCLUDE_DIR mpcdec/mpcdec.h ) + find_path( MUSE_INCLUDE_DIR mpc/mpcdec.h )