From owner-svn-ports-all@freebsd.org Sat Jul 18 21:03:14 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 51A12374114; Sat, 18 Jul 2020 21:03:14 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8L761R9kz3VpC; Sat, 18 Jul 2020 21:03:14 +0000 (UTC) (envelope-from adridg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15D3110568; Sat, 18 Jul 2020 21:03:14 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06IL3Dir082263; Sat, 18 Jul 2020 21:03:13 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06IL3DBS082261; Sat, 18 Jul 2020 21:03:13 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202007182103.06IL3DBS082261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sat, 18 Jul 2020 21:03:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542532 - in head/sysutils/krename: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/sysutils/krename: . files X-SVN-Commit-Revision: 542532 X-SVN-Commit-Repository: ports 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.33 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: Sat, 18 Jul 2020 21:03:14 -0000 Author: adridg Date: Sat Jul 18 21:03:13 2020 New Revision: 542532 URL: https://svnweb.freebsd.org/changeset/ports/542532 Log: Fix sysutils/krename in the face of Taglib CMake-incompatibility This fix is complicated by krename already having a big complex patch from git against exiv, and no newer releases, so I had to bodge in the new patch to avoid double-patching the same file or losing the existing comments and explanation. Modified: head/sysutils/krename/Makefile head/sysutils/krename/files/patch-gentoo_git-krename-5.0.0-exiv2-0.27.patch Modified: head/sysutils/krename/Makefile ============================================================================== --- head/sysutils/krename/Makefile Sat Jul 18 20:52:24 2020 (r542531) +++ head/sysutils/krename/Makefile Sat Jul 18 21:03:13 2020 (r542532) @@ -2,7 +2,7 @@ PORTNAME= krename PORTVERSION= 5.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src Modified: head/sysutils/krename/files/patch-gentoo_git-krename-5.0.0-exiv2-0.27.patch ============================================================================== --- head/sysutils/krename/files/patch-gentoo_git-krename-5.0.0-exiv2-0.27.patch Sat Jul 18 20:52:24 2020 (r542531) +++ head/sysutils/krename/files/patch-gentoo_git-krename-5.0.0-exiv2-0.27.patch Sat Jul 18 21:03:13 2020 (r542532) @@ -153,8 +153,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt set(krename_SRCS ${krename_SRCS} exiv2plugin.cpp ) -@@ -137,9 +137,9 @@ if(TAGLIB_FOUND) - ${TAGLIB_LIBRARIES} +@@ -128,12 +128,12 @@ target_link_libraries(krename + ) + if(TAGLIB_FOUND) + target_link_libraries(krename +- ${TAGLIB_LIBRARIES} ++ Taglib::Taglib ) endif() -if(EXIV2_FOUND)