Date: Sat, 18 Jul 2020 20:35:45 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542528 - in head/misc/tellico: . files Message-ID: <202007182035.06IKZjNK063676@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007182035.06IKZjNK063676>