From owner-svn-ports-all@freebsd.org Sat Jul 18 23:31:18 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 3E711376749; Sat, 18 Jul 2020 23:31:18 +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 4B8PPy0kfqz3d0g; Sat, 18 Jul 2020 23:31:18 +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 F097B121EA; Sat, 18 Jul 2020 23:31:17 +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 06INVHdb070973; Sat, 18 Jul 2020 23:31:17 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06INVHA1070518; Sat, 18 Jul 2020 23:31:17 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202007182331.06INVHA1070518@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 23:31:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542537 - in head: audio/soundkonverter/files net-p2p/ktorrent/files sysutils/krename/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head: audio/soundkonverter/files net-p2p/ktorrent/files sysutils/krename/files X-SVN-Commit-Revision: 542537 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 23:31:18 -0000 Author: adridg Date: Sat Jul 18 23:31:17 2020 New Revision: 542537 URL: https://svnweb.freebsd.org/changeset/ports/542537 Log: Fix up previous fix: - with KF5 5.71, each application can have its own FindTaglib, or uses the one from kdelibs4support (I think). This is generally an "old-style" CMake module. - with KF5 5.72, ECM delivers a modern CMake module which is found **first**, but is also incompatible with the old version of FindTaglib. Adjust the patches so they work with KF5 5.71 (now in-tree) and 5.72 (upcoming). Not bumping PORTREVISION here because the packages could not have built with the previous patches. Note to self: do not assume useful backwards-compatibility in CMake modules from different sources. PR: 247907 Modified: head/audio/soundkonverter/files/patch-CMakeLists.txt head/net-p2p/ktorrent/files/patch-plugins_mediaplayer_CMakeLists.txt head/sysutils/krename/files/patch-gentoo_git-krename-5.0.0-exiv2-0.27.patch Modified: head/audio/soundkonverter/files/patch-CMakeLists.txt ============================================================================== --- head/audio/soundkonverter/files/patch-CMakeLists.txt Sat Jul 18 23:00:44 2020 (r542536) +++ head/audio/soundkonverter/files/patch-CMakeLists.txt Sat Jul 18 23:31:17 2020 (r542537) @@ -1,11 +1,14 @@ --- CMakeLists.txt.orig 2020-07-18 20:38:56 UTC +++ CMakeLists.txt -@@ -120,7 +120,7 @@ set(soundkonverter_SRCS +@@ -120,7 +120,10 @@ set(soundkonverter_SRCS ) add_executable(soundkonverter ${soundkonverter_SRCS}) -target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) -+target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) ++if(NOT TAGLIB_LIBRARIES) ++ set(TAGLIB_LIBRARIES Taglib::Taglib) ++endif() ++target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR}) Modified: head/net-p2p/ktorrent/files/patch-plugins_mediaplayer_CMakeLists.txt ============================================================================== --- head/net-p2p/ktorrent/files/patch-plugins_mediaplayer_CMakeLists.txt Sat Jul 18 23:00:44 2020 (r542536) +++ head/net-p2p/ktorrent/files/patch-plugins_mediaplayer_CMakeLists.txt Sat Jul 18 23:31:17 2020 (r542537) @@ -1,11 +1,11 @@ ---- plugins/mediaplayer/CMakeLists.txt.orig 2020-07-18 21:06:12 UTC +--- plugins/mediaplayer/CMakeLists.txt.orig 2020-06-06 18:08:08 UTC +++ plugins/mediaplayer/CMakeLists.txt -@@ -34,7 +34,7 @@ kcoreaddons_desktop_to_json(ktorrent_mediaplayer ktorr - target_link_libraries( - ktorrent_mediaplayer - ktcore -- ${TAGLIB_LIBRARIES} -+ Taglib::Taglib - Phonon::phonon4qt5 - KF5::Torrent - KF5::I18n +@@ -1,5 +1,8 @@ + find_package(Taglib REQUIRED) + include_directories(${TAGLIB_INCLUDES}) ++if(NOT TAGLIB_LIBRARIES) ++ set(TAGLIB_LIBRARIES Taglib::Taglib) ++endif() + #find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Multimedia MultimediaWidgets) + #include_directories(${Qt5Multimedia_INCLUDE_DIRS}) + include_directories(${PHONON_INCLUDES}) 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 23:00:44 2020 (r542536) +++ head/sysutils/krename/files/patch-gentoo_git-krename-5.0.0-exiv2-0.27.patch Sat Jul 18 23:31:17 2020 (r542537) @@ -135,12 +135,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- src/CMakeLists.txt +++ src/CMakeLists.txt -@@ -23,7 +23,7 @@ if(FREETYPE_FOUND) +@@ -23,7 +23,10 @@ if(FREETYPE_FOUND) include_directories(${FREETYPE_INCLUDE_DIRS}) endif() -add_definitions(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS}) +add_definitions(${TAGLIB_CFLAGS}) ++if(NOT TAGLIB_LIBRARIES) ++ set(TAGLIB_LIBRARIES Taglib::Taglib) ++endif() # Exiv2 needs exceptions kde_enable_exceptions() @@ -157,8 +160,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ) if(TAGLIB_FOUND) target_link_libraries(krename -- ${TAGLIB_LIBRARIES} -+ Taglib::Taglib + ${TAGLIB_LIBRARIES} ) endif() -if(EXIV2_FOUND)