Attachment 247070 Details for Bug 275613 – patch-transmission_4.0.5_2

[patch] patch-transmission_4.0.5_2

0001-net-p2p-transmission.patch (text/plain), 8.21 KB, created by Rafe on 2023-12-15 17:28:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafe

Created: 2023-12-15 17:28:37 UTC

Size: 8.21 KB

patch

obsolete

>From 942ae4767ac142fbcd5f7ef7ba9aa0f59040e2e4 Mon Sep 17 00:00:00 2001
>From: Rafe <mondo.debater_0q@icloud.com>
>Date: Sun, 10 Dec 2023 11:42:48 +0100
>Subject: [PATCH]   net-p2p/transmission
>
>  -Updated to 4.0.5
>---
> net-p2p/transmission-components/Makefile      | 38 ++++++++++++++-----
> net-p2p/transmission-components/distinfo      | 14 ++-----
> .../files/patch-libtransmission_utils.cc      | 11 ++++++
> .../patch-libtransmission_variant-json.cc     | 11 +++++-
> .../transmission-components/pkg-plist.daemon  |  3 +-
> .../transmission-components/pkg-plist.docs    |  1 +
> net-p2p/transmission/Makefile                 |  3 +-
> 7 files changed, 57 insertions(+), 24 deletions(-)
> create mode 100644 net-p2p/transmission-components/files/patch-libtransmission_utils.cc
>
>diff --git a/net-p2p/transmission-components/Makefile b/net-p2p/transmission-components/Makefile
>index 2c443ef5626d..1d42ba033d3a 100644
>--- a/net-p2p/transmission-components/Makefile
>+++ b/net-p2p/transmission-components/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	transmission
>-DISTVERSION=	4.0.4
>-PORTREVISION=	5
>+DISTVERSION=	4.0.5
> CATEGORIES=	net-p2p
>+MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSION}/
> 
> MAINTAINER=	mondo.debater_0q@icloud.com
> COMMENT=	Transmission BitTorrent client
>@@ -10,6 +10,9 @@ WWW=		https://www.transmissionbt.com
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+BUILD_DEPENDS=	${LOCALBASE}/include/fast_float/fast_float.h:math/fast_float \
>+		${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp
>+
> LIB_DEPENDS=	libb64.so:converters/libb64 \
> 		libcurl.so:ftp/curl \
> 		libdeflate.so:archivers/libdeflate \
>@@ -37,16 +40,24 @@ LIB_DEPENDS=
> gtk_LIB_DEPENDS=	libayatana-appindicator3.so:devel/libayatana-appindicator \
> 			libharfbuzz.so:print/harfbuzz
> 
>-USES=		cmake cpe iconv libtool localbase pkgconfig ssl
>+USES=		cmake cpe iconv libtool localbase pkgconfig ssl tar:xz
> 
> CPE_VENDOR=	transmissionbt
> CPE_PRODUCT=	transmission
> 
>-USE_GITHUB=	YES
>-GH_TUPLE=	google:googletest:af29db7:googletest/third-party/googletest \
>-		transmission:fast_float:6624977:fast_float/third-party/fast_float \
>-		transmission:utfcpp:b85efd6:utfcpp/third-party/utfcpp \
>-		transmission:wide-integer:4de0b52:wideinteger/third-party/wide-integer
>+EXTRACT_AFTER_ARGS+=	--exclude third-party/dht \
>+			--exclude third-party/fast_float \
>+			--exclude third-party/fmt \
>+			--exclude third-party/jsonl \
>+			--exclude third-party/libb64 \
>+			--exclude third-party/libdeflate \
>+			--exclude third-party/libevent \
>+			--exclude third-party/libnatpmp \
>+			--exclude third-party/libpsl \
>+			--exclude third-party/libutp \
>+			--exclude third-party/miniupnpc \
>+			--exclude third-party/utfcpp
>+
> 
> .if ${FLAVOR} == gtk
> USES+=		desktop-file-utils gettext-runtime gettext-tools gnome
>@@ -126,6 +137,9 @@ OPTIONS_DEFINE=		NLS TESTS
> OPTIONS_DEFAULT=	NLS
> .endif
> 
>+GH_ACCOUNT=	${PORTNAME}
>+GH_PROJECT=	${GH_ACCOUNT}
>+
> OPTIONS_SUB=	yes
> 
> daemon_DESC=	Build daemon
>@@ -141,15 +155,21 @@ NLS_USES=	gettext-runtime:lib
> NLS_CMAKE_BOOL=	ENABLE_NLS
> 
> TESTS_CMAKE_BOOL=	ENABLE_TESTS
>+TESTS_LIB_DEPENDS=	libgtest_main.so:devel/googletest
> 
> UTILS_CMAKE_BOOL=	ENABLE_UTILS
> 
> WEB_CMAKE_BOOL=	INSTALL_WEB
> 
> post-extract:
>-	@${ECHO_MSG} "Cludging use of devel/libfmt as Transmission's CMakeLists.txt does not properly search for it."
>+	@${ECHO_MSG} "Cludging use of math/fast_float, devel/libfmt, and devel/utf8cpp as Transmission's CMakeLists.txt does not properly search for them."
>+	@${MKDIR} ${WRKSRC}/third-party/fast_float/include/fast_float
> 	@${MKDIR} ${WRKSRC}/third-party/fmt/include/fmt
>+	@${MKDIR} ${WRKSRC}/third-party/utfcpp/source
>+	@${LN} -Fs ${PREFIX}/include/fmt ${WRKSRC}/third-party/fast_float/include/fast_float
> 	@${LN} -Fs ${PREFIX}/include/fmt ${WRKSRC}/third-party/fmt/include/fmt
>+	@${LN} -Fs ${PREFIX}/include/utf8cpp/utf8.h ${WRKSRC}/third-party/utfcpp/utf8.h
>+	@${LN} -Fs ${PREFIX}/include/utf8cpp/utf8 ${WRKSRC}/third-party/utfcpp/source
> 
> .if ${FLAVOR} == docs
> pre-install:
>diff --git a/net-p2p/transmission-components/distinfo b/net-p2p/transmission-components/distinfo
>index d06368cb4126..8a01187b3ccc 100644
>--- a/net-p2p/transmission-components/distinfo
>+++ b/net-p2p/transmission-components/distinfo
>@@ -1,11 +1,3 @@
>-TIMESTAMP = 1693298946
>-SHA256 (transmission-transmission-4.0.4_GH0.tar.gz) = 767b4796a43c8bd3fc9d6c64d32dd49dedce3ad14909d6773ce2694e02b22a9d
>-SIZE (transmission-transmission-4.0.4_GH0.tar.gz) = 8750421
>-SHA256 (google-googletest-af29db7_GH0.tar.gz) = cebd59f4dd7380870c4cbc57f75bd4453d84c68847fee020c95019b2841ae7a2
>-SIZE (google-googletest-af29db7_GH0.tar.gz) = 841006
>-SHA256 (transmission-fast_float-6624977_GH0.tar.gz) = a7fed3253e8604ad0b3c0649f7b99e004f61bf0b82096f43edbb597f9a9b4dc3
>-SIZE (transmission-fast_float-6624977_GH0.tar.gz) = 76763
>-SHA256 (transmission-utfcpp-b85efd6_GH0.tar.gz) = 98c7f02180c92a6b5fa90bbf157c3f441fcf47565c10948d221de3097893507a
>-SIZE (transmission-utfcpp-b85efd6_GH0.tar.gz) = 27376
>-SHA256 (transmission-wide-integer-4de0b52_GH0.tar.gz) = 8754e29f002ba78228675ad95b7eb4d828e23c7a4ec227815fe8a2238c8111eb
>-SIZE (transmission-wide-integer-4de0b52_GH0.tar.gz) = 124910
>+TIMESTAMP = 1702053578
>+SHA256 (transmission-4.0.5.tar.xz) = fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357
>+SIZE (transmission-4.0.5.tar.xz) = 9745756
>diff --git a/net-p2p/transmission-components/files/patch-libtransmission_utils.cc b/net-p2p/transmission-components/files/patch-libtransmission_utils.cc
>new file mode 100644
>index 000000000000..f01b00090a2e
>--- /dev/null
>+++ b/net-p2p/transmission-components/files/patch-libtransmission_utils.cc
>@@ -0,0 +1,11 @@
>+--- libtransmission/utils.cc.orig	2023-12-15 14:04:04 UTC
>++++ libtransmission/utils.cc
>+@@ -35,7 +35,7 @@
>+ #endif
>+ 
>+ #define UTF_CPP_CPLUSPLUS 201703L
>+-#include <utf8.h>
>++#include <utf8cpp/utf8.h>
>+ 
>+ #include <fmt/format.h>
>+ 
>diff --git a/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc b/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc
>index ef0e15d4b18e..3d263846b504 100644
>--- a/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc
>+++ b/net-p2p/transmission-components/files/patch-libtransmission_variant-json.cc
>@@ -1,5 +1,14 @@
>---- libtransmission/variant-json.cc.orig	2023-09-19 12:15:17 UTC
>+--- libtransmission/variant-json.cc.orig	2023-12-15 14:09:21 UTC
> +++ libtransmission/variant-json.cc
>+@@ -15,7 +15,7 @@
>+ #include <utility>
>+ 
>+ #define UTF_CPP_CPLUSPLUS 201703L
>+-#include <utf8.h>
>++#include <utf8cpp/utf8.h>
>+ 
>+ #include <fmt/compile.h>
>+ #include <fmt/format.h>
> @@ -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) }),
>diff --git a/net-p2p/transmission-components/pkg-plist.daemon b/net-p2p/transmission-components/pkg-plist.daemon
>index 984ef7e445cd..b57c7e1545a9 100644
>--- a/net-p2p/transmission-components/pkg-plist.daemon
>+++ b/net-p2p/transmission-components/pkg-plist.daemon
>@@ -5,5 +5,6 @@ man/man1/transmission-daemon.1.gz
> %%WEB%%%%DATADIR%%/public_html/images/favicon.png
> %%WEB%%%%DATADIR%%/public_html/images/webclip-icon.png
> %%WEB%%%%DATADIR%%/public_html/index.html
>+%%WEB%%%%DATADIR%%/public_html/transmission-app.css
> %%WEB%%%%DATADIR%%/public_html/transmission-app.js
>-%%WEB%%%%DATADIR%%/public_html/transmission-app.js.LICENSE.txt
>+%%WEB%%%%DATADIR%%/public_html/transmission-app.js.LEGAL.txt
>diff --git a/net-p2p/transmission-components/pkg-plist.docs b/net-p2p/transmission-components/pkg-plist.docs
>index ca868f754924..360c15830414 100644
>--- a/net-p2p/transmission-components/pkg-plist.docs
>+++ b/net-p2p/transmission-components/pkg-plist.docs
>@@ -5,6 +5,7 @@
> %%DOCSDIR%%/news/news-4.0.2.md
> %%DOCSDIR%%/news/news-4.0.3.md
> %%DOCSDIR%%/news/news-4.0.4.md
>+%%DOCSDIR%%/news/news-4.0.5.md
> %%DOCSDIR%%/README.md
> %%DOCSDIR%%/rpc-spec.md
> %%DOCSDIR%%/send-email-when-torrent-done.sh
>diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
>index 02f1cd97bb18..7009258d55d3 100644
>--- a/net-p2p/transmission/Makefile
>+++ b/net-p2p/transmission/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	transmission
>-DISTVERSION=	4.0.4
>-PORTREVISION=	4
>+DISTVERSION=	4.0.5
> CATEGORIES=	net-p2p
> 
> MAINTAINER=	mondo.debater_0q@icloud.com
>-- 
>2.43.0
>

Flags:

mondo.debater_0q: maintainer-approval+

Actions: View | Diff

Attachments on bug 275613: 246879 | 246881 | 246882 | 246993 | 247070 | 247080