diff --git a/net-p2p/transmission-components/Makefile b/net-p2p/transmission-components/Makefile index ba93835a1d96..1bbacf6566ff 100644 --- a/net-p2p/transmission-components/Makefile +++ b/net-p2p/transmission-components/Makefile @@ -1,204 +1,205 @@ PORTNAME= transmission -DISTVERSION= 4.0.5 -PORTREVISION= 2 +DISTVERSION= 4.0.6 +PORTREVISION= 0 CATEGORIES= net-p2p MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= mondo.debater_0q@icloud.com COMMENT= Transmission BitTorrent client WWW= https://www.transmissionbt.com LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/fast_float/fast_float.h:math/fast_float \ ${LOCALBASE}/include/fmt/format.h:devel/libfmt \ - ${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp + ${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp \ + ${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson LIB_DEPENDS= libb64.so:converters/libb64 \ libcurl.so:ftp/curl \ libdeflate.so:archivers/libdeflate \ libdht.so:devel/jech-dht \ libevent.so:devel/libevent \ libminiupnpc.so:net/miniupnpc \ libnatpmp.so:net/libnatpmp \ libpsl.so:dns/libpsl \ libutp.so:net-p2p/libutp FLAVORS= cli docs daemon gtk qt utils web FLAVOR?= ${FLAVORS:[1]} .for flavor in ${FLAVORS} ${flavor}_PKGNAMESUFFIX= -${flavor} .endfor DESCR= ${PKGDIR}/pkg-descr.${FLAVOR} .if ${FLAVOR} == docs NO_BUILD= yes LIB_DEPENDS= .endif gtk_LIB_DEPENDS= libayatana-appindicator3.so:devel/libayatana-appindicator \ libharfbuzz.so:print/harfbuzz USES= cmake cpe iconv localbase pkgconfig ssl tar:xz CPE_VENDOR= transmissionbt CPE_PRODUCT= transmission EXTRACT_AFTER_ARGS= --exclude third-party/dht \ --exclude third-party/fast_float \ --exclude third-party/fmt \ --exclude third-party/libb64 \ --exclude third-party/libdeflate \ --exclude third-party/libevent \ --exclude third-party/libnatpmp \ --exclude third-party/libpsl \ --exclude third-party/libutp \ --exclude third-party/miniupnpc \ + --exclude third-party/rapidjson \ --exclude third-party/utfcpp .if ${FLAVOR} == gtk USES+= desktop-file-utils gettext-runtime gettext-tools gnome USE_GNOME= gdkpixbuf2 glibmm gtkmm30 .endif .if ${FLAVOR} == qt USES+= desktop-file-utils qmake:no_env qt:5 USE_QT= core dbus gui network svg widgets buildtools:build \ linguisttools:build .endif .if ${FLAVOR} == daemon USE_RC_SUBR= transmission .endif .if ${FLAVOR} == docs USES= cpe tar:xz .endif .if ${FLAVOR} == web USES= cpe tar:xz NO_ARCH= yes NO_BUILD= yes #PORTDATA= public_html .endif CMAKE_ON= USE_SYSTEM_B64 USE_SYSTEM_DEFLATE USE_SYSTEM_DHT \ USE_SYSTEM_EVENT2 USE_SYSTEM_MINIUPNPC USE_SYSTEM_NATPMP \ USE_SYSTEM_PSL USE_SYSTEM_UTP CMAKE_OFF= ENABLE_MAC REBUILD_WEB WITH_SYSTEMD .if ${FLAVOR:Ndocs} USERS= transmission GROUPS= transmission .endif PLIST= ${PKGDIR}/pkg-plist.${FLAVOR} .if ${FLAVOR} == cli CMAKE_ON+= ENABLE_CLI CMAKE_OFF+= ENABLE_DAEMON ENABLE_GTK ENABLE_QT ENABLE_UTILS INSTALL_WEB .endif .if ${FLAVOR} == daemon CMAKE_ON+= ENABLE_DAEMON CMAKE_OFF+= ENABLE_CLI ENABLE_GTK ENABLE_QT ENABLE_UTILS INSTALL_WEB .endif .if ${FLAVOR} == gtk CMAKE_ON+= ENABLE_GTK GTK_IS_REQUIRED CMAKE_ARGS+= -DUSE_GTK_VERSION=3 CMAKE_OFF+= ENABLE_CLI ENABLE_DAEMON ENABLE_UTILS INSTALL_WEB .endif .if ${FLAVOR} == qt CMAKE_ON+= ENABLE_QT QT_IS_REQUIRED CMAKE_ARGS+= -DUSE_QT_VERSION=5 CMAKE_OFF+= ENABLE_CLI ENABLE_DAEMON ENABLE_UTILS INSTALL_WEB .endif .if ${FLAVOR} == utils CMAKE_ON+= ENABLE_UTILS CMAKE_OFF+= ENABLE_CLI ENABLE_DAEMON ENABLE_GTK ENABLE_QT ENABLE_TESTS \ ENABLE_WERROR INSTALL_WEB .endif OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options .if ${FLAVOR:Mdaemon} OPTIONS_DEFINE= NLS TESTS OPTIONS_DEFAULT= NLS .endif .if ${FLAVOR:Mdocs} OPTIONS_DEFINE= .endif .if ${FLAVOR:Ndaemon} && ${FLAVOR:Ndocs} OPTIONS_DEFINE= NLS TESTS OPTIONS_DEFAULT= NLS .endif OPTIONS_SUB= yes daemon_DESC= Build daemon docs_DESC= Install documentation gtk_DESC= Build GTK+ client qt_DESC= Build QT client TESTS_DESC= Build & run unit tests utils_DESC= Build utilities (create, edit, remote, show) cli_DESC= Build command-line client (deprecated) -#web_DESC= Install web interface NLS_USES= gettext-runtime:lib NLS_CMAKE_BOOL= ENABLE_NLS TESTS_CMAKE_BOOL= ENABLE_TESTS UTILS_CMAKE_BOOL= ENABLE_UTILS WEB_CMAKE_BOOL= INSTALL_WEB .if ${FLAVOR} == docs pre-install: @${ECHO_MSG} "Removing outdated release notes" @${FIND} ${WRKSRC}/news \( -name 'news-[0-3]*' -o -name '*beta*' \) -delete do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} ; ${CP} AUTHORS ${STAGEDIR}${DOCSDIR} ;\ ${CP} COPYING ${STAGEDIR}${DOCSDIR} ;\ ${CP} README.md ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/docs ; ${CP} rpc-spec.md ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/extras ; ${CP} send-email-when-torrent-done.sh ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/news @cd ${WRKSRC}/news ; ${CP} -R . ${STAGEDIR}${DOCSDIR}/news .endif .if ${FLAVOR} == qt post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/transmission-qt.svg .endif .if ${FLAVOR} == daemon post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/home .endif .if ${FLAVOR} == web do-install: ( cd ${WRKSRC}/web && ${COPYTREE_SHARE} public_html ${STAGEDIR}${DATADIR} ) .endif post-install-TESTS-on: @${ECHO_MSG} "Running tests..." @cd ${BUILD_WRKSRC}/tests/libtransmission/ && \ eval ${BUILD_WRKSRC}/tests/libtransmission/libtransmission-test \ --gtest_filter="-DhtTest.usesBootstrapFile" \ #fails in poudriere due to lack of networking, passes otherwise --gtest_brief=1 \ .include diff --git a/net-p2p/transmission-components/distinfo b/net-p2p/transmission-components/distinfo index 12fb1ccced6b..1debd6dfbbaa 100644 --- a/net-p2p/transmission-components/distinfo +++ b/net-p2p/transmission-components/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701995252 -SHA256 (transmission-4.0.5.tar.xz) = fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357 -SIZE (transmission-4.0.5.tar.xz) = 9745756 +TIMESTAMP = 1717026106 +SHA256 (transmission-4.0.6.tar.xz) = 2a38fe6d8a23991680b691c277a335f8875bdeca2b97c6b26b598bc9c7b0c45f +SIZE (transmission-4.0.6.tar.xz) = 11908296 diff --git a/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake b/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake index 3d82cd8e3b48..95e27a51ce23 100644 --- a/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake +++ b/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake @@ -1,8 +1,8 @@ ---- cmake/FindFastFloat.cmake.orig 2023-12-08 18:49:17 UTC +--- cmake/FindFastFloat.cmake.orig 2024-02-22 15:48:36 UTC +++ cmake/FindFastFloat.cmake @@ -2,4 +2,4 @@ target_include_directories(FastFloat::fast_float target_include_directories(FastFloat::fast_float INTERFACE -- ${CMAKE_CURRENT_LIST_DIR}/../third-party/fast_float/include) -+ ${CMAKE_INSTALL_PREFIX}/include) +- ${TR_THIRD_PARTY_SOURCE_DIR}/fast_float/include) ++ ${CMAKE_INSTALL_PREFIX}/include) diff --git a/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake b/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake index 57b5ec9d2040..f5ba5dee86f9 100644 --- a/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake +++ b/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake @@ -1,11 +1,11 @@ ---- cmake/FindFmt.cmake.orig 2023-12-16 08:06:18 UTC +--- cmake/FindFmt.cmake.orig 2024-04-30 16:44:38 UTC +++ cmake/FindFmt.cmake @@ -2,7 +2,7 @@ target_include_directories(fmt::fmt-header-only target_include_directories(fmt::fmt-header-only INTERFACE - ${CMAKE_CURRENT_LIST_DIR}/../third-party/fmt/include) -+ ${CMAKE_INSTALL_PREFIX}/include) ++ ${CMAKE_INSTALL_PREFIX}/include) target_compile_definitions(fmt::fmt-header-only INTERFACE diff --git a/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake b/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake index 86b4caa30e3c..49ad66cf5725 100644 --- a/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake +++ b/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake @@ -1,8 +1,8 @@ ---- cmake/FindUtfCpp.cmake.orig 2023-12-16 08:24:21 UTC +--- cmake/FindUtfCpp.cmake.orig 2024-02-22 15:49:05 UTC +++ cmake/FindUtfCpp.cmake @@ -2,4 +2,4 @@ target_include_directories(utf8::cpp target_include_directories(utf8::cpp INTERFACE -- ${CMAKE_CURRENT_LIST_DIR}/../third-party/utfcpp/source) -+ ${CMAKE_INSTALL_PREFIX}/include/utf8cpp) +- ${CMAKE_CURRENT_LIST_DIR}/../third-party/utfcpp/source) ++ ${CMAKE_INSTALL_PREFIX}/include/utf8cpp) diff --git a/net-p2p/transmission-components/files/patch-gtk_Application.cc b/net-p2p/transmission-components/files/patch-gtk_Application.cc deleted file mode 100644 index 7160dab7acf9..000000000000 --- a/net-p2p/transmission-components/files/patch-gtk_Application.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/Application.cc.orig 2023-09-19 12:12:08 UTC -+++ gtk/Application.cc -@@ -395,7 +395,7 @@ void register_magnet_link_handler() - _("Couldn't register Transmission as a {content_type} handler: {error} ({error_code})"), - fmt::arg("content_type", content_type), - fmt::arg("error", e.what()), -- fmt::arg("error_code", e.code()))); -+ fmt::arg("error_code", static_cast(e.code())))); - } - } - diff --git a/net-p2p/transmission-components/files/patch-gtk_DetailsDialog.cc b/net-p2p/transmission-components/files/patch-gtk_DetailsDialog.cc deleted file mode 100644 index d759cae1a443..000000000000 --- a/net-p2p/transmission-components/files/patch-gtk_DetailsDialog.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk/DetailsDialog.cc.orig 2023-07-05 18:51:40 UTC -+++ gtk/DetailsDialog.cc -@@ -68,6 +68,7 @@ - #include - #else - #include -+#include - #endif - - using namespace std::literals; diff --git a/net-p2p/transmission-components/files/patch-libtransmission_file-posix.cc b/net-p2p/transmission-components/files/patch-libtransmission_file-posix.cc deleted file mode 100644 index 9e43e4252943..000000000000 --- a/net-p2p/transmission-components/files/patch-libtransmission_file-posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- libtransmission/file-posix.cc.orig 2023-09-19 12:13:51 UTC -+++ libtransmission/file-posix.cc -@@ -556,7 +556,7 @@ tr_sys_file_t tr_sys_file_get_std(tr_std_sys_file_t st - break; - - default: -- TR_ASSERT_MSG(false, fmt::format(FMT_STRING("unknown standard file {:d}"), std_file)); -+ TR_ASSERT_MSG(false, fmt::format(FMT_STRING("unknown standard file {:d}"), static_cast(std_file))); - tr_error_set_from_errno(error, EINVAL); - } - diff --git a/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc b/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc deleted file mode 100644 index ef0e15d4b18e..000000000000 --- a/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- libtransmission/variant-json.cc.orig 2023-09-19 12:15:17 UTC -+++ libtransmission/variant-json.cc -@@ -99,7 +99,7 @@ void error_handler(jsonsl_t jsn, jsonsl_error_t error, - fmt::arg("position", jsn->pos), - fmt::arg("text", std::string_view{ buf, std::min(size_t{ 16U }, data->size - jsn->pos) }), - fmt::arg("error", jsonsl_strerror(error)), -- fmt::arg("error_code", error))); -+ fmt::arg("error_code", static_cast(error)))); - } - - int error_callback(jsonsl_t jsn, jsonsl_error_t error, struct jsonsl_state_st* state, jsonsl_char_t* at) diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile index 2e959e11fe6a..11980c338b0a 100644 --- a/net-p2p/transmission/Makefile +++ b/net-p2p/transmission/Makefile @@ -1,33 +1,33 @@ PORTNAME= transmission -DISTVERSION= 4.0.5 -PORTREVISION= 1 +DISTVERSION= 4.0.6 +PORTREVISION= 0 CATEGORIES= net-p2p MAINTAINER= mondo.debater_0q@icloud.com COMMENT= Transmission BitTorrent client WWW= https://www.transmissionbt.com LICENSE= GPLv3+ USES= metaport OPTIONS_DEFINE= CLI DAEMON DOCS GTK QT UTILS WEB OPTIONS_DEFAULT= CLI DAEMON GTK QT UTILS WEB CLI_DESC= Build command-line client (deprecated) DAEMON_DESC= Build daemon DOCS_DESC= Install documentation GTK_DESC= Build GTK+ client QT_DESC= Build QT client UTILS_DESC= Build utilities (create, edit, remote, show) WEB_DESC= Install web interface CLI_RUN_DEPENDS= transmission-cli:net-p2p/transmission-components@cli DAEMON_RUN_DEPENDS= transmission-daemon:net-p2p/transmission-components@daemon DOCS_RUN_DEPENDS= ${DOCSDIR}/README.md:net-p2p/transmission-components@docs GTK_RUN_DEPENDS= transmission-gtk:net-p2p/transmission-components@gtk QT_RUN_DEPENDS= transmission-qt:net-p2p/transmission-components@qt UTILS_RUN_DEPENDS= transmission-create:net-p2p/transmission-components@utils WEB_RUN_DEPENDS= ${DATADIR}/public_html/index.html:net-p2p/transmission-components@web .include