Bump for both.
On Sun, Aug 04, 2024 at 10:17:06AM GMT, Josh Grosse wrote:
> On Sat, Aug 03, 2024 at 11:37:29PM +0000, Lucas Gabriel Vuotto wrote:
> > The PR to upstream got merged, so here is an update for libnatpmp to
> > the latest commit. There is a single non-merge commit [0] inbetween,
> > which is to remove some explicit setting in CMake that became the
> > default when they bumped the minimum version to 3.5.
> >
> > Lucas
>
> I've tested this with the updated transmission 4.0.6; the rtable issue
> has been resolved. Below is Lucas's diff, but with an update-patches
> revision added, followed by the diff for net/transmission that was posted in
> June and again in July. Please consider this another "ping."
Thanks for the "make update-patches" btw.
Lucas
diff refs/heads/master ca80566646f333620cc5ea11733e8ebaf680ae68
commit - 5a27026115546cbe11607b1197c547e14886732e
commit + ca80566646f333620cc5ea11733e8ebaf680ae68
blob - 43b62e7c1a177a807fa1566b1e12a546b2df3456
blob + 0a87b49cfb749682588085855666b840ea93326e
--- net/miniupnp/libnatpmp/Makefile
+++ net/miniupnp/libnatpmp/Makefile
@@ -1,7 +1,7 @@
COMMENT = NAT Port Mapping Protocol client library
-DIST_TUPLE = github miniupnp libnatpmp
f2433bec24ca3d3f22a8a7840728a3ac177f94ba .
-PKGNAME = libnatpmp-20240116
+DIST_TUPLE = github miniupnp libnatpmp
8257134a5dcb077e40db1946554d676e444406e4 .
+PKGNAME = libnatpmp-20240803
SHARED_LIBS = natpmp 0.1
blob - 43e639c6632fb407227c622954c6c407f7174090
blob + 7ae4db0cd4548ab2814ed0dfeb8d6527e248e9af
--- net/miniupnp/libnatpmp/distinfo
+++ net/miniupnp/libnatpmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (miniupnp-libnatpmp-f2433bec24ca3d3f22a8a7840728a3ac177f94ba.tar.gz) =
74SXmVDfs1VnBbY8nNbJVQG3Xoh/ukZiNLGH88kClmk=
-SIZE (miniupnp-libnatpmp-f2433bec24ca3d3f22a8a7840728a3ac177f94ba.tar.gz) =
28356
+SHA256 (miniupnp-libnatpmp-8257134a5dcb077e40db1946554d676e444406e4.tar.gz) =
HsX5sdi/SOHaDiyCf3TkKMbN9VUnkbun0lUaiSEtDqo=
+SIZE (miniupnp-libnatpmp-8257134a5dcb077e40db1946554d676e444406e4.tar.gz) =
28327
blob - 03eef3d8f6e5b17a81a1760103ac84c74700a809
blob + 984b71f1e7b9e79f6369928f25c08b2c06033c19
--- net/miniupnp/libnatpmp/patches/patch-CMakeLists_txt
+++ net/miniupnp/libnatpmp/patches/patch-CMakeLists_txt
@@ -3,7 +3,7 @@ https://github.com/miniupnp/libnatpmp/pull/39/commits/
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -61,7 +61,7 @@ install(TARGETS natpmp natpmpc
+@@ -57,7 +57,7 @@ install(TARGETS natpmp natpmpc
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
---- 8< ----
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
