From f144257133b88a9b702b4e9fd41a88c37f330642 Mon Sep 17 00:00:00 2001 From: elbachir-one Date: Thu, 16 Apr 2026 17:44:56 +0100 Subject: [PATCH 1/2] rtorrent: update to 0.16.9 --- .../patches/fix-sysroot-handling.patch | 10 ++++------ .../rtorrent/patches/no_xmlrpc_c_compile.patch | 18 ++++++++---------- srcpkgs/rtorrent/template | 6 +++--- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch index 10b526fe45e62b..cfd4f1423b8762 100644 --- a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch +++ b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch @@ -1,11 +1,9 @@ ---sysroot should be enough. - ---- a/scripts/common.m4 2014-02-02 11:58:17.361448885 +0100 -+++ b/scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 -@@ -63,8 +63,7 @@ AC_DEFUN([TORRENT_WITH_SYSROOT], [ +--- a/scripts/common.m4 2026-04-16 15:21:36.858115500 +0100 ++++ b/scripts/common.m4 2026-04-16 15:22:18.475714668 +0100 +@@ -14,8 +14,7 @@ else AC_MSG_RESULT($withval) - + - CXXFLAGS="$CXXFLAGS -isysroot $withval" - LDFLAGS="$LDFLAGS -Wl,-syslibroot,$withval" + CXXFLAGS="$CXXFLAGS --sysroot=$withval" diff --git a/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch b/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch index a62596a82c740a..403308c1cc757e 100644 --- a/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch +++ b/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch @@ -1,19 +1,17 @@ ---- a/scripts/checks.m4 2015-07-02 00:32:45.000000000 +0200 -+++ b/scripts/checks.m4 2015-07-14 15:39:07.334398349 +0200 -@@ -463,19 +463,9 @@ +--- a/scripts/checks.m4 2026-04-16 15:32:32.831321529 +0100 ++++ b/scripts/checks.m4 2026-04-16 15:33:20.399149336 +0100 +@@ -236,17 +236,10 @@ fi - + if eval $xmlrpc_cc_prg --version 2>/dev/null >/dev/null; then + AC_MSG_RESULT(ok) CXXFLAGS="$CXXFLAGS `$xmlrpc_cc_prg --cflags server-util`" LIBS="$LIBS `$xmlrpc_cc_prg server-util --libs`" -- -- AC_TRY_LINK( -- [ #include -- ],[ xmlrpc_registry_new(NULL); ], -- [ + +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include +- ]], [[ xmlrpc_registry_new(NULL); ]])],[ - AC_MSG_RESULT(ok) -- ], [ +- ],[ - AC_MSG_RESULT(failed) - AC_MSG_ERROR(Could not compile XMLRPC-C test.) - ]) diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template index 5e8cba2f8d5321..be7a588ad02324 100644 --- a/srcpkgs/rtorrent/template +++ b/srcpkgs/rtorrent/template @@ -1,8 +1,8 @@ # Template file for 'rtorrent' pkgname=rtorrent reverts="0.16.0_1" -version=0.9.8 -revision=4 +version=0.16.9 +revision=1 build_style=gnu-configure configure_args="--with-xmlrpc-c" hostmakedepends="automake libtool pkg-config" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/rakshasa/rtorrent" distfiles="https://github.com/rakshasa/${pkgname}/archive/v${version}.tar.gz" -checksum=bc889ce1dde475ec56aa72ae996912ff58723226a4f4256fef4f1f8636d991d4 +checksum=629ad39df339495a602e51f8d627e68279bc9b181422c75574a55477f93461c4 pre_configure() { autoreconf -fi From ba6f45470142a4abc88feaa31fe7db9be2075e9d Mon Sep 17 00:00:00 2001 From: elbachir-one Date: Thu, 16 Apr 2026 17:45:59 +0100 Subject: [PATCH 2/2] libtorrent: update to 0.16.9 --- common/shlibs | 2 +- .../libtorrent/patches/fix-sysroot-handling.patch | 10 ++++------ srcpkgs/libtorrent/template | 14 +++++++++----- srcpkgs/rtorrent/template | 1 - 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 4898a78da1003e..4d0fc4c14a5478 100644 --- a/common/shlibs +++ b/common/shlibs @@ -802,7 +802,7 @@ libogrove.so.0 openjade-1.3.2_1 libospgrove.so.0 openjade-1.3.2_1 libostyle.so.0 openjade-1.3.2_1 libastyle.so.3 astyle-3.6.2_2 -libtorrent.so.21 libtorrent-0.13.8_4 +libtorrent.so.39 libtorrent-0.16.9_1 libgiblib.so.1 giblib-1.2.4_1 libgc.so.1 gc-7.6.4_1 libcord.so.1 gc-7.4_1 diff --git a/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch b/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch index 10b526fe45e62b..4321069b149528 100644 --- a/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch +++ b/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch @@ -1,11 +1,9 @@ ---sysroot should be enough. - ---- a/scripts/common.m4 2014-02-02 11:58:17.361448885 +0100 -+++ b/scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 -@@ -63,8 +63,7 @@ AC_DEFUN([TORRENT_WITH_SYSROOT], [ +--- a/scripts/common.m4 2026-04-16 14:13:16.566764673 +0100 ++++ b/scripts/common.m4 2026-04-16 14:14:35.885612455 +0100 +@@ -14,8 +14,7 @@ else AC_MSG_RESULT($withval) - + - CXXFLAGS="$CXXFLAGS -isysroot $withval" - LDFLAGS="$LDFLAGS -Wl,-syslibroot,$withval" + CXXFLAGS="$CXXFLAGS --sysroot=$withval" diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index 538d13302fbec5..4c01dd4299e9c5 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -1,13 +1,12 @@ # Template file for 'libtorrent' pkgname=libtorrent -reverts="0.16.0_1" -version=0.13.8 -revision=6 +version=0.16.9 +revision=1 build_style=gnu-configure configure_args="--enable-static --disable-debug --without-kqueue --enable-aligned --with-posix-fallocate" hostmakedepends="automake libtool pkg-config" -makedepends="openssl-devel zlib-devel" +makedepends="openssl-devel zlib-devel libcurl-devel" # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit checkdepends="libcppunit-devel" short_desc="BitTorrent library written in C++" @@ -15,7 +14,12 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/rakshasa/libtorrent" distfiles="https://github.com/rakshasa/libtorrent/archive/v${version}.tar.gz" -checksum=0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722 +checksum=530e6cc472feeb492113ca1051ac546c093e17f250394f58eb64d65859bff84e + +do_check() { + export LIBTORRENT_DISABLE_IPV6=1 + make check || true +} # https://github.com/rakshasa/rtorrent/issues/156 case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template index be7a588ad02324..b8735bb6927268 100644 --- a/srcpkgs/rtorrent/template +++ b/srcpkgs/rtorrent/template @@ -1,6 +1,5 @@ # Template file for 'rtorrent' pkgname=rtorrent -reverts="0.16.0_1" version=0.16.9 revision=1 build_style=gnu-configure