Attachment 256466 Details for Bug 283884 – Update news/nzbget port to v24.5

[patch] Update news/nzbget port to v24.5

0001-Upgrade-news-nzbget-to-v24.5.patch (text/plain), 4.70 KB, created by Alex Levy on 2025-01-06 09:10:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Levy

Created: 2025-01-06 09:10:35 UTC

Size: 4.70 KB

patch

obsolete

>From e1a00d13528dcefa258d00a8145e294f3711d339 Mon Sep 17 00:00:00 2001
>From: Alexandre Levy <a13xlevy@pm.me>
>Date: Fri, 6 Dec 2024 11:11:29 +0000
>Subject: [PATCH] Upgrade news/nzbget to v24.5
>
>Merge changes from main branch
>---
> news/nzbget/Makefile                          | 19 ++++++-------------
> news/nzbget/distinfo                          | 10 +++++-----
> .../nzbget/files/patch-cmake_par2-turbo.cmake | 15 +++++++++++++++
> news/nzbget/files/patch-cmake_posix.cmake     |  8 +++++---
> 4 files changed, 31 insertions(+), 21 deletions(-)
> create mode 100644 news/nzbget/files/patch-cmake_par2-turbo.cmake
>
>diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
>index eb8e1f893d..0743f5b90e 100644
>--- a/news/nzbget/Makefile
>+++ b/news/nzbget/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	nzbget
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	24.4
>+DISTVERSION=	24.5
> PORTREVISION=	0
> CATEGORIES=	news
> 
>@@ -16,9 +16,9 @@ RUN_DEPENDS=	7-zip>0:archivers/7-zip \
> 
> # Since v24.4 nzbget maintainers switched from libpar2 to a fork of par2cmdline-turbo which is in its own repository.
> # See https://github.com/nzbgetcom/nzbget/blob/v24.4/cmake/par2-turbo.cmake for the version to pull
>-PAR2CMDLINE_TURBO_VERSION=1.1.1-nzbget
>+PAR2CMDLINE_TURBO_VERSION=1.1.1-nzbget-20241128
> 
>-USES=		cmake:testing gnome ssl
>+USES=		cmake:testing,noninja gnome ssl
> USE_GNOME=	libxml2
> USE_GITHUB=	yes
> GH_ACCOUNT=	nzbgetcom
>@@ -31,7 +31,6 @@ BINMODE=	0755
> SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=		DOCS NCURSES PAR2 PYTHON
>-OPTIONS_SUB=		yes
> OPTIONS_DEFAULT=	NCURSES PAR2
> 
> PAR2_DESC=		PAR 2.0 compatible file verification and repair
>@@ -50,15 +49,9 @@ PYTHON_USES=	python:run,3.8+
> CMAKE_ARGS+=	-DDISABLE_SIGCHLD_HANDLER=ON
> .endif
> 
>-# We need to manually extract par2cmdline-turbo source repository as the cmake option FETCHCONTENT_FULLY_DISCONNECTED is ON by default for ports
>-post-extract-PAR2-on:
>-	${MKDIR} ${BUILD_WRKSRC}/_deps
>-	${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/_deps/par2-turbo-src
>-
>-# Clean up par2 static libraries and delete empty directories
>-post-stage-PAR2-on:
>-	${RM} ${STAGEDIR}${BUILD_WRKSRC}/lib/*.a
>-	${FIND} ${STAGEDIR} -depth -type d -not -path "${STAGEDIR}${PREFIX}*" -empty -delete
>+pre-configure-PAR2-on:
>+	${MKDIR} ${BUILD_WRKSRC}/par2-turbo/src
>+	${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/par2-turbo/src/par2-turbo
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/nzbget.conf \
>diff --git a/news/nzbget/distinfo b/news/nzbget/distinfo
>index 0c39f584b8..bb767c3ab9 100644
>--- a/news/nzbget/distinfo
>+++ b/news/nzbget/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1733307178
>-SHA256 (nzbgetcom-nzbget-v24.4_GH0.tar.gz) = ea3ebe13f5d48f040f1614b62bff9b51da134f4f689ec918997f5896cf51f337
>-SIZE (nzbgetcom-nzbget-v24.4_GH0.tar.gz) = 7279980
>-SHA256 (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget_GH0.tar.gz) = b471a76e6ac7384da87af9314826bc6d89ce879afb9485136b949cc5ce019ddf
>-SIZE (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget_GH0.tar.gz) = 3959897
>+TIMESTAMP = 1733484016
>+SHA256 (nzbgetcom-nzbget-v24.5_GH0.tar.gz) = d8a26fef9f92d63258251c69af01f39073a479e48c14114dc96d285470312c83
>+SIZE (nzbgetcom-nzbget-v24.5_GH0.tar.gz) = 7283271
>+SHA256 (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget-20241128_GH0.tar.gz) = 052c23d061baf12cd866dd115848d3671d20b4b659b67d70df28a200e5e0a8d4
>+SIZE (nzbgetcom-par2cmdline-turbo-v1.1.1-nzbget-20241128_GH0.tar.gz) = 3960077
>diff --git a/news/nzbget/files/patch-cmake_par2-turbo.cmake b/news/nzbget/files/patch-cmake_par2-turbo.cmake
>new file mode 100644
>index 0000000000..0ae2d1d6e7
>--- /dev/null
>+++ b/news/nzbget/files/patch-cmake_par2-turbo.cmake
>@@ -0,0 +1,15 @@
>+--- cmake/par2-turbo.cmake.orig	2024-12-05 05:22:43 UTC
>++++ cmake/par2-turbo.cmake
>+@@ -27,12 +27,6 @@ endif()
>+ ExternalProject_add(
>+ 	par2-turbo
>+ 	PREFIX			par2-turbo
>+-	GIT_REPOSITORY	https://github.com/nzbgetcom/par2cmdline-turbo.git
>+-	GIT_TAG			v1.1.1-nzbget-20241128
>+-	TLS_VERIFY		TRUE
>+-	GIT_SHALLOW		TRUE
>+-	GIT_PROGRESS	TRUE
>+-	DOWNLOAD_EXTRACT_TIMESTAMP	TRUE
>+ 	CMAKE_ARGS		${CMAKE_ARGS}
>+ 	INSTALL_COMMAND	""
>+ )
>diff --git a/news/nzbget/files/patch-cmake_posix.cmake b/news/nzbget/files/patch-cmake_posix.cmake
>index 05f9b14169..cf9cefd877 100644
>--- a/news/nzbget/files/patch-cmake_posix.cmake
>+++ b/news/nzbget/files/patch-cmake_posix.cmake
>@@ -1,10 +1,12 @@
>---- cmake/posix.cmake.orig	2024-11-19 07:09:42 UTC
>+--- cmake/posix.cmake.orig	2024-12-05 05:22:43 UTC
> +++ cmake/posix.cmake
>-@@ -93,7 +93,6 @@ else()
>+@@ -93,9 +93,6 @@ else()
>  
>  	if(NOT DISABLE_CURSES)
>  		set(CURSES_NEED_NCURSES TRUE)
>--		set(CURSES_NEED_WIDE TRUE)
>+-		if(NOT APPLE)
>+-			set(CURSES_NEED_WIDE TRUE)
>+-		endif()
>  		find_package(Curses REQUIRED)
>  		set(INCLUDES ${INCLUDES} ${CURSES_INCLUDE_DIRS})
>  		set(LIBS ${LIBS} ${CURSES_LIBRARIES})
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 283884: 256466