Index | Thread | Search

From:
Josh Grosse <josh@jggimi.net>
Subject:
Re: [MAINTAINER UPDATE] net/transmission net/miniupnp/libnatpmp
To:
Omar Polo <op@omarpolo.com>
Cc:
lucas@openbsd.org, ports@openbsd.org
Date:
Wed, 28 Aug 2024 17:00:23 -0400

Download raw body.

Thread
  • Lucas Gabriel Vuotto:

    [MAINTAINER UPDATE] net/transmission net/miniupnp/libnatpmp

  • On Wed, Aug 28, 2024 at 10:52:33PM +0200, Omar Polo wrote:
    > On 2024/08/28 16:48:45 -0400, Josh Grosse <josh@jggimi.net> wrote:
    > > On Wed, Aug 28, 2024 at 08:15:13PM +0200, Omar Polo wrote:
    > > > On 2024/08/28 20:01:59 +0200, Omar Polo <op@omarpolo.com> wrote:
    > > > > While here I'd also remove the commented ${INSTALL_MAN_DIR} since it's
    > > > > pointless
    > > > > 
    > > > > : post-install:
    > > > > :-       #${INSTALL_MAN_DIR} ${PREFIX}/man/man1
    > > > > :        ${INSTALL_MAN} ${WRKSRC}/natpmpc.1 ${PREFIX}/man/man1/natpmpc.1
    > > > > 
    > > 
    > > This has been removed in the diff below.  Note: this required an updated
    > > PLIST to remove the entry for natpmpc.1.
    > 
    > Sorry, I meant only the commented line.  It's pointless to create
    > ${PREFIX}/man/man1 since it's already there, and it's pointless to keep
    > the comment.
    > 
    > The manpage, on the other hand, while almost useless, it's better than
    > nothing!  (there is still the hope it'll get more informative / useful)
    > So please keep it!
    
    Oops.  Reverted change, removed just the one line.  PLIST no longer in
    the diff.
    
    diff --git net/miniupnp/libnatpmp/Makefile net/miniupnp/libnatpmp/Makefile
    index 43b62e7c1a1..da9613124dd 100644
    --- 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
     
    @@ -12,7 +12,6 @@ CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=TRUE
     MODULES =	devel/cmake
     
     post-install:
    -	#${INSTALL_MAN_DIR} ${PREFIX}/man/man1
     	${INSTALL_MAN} ${WRKSRC}/natpmpc.1 ${PREFIX}/man/man1/natpmpc.1
     
     .include <bsd.port.mk>
    diff --git net/miniupnp/libnatpmp/distinfo net/miniupnp/libnatpmp/distinfo
    index 43e639c6632..7ae4db0cd45 100644
    --- 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
    diff --git net/miniupnp/libnatpmp/patches/patch-CMakeLists_txt net/miniupnp/libnatpmp/patches/patch-CMakeLists_txt
    index 03eef3d8f6e..984b71f1e7b 100644
    --- 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/e654ac0638fd014d6279bafe64
     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})
      
    diff --git net/transmission/Makefile net/transmission/Makefile
    index 08397883eaf..76ce9054e43 100644
    --- net/transmission/Makefile
    +++ 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 <josh@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 net/transmission/distinfo net/transmission/distinfo
    index 644e3f51975..2f5dac89a78 100644
    --- net/transmission/distinfo
    +++ 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 net/transmission/patches/patch-gtk_Application_cc net/transmission/patches/patch-gtk_Application_cc
    deleted file mode 100644
    index 8a6d7516424..00000000000
    --- 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 net/transmission/patches/patch-gtk_DetailsDialog_cc net/transmission/patches/patch-gtk_DetailsDialog_cc
    deleted file mode 100644
    index c906d17f90d..00000000000
    --- 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 net/transmission/patches/patch-libtransmission_file-posix_cc net/transmission/patches/patch-libtransmission_file-posix_cc
    deleted file mode 100644
    index 6f876bfcb8f..00000000000
    --- 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 net/transmission/patches/patch-libtransmission_variant-json_cc net/transmission/patches/patch-libtransmission_variant-json_cc
    deleted file mode 100644
    index 2796e46bd41..00000000000
    --- 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 net/transmission/pkg/PLIST-main net/transmission/pkg/PLIST-main
    index fa3fe3bf428..86781b2d4d0 100644
    --- net/transmission/pkg/PLIST-main
    +++ 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
    
    
    
  • Lucas Gabriel Vuotto:

    [MAINTAINER UPDATE] net/transmission net/miniupnp/libnatpmp