From owner-svn-ports-head@freebsd.org Tue Mar 28 09:32:27 2017 Return-Path: Delivered-To: svn-ports-head@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 2CEEFD1D209; Tue, 28 Mar 2017 09:32:27 +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 F0769925; Tue, 28 Mar 2017 09:32:26 +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 v2S9WQNk096208; Tue, 28 Mar 2017 09:32:26 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2S9WQQQ096207; Tue, 28 Mar 2017 09:32:26 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201703280932.v2S9WQQQ096207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 28 Mar 2017 09:32:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437109 - head/graphics/kphotoalbum-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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2017 09:32:27 -0000 Author: rakuco Date: Tue Mar 28 09:32:25 2017 New Revision: 437109 URL: https://svnweb.freebsd.org/changeset/ports/437109 Log: Unbreak after r436971. Import an upstream patch to make sure we link against libkmediaplayer with a full path. Added: head/graphics/kphotoalbum-kde4/files/patch-git_f785317b (contents, props changed) Added: head/graphics/kphotoalbum-kde4/files/patch-git_f785317b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/kphotoalbum-kde4/files/patch-git_f785317b Tue Mar 28 09:32:25 2017 (r437109) @@ -0,0 +1,29 @@ +Fix the build with kdelibs4 4.14.30. + +commit f785317ba88528760886b592aa9604b0c4ba62dd +Author: David Faure +Date: Sun Jul 26 18:12:24 2015 +0200 + + set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly + + (working around the lack of ${KDE4_KMEDIAPLAYER_LIBS}) + + CCMAIL: kde-buildsystem@kde.org + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required( VERSION 2.6.2 FATAL_ERROR ) ++cmake_minimum_required(VERSION 2.8.9) + project(kphotoalbum) + + # provide drop-down menu for build-type in cmake-gui: +@@ -364,7 +364,7 @@ kde4_add_library(Utilities STATIC ${libUtilities_SRCS}) + target_link_libraries(kphotoalbum Utilities) + + # External components +-target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} kmediaplayer ${KDE4_PHONON_LIBS}) ++target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} ${KDE4_TARGET_PREFIX}kmediaplayer ${KDE4_PHONON_LIBS}) + + if(KIPI_FOUND) + target_link_libraries(kphotoalbum ${KIPI_LIBRARIES})