Attachment 244633 Details for Bug 273564 – patch

[patch] patch

remmina.patch (text/plain), 2.56 KB, created by Yuri Victorovich on 2023-09-04 17:06:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2023-09-04 17:06:32 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/net/remmina/Makefile b/net/remmina/Makefile
>index a9238bb6cc78..6ac96abed278 100644
>--- a/net/remmina/Makefile
>+++ b/net/remmina/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	remmina
>-DISTVERSION=	1.4.31
>+DISTVERSION=	1.4.31-20230904
> CATEGORIES=	net gnome
> 
> MAINTAINER=	fernape@FreeBSD.org
>@@ -26,7 +26,7 @@ USES=		cmake compiler:c11 desktop-file-utils gettext gnome localbase:ldflags pat
> USE_GITLAB=	yes
> GL_ACCOUNT=	Remmina
> GL_PROJECT=	Remmina
>-GL_TAGNAME=	61ea9b6681104cadf0a3f8c25bd3e5685ee6691a
>+GL_TAGNAME=	f3925148d2febe7a3b6ade60f7dded2df122af60
> 
> USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
> 
>@@ -36,7 +36,8 @@ SHEBANG_FILES=	data/desktop/remmina-file-wrapper.in
> bash_CMD=	${SH}
> 
> CMAKE_ARGS=	-DWITH_APPINDICATOR:BOOL=false \
>-	-DLIBSOUP_LIBRARY=/usr/local/lib/libsoup-2.4.so
>+		-DLIBSOUP_LIBRARY=/usr/local/lib/libsoup-2.4.so \
>+		-DREMMINA_GIT_REVISION=${GL_TAGNAME}
> 
> CONFLICTS_INSTALL=	remmina-plugin*
> 
>diff --git a/net/remmina/distinfo b/net/remmina/distinfo
>index e81ae5bdf85f..44a83f13c7dd 100644
>--- a/net/remmina/distinfo
>+++ b/net/remmina/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1683627435
>-SHA256 (Remmina-Remmina-61ea9b6681104cadf0a3f8c25bd3e5685ee6691a_GL0.tar.gz) = da7920502169820a87bf4b5668176e4e8c4ab20fcfc86634f6022f76597bc73c
>-SIZE (Remmina-Remmina-61ea9b6681104cadf0a3f8c25bd3e5685ee6691a_GL0.tar.gz) = 3592308
>+TIMESTAMP = 1693844804
>+SHA256 (Remmina-Remmina-f3925148d2febe7a3b6ade60f7dded2df122af60_GL0.tar.gz) = 69afa0ff5c259fcc214ce2678b4b70725685358c8a3f0c488b9684ede0d03bc9
>+SIZE (Remmina-Remmina-f3925148d2febe7a3b6ade60f7dded2df122af60_GL0.tar.gz) = 3677910
>diff --git a/net/remmina/files/patch-CMakeLists.txt b/net/remmina/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..049f91438a87
>--- /dev/null
>+++ b/net/remmina/files/patch-CMakeLists.txt
>@@ -0,0 +1,21 @@
>+- submitted as merge request: https://gitlab.com/Remmina/Remmina/-/merge_requests/2529
>+
>+--- CMakeLists.txt.orig	2023-09-04 16:39:58 UTC
>++++ CMakeLists.txt
>+@@ -300,10 +300,12 @@ set(WITH_LIBRARY_VERSIONING "ON")
>+ 
>+ message(STATUS "Remmina version: ${Remmina_VERSION}")
>+ 
>+-include(GetGitRevisionDescription)
>+-git_get_exact_tag(REMMINA_GIT_REVISION --tags --always)
>+-if(${REMMINA_GIT_REVISION} STREQUAL "n/a")
>+-  git_rev_parse(REMMINA_GIT_REVISION --short)
>++if (NOT DEFINED REMMINA_GIT_REVISION)
>++  include(GetGitRevisionDescription)
>++  git_get_exact_tag(REMMINA_GIT_REVISION --tags --always)
>++  if(NOT ${REMMINA_GIT_REVISION} STREQUAL "n/a")
>++    git_rev_parse(REMMINA_GIT_REVISION --short)
>++  endif()
>+ endif()
>+ 
>+ message(STATUS "Git Revision: ${REMMINA_GIT_REVISION}")

Actions: View | Diff

Attachments on bug 273564: 244633 | 245189