From owner-svn-ports-all@freebsd.org Mon Mar 27 13:39:05 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B70ED1F5B8; Mon, 27 Mar 2017 13:39:05 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E05CDAB9; Mon, 27 Mar 2017 13:39:04 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2RDd42w097532; Mon, 27 Mar 2017 13:39:04 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2RDd3fv097530; Mon, 27 Mar 2017 13:39:03 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201703271339.v2RDd3fv097530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 27 Mar 2017 13:39:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437044 - head/sysutils/k3b-kde4/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2017 13:39:05 -0000 Author: rakuco Date: Mon Mar 27 13:39:03 2017 New Revision: 437044 URL: https://svnweb.freebsd.org/changeset/ports/437044 Log: 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". Modified: head/sysutils/k3b-kde4/files/patch-CMakeLists.txt head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake Modified: head/sysutils/k3b-kde4/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/k3b-kde4/files/patch-CMakeLists.txt Mon Mar 27 13:25:20 2017 (r437043) +++ head/sysutils/k3b-kde4/files/patch-CMakeLists.txt Mon Mar 27 13:39:03 2017 (r437044) @@ -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) Modified: head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake ============================================================================== --- head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake Mon Mar 27 13:25:20 2017 (r437043) +++ head/sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake Mon Mar 27 13:39:03 2017 (r437044) @@ -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 "" ) - elseif( HAVE_MPCDEC_MPCDEC_H ) - find_path( MUSE_INCLUDE_DIR mpcdec/mpcdec.h ) + find_path( MUSE_INCLUDE_DIR mpc/mpcdec.h )