diff options
| author | rakuco <rakuco@FreeBSD.org> | 2017-03-27 13:39:03 +0000 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2017-03-27 13:39:03 +0000 |
| commit | 707eda9e82353d918ba6df3a03330083b824099e (patch) | |
| tree | 1cd8bf5792495a1ed7502527d40810ce36d0e141 | |
| parent | 5787527358e4e4853f50ea7e4ef9a6652e5c6859 (diff) | |
| download | FreeBSD-ports-707eda9e82353d918ba6df3a03330083b824099e.zip FreeBSD-ports-707eda9e82353d918ba6df3a03330083b824099e.tar.gz | |
Unbreak after r436971.
After the kdelibs update to 4.11.30 the CMake policies used by kdelibs-based
projects got stricter.
- Fix `make configure'. The upstream git repository has a add_subdirectory(doc)
call, but the code generating the release tarball also added a
macro_optional_add_subdirectory(doc) call that was causing CMake to error out
due to the same directory being added twice to the build system.
- Fix `make build' with the MUSEPACK option. The FindMuse.cmake patch from
r346999 was hardcoding MUSE_LIBRARIES the wrong way. The find_library() call
should have been kept, otherwise the linker is passed "-lmpcdec" instead of
"/full/path/to/libmpcdec.so".
| -rw-r--r-- | sysutils/k3b-kde4/files/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sysutils/k3b-kde4/files/patch-CMakeLists.txt b/sysutils/k3b-kde4/files/patch-CMakeLists.txt index 0c9ec39..322a8a4 100644 --- a/sysutils/k3b-kde4/files/patch-CMakeLists.txt +++ b/sysutils/k3b-kde4/files/patch-CMakeLists.txt @@ -1,3 +1,6 @@ +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) @@ -13,3 +16,11 @@ 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) diff --git a/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake b/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake index 141554b..bb464fb 100644 --- a/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake +++ b/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake @@ -1,6 +1,6 @@ --- 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) @@ -10,9 +10,4 @@ +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 "<mpc/mpcdec.h>" ) - elseif( HAVE_MPCDEC_MPCDEC_H ) - find_path( MUSE_INCLUDE_DIR mpcdec/mpcdec.h ) + find_path( MUSE_INCLUDE_DIR mpc/mpcdec.h ) |
