Index: head/net-im/spectral/Makefile =================================================================== --- head/net-im/spectral/Makefile (revision 550439) +++ head/net-im/spectral/Makefile (revision 550440) @@ -1,42 +1,42 @@ # $FreeBSD$ PORTNAME= spectral PORTVERSION= 817 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Glossy Matrix IM client based on Qt technologies LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \ libcmark.so:textproc/cmark USES= cmake compiler:c++17-lang gl pkgconfig qt:5 tar:bz2 USE_GL= gl USE_QT= core dbus declarative graphicaleffects gui imageformats \ multimedia network quickcontrols quickcontrols2 svg widgets \ buildtools_build linguist_build qmake_build CMAKE_ON= USE_INTREE_LIBQMC SFPMNAME= SortFilterProxyModel SFPMVERSION= 36befddf5d57faad990e72c88c5844794f274145 QUOTNAME= libQuotient QUOTVERSION= 58dfe74390ebdd8ec6611d3b8fecfe7d051ff955 DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:spectral \ ${SFPMVERSION}.zip:sfpm \ ${QUOTVERSION}.zip:quot MASTER_SITES= https://gitlab.com/spectral-im/spectral/-/archive/${PORTVERSION}/:spectral \ https://github.com/oKcerG/${SFPMNAME}/archive/:sfpm \ https://github.com/quotient-im/${QUOTNAME}/archive/:quot post-extract: ${RMDIR} ${WRKSRC}/include/${SFPMNAME} ${WRKSRC}/include/${QUOTNAME} ${LN} -s ${WRKDIR}/${SFPMNAME}-${SFPMVERSION} ${WRKSRC}/include/${SFPMNAME} ${LN} -s ${WRKDIR}/${QUOTNAME}-${QUOTVERSION} ${WRKSRC}/include/${QUOTNAME} .include Index: head/net-im/spectral/files/patch-CMakeLists.txt =================================================================== --- head/net-im/spectral/files/patch-CMakeLists.txt (revision 550439) +++ head/net-im/spectral/files/patch-CMakeLists.txt (nonexistent) @@ -1,38 +0,0 @@ -Replace the linked libraries for QtKeychain by expanded ones. - -This is a workaround for QtKeychain installing a Config.cmake file -that refers to libraries that are **not** expanded or in the -default search path (e.g. glib). Without this expansion, -we end up with -lglib in the final link line -- and no -corresponding -L/usr/local/lib to make sure it is actually found. - - ---- CMakeLists.txt.orig 2020-01-11 18:26:51 UTC -+++ CMakeLists.txt -@@ -206,6 +210,26 @@ endif(APPLE) - add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE - ${spectral_SRCS} ${spectral_QRC_SRC} $ - ${spectral_WINRC} ${${PROJECT_NAME}_MAC_ICON}) -+ -+get_target_property(_libs -+ ${QTKEYCHAIN_LIBRARIES} -+ IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) -+set(_expanded_libs "") -+foreach(d ${_libs}) -+ if(TARGET ${d}) -+ list(APPEND _expanded_libs ${d}) -+ else() -+ find_library(_expanded_d ${d}) -+ if(_expanded_d) -+ list(APPEND _expanded_libs ${_expanded_d}) -+ else() -+ list(APPEND _expanded_libs ${d}) -+ endif() -+ unset(_expanded_d) -+ endif() -+endforeach() -+set_target_properties(${QTKEYCHAIN_LIBRARIES} PROPERTIES -+ IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE ${_expanded_libs}) - - target_link_libraries(${PROJECT_NAME} - Qt5::Widgets Qt5::Quick Qt5::Qml Qt5::Gui Qt5::Network Qt5::Svg Qt5::QuickControls2 Property changes on: head/net-im/spectral/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property