From owner-svn-ports-all@freebsd.org Sat Jul 18 20:35:46 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 56718373747; Sat, 18 Jul 2020 20:35:46 +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 4B8KWQ1j4Gz3T22; Sat, 18 Jul 2020 20:35:46 +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 1F5261068A; Sat, 18 Jul 2020 20:35:46 +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 06IKZk6n063678; Sat, 18 Jul 2020 20:35:46 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06IKZjNK063676; Sat, 18 Jul 2020 20:35:45 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202007182035.06IKZjNK063676@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 20:35:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542528 - in head/misc/tellico: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/misc/tellico: . files X-SVN-Commit-Revision: 542528 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 20:35:46 -0000 Author: adridg Date: Sat Jul 18 20:35:45 2020 New Revision: 542528 URL: https://svnweb.freebsd.org/changeset/ports/542528 Log: Fix build in the face of updated taglib, changes tellico, etc. This is fallout in the KF5 5.72 exp-run, but otherwise unrelated to the KF5 upgrade. PR: 247907 Added: head/misc/tellico/files/ head/misc/tellico/files/patch-CMakeLists.txt (contents, props changed) Modified: head/misc/tellico/Makefile head/misc/tellico/pkg-descr Modified: head/misc/tellico/Makefile ============================================================================== --- head/misc/tellico/Makefile Sat Jul 18 20:32:55 2020 (r542527) +++ head/misc/tellico/Makefile Sat Jul 18 20:35:45 2020 (r542528) @@ -3,7 +3,7 @@ PORTNAME= tellico DISTVERSION= 3.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ Added: head/misc/tellico/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/tellico/files/patch-CMakeLists.txt Sat Jul 18 20:35:45 2020 (r542528) @@ -0,0 +1,32 @@ +Update to taglib changes what CMake variables are defined (it now produces +modern CMake bits, but forgets backwards compatibility). + +This cascades to the weak FindCDIO module, which was now missing +library -L flags it needed. + +--- CMakeLists.txt.orig 2020-07-18 20:19:02 UTC ++++ CMakeLists.txt +@@ -127,8 +127,13 @@ set_package_properties(Taglib PROPERTIES + URL "https://taglib.org/" + TYPE OPTIONAL) + if(TAGLIB_FOUND) +- add_definitions(${TAGLIB_CFLAGS}) +- include_directories(${TAGLIB_INCLUDES}) ++ if(TAGLIB_LIBRARIES) ++ # Older taglib ++ add_definitions(${TAGLIB_CFLAGS}) ++ include_directories(${TAGLIB_INCLUDES}) ++ else() ++ set(TAGLIB_LIBRARIES Taglib::Taglib) ++ endif() + endif(TAGLIB_FOUND) + + find_package(Yaz 2.0) +@@ -171,6 +176,7 @@ set_package_properties(CDIO PROPERTIES + TYPE OPTIONAL) + if(CDIO_FOUND) + include_directories(${CDIO_INCLUDE_DIRS}) ++ link_directories(${CDIO_libiso9660_LIBDIR} ${CDIO_libcdio_LIBDIR}) + endif(CDIO_FOUND) + + find_package(Csv 3.0) Modified: head/misc/tellico/pkg-descr ============================================================================== --- head/misc/tellico/pkg-descr Sat Jul 18 20:32:55 2020 (r542527) +++ head/misc/tellico/pkg-descr Sat Jul 18 20:35:45 2020 (r542528) @@ -2,4 +2,4 @@ Tellico is a KDE application for organizing your colle default templates for books, bibliographies, videos, music, video games, coins, stamps, trading cards, comic books, and wines. -WWW: http://tellico-project.org +WWW: https://tellico-project.org