Attachment 247080 Details for Bug 275613 – Patch for transmission

[patch] Patch for transmission

transmission-wip-final.patch (text/plain), 8.15 KB, created by Daniel Engberg on 2023-12-16 10:56:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-12-16 10:56:42 UTC

Size: 8.15 KB

patch

obsolete

>diff --git a/net-p2p/transmission-components/Makefile b/net-p2p/transmission-components/Makefile
>index 5815a06deeac..80d5b08dad7f 100644
>--- a/net-p2p/transmission-components/Makefile
>+++ b/net-p2p/transmission-components/Makefile
>@@ -1,7 +1,8 @@
> PORTNAME=	transmission
>-DISTVERSION=	4.0.4
>-PORTREVISION=	5
>+DISTVERSION=	4.0.5
>+PORTREVISION=	0
> CATEGORIES=	net-p2p
>+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
> 
> MAINTAINER=	mondo.debater_0q@icloud.com
> COMMENT=	Transmission BitTorrent client
>@@ -10,12 +11,15 @@ 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/fmt/format.h:devel/libfmt \
>+		${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp
>+
> LIB_DEPENDS=	libb64.so:converters/libb64 \
> 		libcurl.so:ftp/curl \
> 		libdeflate.so:archivers/libdeflate \
> 		libdht.so:devel/jech-dht \
> 		libevent.so:devel/libevent \
>-		libfmt.so:devel/libfmt \
> 		libminiupnpc.so:net/miniupnpc \
> 		libnatpmp.so:net/libnatpmp \
> 		libpsl.so:dns/libpsl \
>@@ -37,16 +41,29 @@ 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
>+#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
>+
>+# System libraries
>+EXTRACT_AFTER_ARGS=	--exclude third-party/dht \
>+			--exclude third-party/fast_float \
>+			--exclude third-party/fmt \
>+			--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
>@@ -64,12 +81,10 @@ USE_RC_SUBR=	transmission
> .endif
> 
> .if ${FLAVOR} == docs
>-USES=		cpe
>+USES=		cpe tar:xz
> .endif
> 
>-CMAKE_ARGS=	-DCMAKE_C_STANDARD_INCLUDE_DIRECTORIES=${LOCALBASE}/include \
>-		-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=${LOCALBASE}/include \
>-		-DCMAKE_INSTALL_MANDIR="${PREFIX}/man"
>+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR="${PREFIX}/man"
> CMAKE_ON=	USE_SYSTEM_B64 USE_SYSTEM_DEFLATE USE_SYSTEM_DHT \
> 		USE_SYSTEM_EVENT2 USE_SYSTEM_MINIUPNPC USE_SYSTEM_NATPMP \
> 		USE_SYSTEM_PSL USE_SYSTEM_UTP
>@@ -146,11 +161,6 @@ 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."
>-	@${MKDIR} ${WRKSRC}/third-party/fmt/include/fmt
>-	@${LN} -Fs ${PREFIX}/include/fmt ${WRKSRC}/third-party/fmt/include/fmt
>-
> .if ${FLAVOR} == docs
> pre-install:
> 	@${ECHO_MSG} "Removing outdated release notes"
>diff --git a/net-p2p/transmission-components/distinfo b/net-p2p/transmission-components/distinfo
>index d06368cb4126..12fb1ccced6b 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 = 1701995252
>+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-cmake_FindFastFloat.cmake b/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake
>new file mode 100644
>index 000000000000..3d82cd8e3b48
>--- /dev/null
>+++ b/net-p2p/transmission-components/files/patch-cmake_FindFastFloat.cmake
>@@ -0,0 +1,8 @@
>+--- cmake/FindFastFloat.cmake.orig	2023-12-08 18:49:17 UTC
>++++ cmake/FindFastFloat.cmake
>+@@ -2,4 +2,4 @@ target_include_directories(FastFloat::fast_float
>+ 
>+ target_include_directories(FastFloat::fast_float
>+     INTERFACE
>+-        ${CMAKE_CURRENT_LIST_DIR}/../third-party/fast_float/include)
>++        ${CMAKE_INSTALL_PREFIX}/include)
>diff --git a/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake b/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake
>new file mode 100644
>index 000000000000..57b5ec9d2040
>--- /dev/null
>+++ b/net-p2p/transmission-components/files/patch-cmake_FindFmt.cmake
>@@ -0,0 +1,11 @@
>+--- cmake/FindFmt.cmake.orig	2023-12-16 08:06:18 UTC
>++++ cmake/FindFmt.cmake
>+@@ -2,7 +2,7 @@ target_include_directories(fmt::fmt-header-only
>+ 
>+ target_include_directories(fmt::fmt-header-only
>+     INTERFACE
>+-        ${CMAKE_CURRENT_LIST_DIR}/../third-party/fmt/include)
>++        ${CMAKE_INSTALL_PREFIX}/include)
>+ 
>+ target_compile_definitions(fmt::fmt-header-only
>+     INTERFACE
>diff --git a/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake b/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake
>new file mode 100644
>index 000000000000..86b4caa30e3c
>--- /dev/null
>+++ b/net-p2p/transmission-components/files/patch-cmake_FindUtfCpp.cmake
>@@ -0,0 +1,8 @@
>+--- cmake/FindUtfCpp.cmake.orig	2023-12-16 08:24:21 UTC
>++++ cmake/FindUtfCpp.cmake
>+@@ -2,4 +2,4 @@ target_include_directories(utf8::cpp
>+ 
>+ target_include_directories(utf8::cpp
>+     INTERFACE
>+-        ${CMAKE_CURRENT_LIST_DIR}/../third-party/utfcpp/source)
>++        ${CMAKE_INSTALL_PREFIX}/include/utf8cpp)
>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..d9783d0c1123 100644
>--- a/net-p2p/transmission/Makefile
>+++ b/net-p2p/transmission/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	transmission
>-DISTVERSION=	4.0.4
>-PORTREVISION=	4
>+DISTVERSION=	4.0.5
>+PORTREVISION=	0
> CATEGORIES=	net-p2p
> 
> MAINTAINER=	mondo.debater_0q@icloud.com

Actions: View | Diff

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