Commit: c37872fbacfdbcb93bb9d21def71a45704c2bdb1
Parent: 5a49d84d378a1b21ab30e34043b622a66494788c
Author: Michael Forney
Date: Mon, 28 Apr 2025 13:15:20 -0700
transmission: Fix build with gcc 15.1.0
Use -isystem for the third-party includes. We want our libutp to
come first.
Add patch to fix utp_on_overhead type to match our libutp branch
(C99 bool).
Diffstat:
3 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/pkg/net/transmission/gen.lua b/pkg/net/transmission/gen.lua
@@ -36,15 +36,15 @@ cflags({
'-D __TRANSMISSION__',
'-I $dir',
'-I $srcdir',
- '-I $srcdir/third-party',
- '-I $srcdir/third-party/libb64/include',
- '-I $srcdir/third-party/libnatpmp',
'-isystem $builddir/pkg/libs/bearssl/include',
'-isystem $builddir/pkg/libs/libevent/include',
'-isystem $builddir/pkg/libs/libutp/include',
'-isystem $builddir/pkg/libs/zlib/include',
'-isystem $builddir/pkg/net/curl/include',
'-isystem $builddir/pkg/sys/openbsd/include',
+ '-isystem $srcdir/third-party',
+ '-isystem $srcdir/third-party/libb64/include',
+ '-isystem $srcdir/third-party/libnatpmp',
'-include config.h',
})
diff --git a/pkg/net/transmission/patch/0003-Fix-type-signature-of-utp_on_overhead.patch b/pkg/net/transmission/patch/0003-Fix-type-signature-of-utp_on_overhead.patch
@@ -0,0 +1,35 @@
+From 6a142118edf4a31922568bf7696615e63c71c49e Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Mon, 28 Apr 2025 13:14:22 -0700
+Subject: [PATCH] Fix type signature of utp_on_overhead
+
+Our branch of libutp uses standard C99 types.
+---
+ libtransmission/peer-io.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
+index cbdc85a2f..49e7e313d 100644
+--- a/libtransmission/peer-io.c
++++ b/libtransmission/peer-io.c
+@@ -554,7 +554,7 @@ static void utp_on_error(void* closure, int errcode)
+ }
+ }
+
+-static void utp_on_overhead(void* closure, uint8_t /* bool */ send, size_t count, int type UNUSED)
++static void utp_on_overhead(void* closure, bool send, size_t count, int type UNUSED)
+ {
+ tr_peerIo* io = closure;
+
+@@ -606,7 +606,7 @@ static void dummy_on_error(void* closure UNUSED, int errcode UNUSED)
+ {
+ }
+
+-static void dummy_on_overhead(void* closure UNUSED, uint8_t /* bool */ send UNUSED, size_t count UNUSED, int type UNUSED)
++static void dummy_on_overhead(void* closure UNUSED, bool send UNUSED, size_t count UNUSED, int type UNUSED)
+ {
+ }
+
+--
+2.45.2
+
diff --git a/pkg/net/transmission/ver b/pkg/net/transmission/ver
@@ -1 +1 @@
-3.00 r2
+3.00 r3