Ping in regards to https://marc.info/?l=openbsd-ports&m=171828585031997&w=2
On Thu, Jun 13, 2024 at 09:40:14AM -0400, Josh Grosse wrote:
> This is a bugfix release that includes the previously patches
> that Brad cherry picked for libfmt 10.
>
> Tested on amd64. The -gtk and -qt binaries have no apparent
> regressions; the -daemon binary will still loop with libcurl if
> run in a different rdomain than zero; but this is an existing
> unresolved issue.
> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index 08397883eaf..76ce9054e43 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -2,16 +2,17 @@ COMMENT-main= BitTorrent command line and daemon
> client
> COMMENT-gtk= BitTorrent client with GTK+ interface
> COMMENT-qt= BitTorrent client with Qt interface
>
> -VER= 4.0.5
> +VER= 4.0.6
> DISTNAME= transmission-${VER}
> PKGNAME-main= transmission-${VER}
> PKGNAME-gtk= transmission-gtk-${VER}
> PKGNAME-qt= transmission-qt-${VER}
> -REVISION= 0
> CATEGORIES= net
> HOMEPAGE= https://transmissionbt.com/
> MAINTAINER= Josh Grosse <j...@jggimi.net>
>
> +DEBUG_PACKAGES=${BUILD_PACKAGES}
> +
> # GPLv2+
> PERMIT_PACKAGE= Yes
>
> @@ -45,7 +46,7 @@ WANTLIB-qt += Qt6Widgets
> MODULES += devel/cmake \
> textproc/intltool
>
> -BUILD_DEPENDS-common += devel/fmt
> +BUILD_DEPENDS += devel/fmt
>
> LIB_DEPENDS-common += archivers/libdeflate \
> net/curl \
> diff --git a/net/transmission/distinfo b/net/transmission/distinfo
> index 644e3f51975..2f5dac89a78 100644
> --- a/net/transmission/distinfo
> +++ b/net/transmission/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-4.0.5.tar.xz) =
> /Wj/EUpHkgAEPDDH5p26TBky9682ykxbXS7ctYZuY1c=
> -SIZE (transmission-4.0.5.tar.xz) = 9745756
> +SHA256 (transmission-4.0.6.tar.xz) =
> Kjj+bYojmRaAtpHCd6M1+Idb3sorl8aya1mLycewxF8=
> +SIZE (transmission-4.0.6.tar.xz) = 11908296
> diff --git a/net/transmission/patches/patch-gtk_Application_cc
> b/net/transmission/patches/patch-gtk_Application_cc
> deleted file mode 100644
> index 8a6d7516424..00000000000
> --- a/net/transmission/patches/patch-gtk_Application_cc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -deps: bump libfmt to v10.0.0
> -fd583ac878806546c3780eab939fdabd9e94c3de
> -
> -Index: gtk/Application.cc
> ---- gtk/Application.cc.orig
> -+++ 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<int>(e.code()))));
> - }
> - }
> -
> diff --git a/net/transmission/patches/patch-gtk_DetailsDialog_cc
> b/net/transmission/patches/patch-gtk_DetailsDialog_cc
> deleted file mode 100644
> index c906d17f90d..00000000000
> --- a/net/transmission/patches/patch-gtk_DetailsDialog_cc
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -fix: missing #include in DetailsDialog.cc
> -9b0be18cb5ae4c43c62ffaa6d7304f66332a5505
> -
> -Index: gtk/DetailsDialog.cc
> ---- gtk/DetailsDialog.cc.orig
> -+++ gtk/DetailsDialog.cc
> -@@ -68,6 +68,7 @@
> - #include <ws2tcpip.h>
> - #else
> - #include <arpa/inet.h>
> -+#include <sys/socket.h>
> - #endif
> -
> - using namespace std::literals;
> diff --git a/net/transmission/patches/patch-libtransmission_file-posix_cc
> b/net/transmission/patches/patch-libtransmission_file-posix_cc
> deleted file mode 100644
> index 6f876bfcb8f..00000000000
> --- a/net/transmission/patches/patch-libtransmission_file-posix_cc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -deps: bump libfmt to v10.0.0
> -fd583ac878806546c3780eab939fdabd9e94c3de
> -
> -Index: libtransmission/file-posix.cc
> ---- libtransmission/file-posix.cc.orig
> -+++ libtransmission/file-posix.cc
> -@@ -560,7 +560,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<int>(std_file)));
> - tr_error_set_from_errno(error, EINVAL);
> - }
> -
> diff --git a/net/transmission/patches/patch-libtransmission_variant-json_cc
> b/net/transmission/patches/patch-libtransmission_variant-json_cc
> deleted file mode 100644
> index 2796e46bd41..00000000000
> --- a/net/transmission/patches/patch-libtransmission_variant-json_cc
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -deps: bump libfmt to v10.0.0
> -fd583ac878806546c3780eab939fdabd9e94c3de
> -
> -Index: libtransmission/variant-json.cc
> ---- libtransmission/variant-json.cc.orig
> -+++ 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<int>(error))));
> - }
> -
> - int error_callback(jsonsl_t jsn, jsonsl_error_t error, struct
> jsonsl_state_st* state, jsonsl_char_t* at)
> diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
> index fa3fe3bf428..86781b2d4d0 100644
> --- a/net/transmission/pkg/PLIST-main
> +++ b/net/transmission/pkg/PLIST-main
> @@ -61,6 +61,7 @@ share/doc/transmission/news/news-4.0.2.md
> share/doc/transmission/news/news-4.0.3.md
> share/doc/transmission/news/news-4.0.4.md
> share/doc/transmission/news/news-4.0.5.md
> +share/doc/transmission/news/news-4.0.6.md
> share/doc/transmission/rpc-spec.md
> share/doc/transmission/send-email-when-torrent-done.sh
> @comment XXX update-plist(1) really wants this here, but -main is CLI only
