Date: Sat, 8 Feb 2020 14:27:04 +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: r525554 - in head/sysutils/kio-fuse: . files Message-ID: <202002081427.018ER4ow002876@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Sat Feb 8 14:27:04 2020 New Revision: 525554 URL: https://svnweb.freebsd.org/changeset/ports/525554 Log: sysutils/kio-fuse: Fix build While boost is an implicit dependency, make it explicit for the sake of the patch added in r525170. Also, on amd64 &c, wherever Boost headers end up isn't automatically in the C++ header search path, so find Boost in CMake and use those headers. Pointy hat: adridg (for approving the previous "fix") Reported by: fallout Modified: head/sysutils/kio-fuse/Makefile head/sysutils/kio-fuse/files/patch-CMakeLists.txt Modified: head/sysutils/kio-fuse/Makefile ============================================================================== --- head/sysutils/kio-fuse/Makefile Sat Feb 8 14:23:36 2020 (r525553) +++ head/sysutils/kio-fuse/Makefile Sat Feb 8 14:27:04 2020 (r525554) @@ -11,7 +11,8 @@ COMMENT= FUSE Interface for KIO LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfuse3.so:sysutils/fusefs-libs3 +LIB_DEPENDS= libfuse3.so:sysutils/fusefs-libs3 \ + libboost_thread.so:devel/boost-libs USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 USE_KDE= config coreaddons kio service Modified: head/sysutils/kio-fuse/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/kio-fuse/files/patch-CMakeLists.txt Sat Feb 8 14:23:36 2020 (r525553) +++ head/sysutils/kio-fuse/files/patch-CMakeLists.txt Sat Feb 8 14:27:04 2020 (r525554) @@ -1,6 +1,20 @@ ---- CMakeLists.txt.orig 2020-01-12 09:41:08 UTC +--- CMakeLists.txt.orig 2019-12-21 15:13:04 UTC +++ CMakeLists.txt -@@ -58,7 +58,9 @@ target_compile_definitions(kio-fuse PRIVATE FUSE_USE_V +@@ -22,6 +22,7 @@ include(ECMQtDeclareLoggingCategory) + include(ECMSetupVersion) + + find_package(PkgConfig REQUIRED) ++find_package(Boost) + find_package(Qt5 ${Qt5_MIN_VERSION} COMPONENTS Core REQUIRED) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + CoreAddons +@@ -53,12 +54,14 @@ ecm_qt_declare_logging_category(KIOFUSE_SOURCES + DEFAULT_SEVERITY Warning) + + add_executable(kio-fuse ${KIOFUSE_SOURCES}) +-target_include_directories(kio-fuse PRIVATE ${FUSE3_INCLUDE_DIRS}) ++target_include_directories(kio-fuse PRIVATE ${FUSE3_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) + target_compile_definitions(kio-fuse PRIVATE FUSE_USE_VERSION=31 ${FUSE3_CFLAGS_OTHER}) target_link_options(kio-fuse PRIVATE ${FUSE3_LDFLAGS}) target_link_libraries(kio-fuse PRIVATE Qt5::Core KF5::KIOCore ${FUSE3_LIBRARIES}) install(TARGETS kio-fuse DESTINATION ${KDE_INSTALL_FULL_LIBEXECDIR})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002081427.018ER4ow002876>