From 38d4865b0cd62dc3d86b463cfdb41513827040d2 Mon Sep 17 00:00:00 2001 From: crdpa Date: Sat, 5 Apr 2025 10:02:58 -0300 Subject: [PATCH 1/2] libtorrent: update to 0.15.2. --- common/shlibs | 2 +- .../libtorrent/patches/fix-sysroot-handling.patch | 14 -------------- srcpkgs/libtorrent/template | 8 ++++---- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/libtorrent/patches/fix-sysroot-handling.patch diff --git a/common/shlibs b/common/shlibs index a51d54d5472..5289c543841 100644 --- a/common/shlibs +++ b/common/shlibs @@ -843,7 +843,7 @@ libosp.so.5 opensp-1.5.2_1 libogrove.so.0 openjade-1.3.2_1 libospgrove.so.0 openjade-1.3.2_1 libostyle.so.0 openjade-1.3.2_1 -libtorrent.so.21 libtorrent-0.13.8_4 +libtorrent.so.24 libtorrent-0.15.2_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 deleted file mode 100644 index 10b526fe45e..00000000000 --- a/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch +++ /dev/null @@ -1,14 +0,0 @@ ---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], [ - else - AC_MSG_RESULT($withval) - -- CXXFLAGS="$CXXFLAGS -isysroot $withval" -- LDFLAGS="$LDFLAGS -Wl,-syslibroot,$withval" -+ CXXFLAGS="$CXXFLAGS --sysroot=$withval" - fi - ]) - ]) diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index c499d8ba52f..7c2910154f2 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -1,7 +1,7 @@ # Template file for 'libtorrent' pkgname=libtorrent -version=0.13.8 -revision=5 +version=0.15.2 +revision=1 build_style=gnu-configure configure_args="--enable-static --disable-debug --without-kqueue --enable-aligned --with-posix-fallocate" @@ -10,11 +10,11 @@ makedepends="openssl-devel zlib-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++" -maintainer="Orphaned " +maintainer="crdpa " 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=045cfc796579dd08445745c3cd38427004202eaa7529d349e482c2b67f3b52b0 # https://github.com/rakshasa/rtorrent/issues/156 case "$XBPS_TARGET_MACHINE" in From 27a10d2fd5110d3e2fbae74efc76b64f8fb85a8c Mon Sep 17 00:00:00 2001 From: crdpa Date: Sat, 5 Apr 2025 10:03:05 -0300 Subject: [PATCH 2/2] rtorrent: update to 0.15.2. --- .../patches/fix-sysroot-handling.patch | 14 ----------- .../patches/no_xmlrpc_c_compile.patch | 23 ------------------- srcpkgs/rtorrent/template | 8 +++---- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/rtorrent/patches/fix-sysroot-handling.patch delete mode 100644 srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch diff --git a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch deleted file mode 100644 index 10b526fe45e..00000000000 --- a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch +++ /dev/null @@ -1,14 +0,0 @@ ---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], [ - else - AC_MSG_RESULT($withval) - -- CXXFLAGS="$CXXFLAGS -isysroot $withval" -- LDFLAGS="$LDFLAGS -Wl,-syslibroot,$withval" -+ CXXFLAGS="$CXXFLAGS --sysroot=$withval" - fi - ]) - ]) diff --git a/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch b/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch deleted file mode 100644 index a62596a82c7..00000000000 --- a/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 @@ - 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_MSG_RESULT(ok) -- ], [ -- AC_MSG_RESULT(failed) -- AC_MSG_ERROR(Could not compile XMLRPC-C test.) -- ]) -- - AC_DEFINE(HAVE_XMLRPC_C, 1, Support for XMLRPC-C.) - - else diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template index f64c7ba7888..0ae1a4538ec 100644 --- a/srcpkgs/rtorrent/template +++ b/srcpkgs/rtorrent/template @@ -1,18 +1,18 @@ # Template file for 'rtorrent' pkgname=rtorrent -version=0.9.8 -revision=3 +version=0.15.2 +revision=1 build_style=gnu-configure configure_args="--with-xmlrpc-c" hostmakedepends="automake libtool pkg-config" makedepends="libcppunit-devel libsigc++-devel libtorrent-devel ncurses-devel xmlrpc-c-devel" short_desc="Ncurses BitTorrent client based on libTorrent" -maintainer="Orphaned " +maintainer="crdpa " 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=17458249803042fdc21f9792ab670c49080466e3f0e045e1bca46c9f1def7701 pre_configure() { autoreconf -fi