Attachment #244633 for bug #273564




PORTNAME=	remmina
DISTVERSION=	1.4.31-20230904
CATEGORIES=	net gnome

MAINTAINER=	fernape@FreeBSD.org

USE_GITLAB=	yes
GL_ACCOUNT=	Remmina
GL_PROJECT=	Remmina
GL_TAGNAME=	f3925148d2febe7a3b6ade60f7dded2df122af60

USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango


bash_CMD=	${SH}

CMAKE_ARGS=	-DWITH_APPINDICATOR:BOOL=false \
		-DLIBSOUP_LIBRARY=/usr/local/lib/libsoup-2.4.so \
		-DREMMINA_GIT_REVISION=${GL_TAGNAME}

CONFLICTS_INSTALL=	remmina-plugin*


Lines 1-3 Link Here

(-)b/net/remmina/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1683627435	1	TIMESTAMP = 1693844804
2	SHA256 (Remmina-Remmina-61ea9b6681104cadf0a3f8c25bd3e5685ee6691a_GL0.tar.gz) = da7920502169820a87bf4b5668176e4e8c4ab20fcfc86634f6022f76597bc73c	2	SHA256 (Remmina-Remmina-f3925148d2febe7a3b6ade60f7dded2df122af60_GL0.tar.gz) = 69afa0ff5c259fcc214ce2678b4b70725685358c8a3f0c488b9684ede0d03bc9
3	SIZE (Remmina-Remmina-61ea9b6681104cadf0a3f8c25bd3e5685ee6691a_GL0.tar.gz) = 3592308	3	SIZE (Remmina-Remmina-f3925148d2febe7a3b6ade60f7dded2df122af60_GL0.tar.gz) = 3677910




- 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}")

Return to bug 273564

Lines 1-5 Link Here

(-)b/net/remmina/Makefile (-3 / +4 lines)
1	PORTNAME= remmina	1	PORTNAME= remmina
2	DISTVERSION= 1.4.31	2	DISTVERSION= 1.4.31-20230904
3	CATEGORIES= net gnome	3	CATEGORIES= net gnome
4		4
5	MAINTAINER= fernape@FreeBSD.org	5	MAINTAINER= fernape@FreeBSD.org
Lines 26-32 USES= cmake compiler:c11 desktop-file-utils gettext gnome localbase:ldflags pat Link Here
26	USE_GITLAB= yes	26	USE_GITLAB= yes
27	GL_ACCOUNT= Remmina	27	GL_ACCOUNT= Remmina
28	GL_PROJECT= Remmina	28	GL_PROJECT= Remmina
29	GL_TAGNAME= 61ea9b6681104cadf0a3f8c25bd3e5685ee6691a	29	GL_TAGNAME= f3925148d2febe7a3b6ade60f7dded2df122af60
30		30
31	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango	31	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango
32		32
Lines 36-42 SHEBANG_FILES= data/desktop/remmina-file-wrapper.in Link Here
36	bash_CMD= ${SH}	36	bash_CMD= ${SH}
37		37
38	CMAKE_ARGS= -DWITH_APPINDICATOR:BOOL=false \	38	CMAKE_ARGS= -DWITH_APPINDICATOR:BOOL=false \
39	-DLIBSOUP_LIBRARY=/usr/local/lib/libsoup-2.4.so	39	-DLIBSOUP_LIBRARY=/usr/local/lib/libsoup-2.4.so \
		40	-DREMMINA_GIT_REVISION=${GL_TAGNAME}
40		41
41	CONFLICTS_INSTALL= remmina-plugin*	42	CONFLICTS_INSTALL= remmina-plugin*
42		43

Added Link Here

(-)b/net/remmina/files/patch-CMakeLists.txt (+21 lines)
1	- submitted as merge request: https://gitlab.com/Remmina/Remmina/-/merge_requests/2529
2
3	--- CMakeLists.txt.orig 2023-09-04 16:39:58 UTC
4	+++ CMakeLists.txt
5	@@ -300,10 +300,12 @@ set(WITH_LIBRARY_VERSIONING "ON")
6
7	message(STATUS "Remmina version: ${Remmina_VERSION}")
8
9	-include(GetGitRevisionDescription)
10	-git_get_exact_tag(REMMINA_GIT_REVISION --tags --always)
11	-if(${REMMINA_GIT_REVISION} STREQUAL "n/a")
12	- git_rev_parse(REMMINA_GIT_REVISION --short)
13	+if (NOT DEFINED REMMINA_GIT_REVISION)
14	+ include(GetGitRevisionDescription)
15	+ git_get_exact_tag(REMMINA_GIT_REVISION --tags --always)
16	+ if(NOT ${REMMINA_GIT_REVISION} STREQUAL "n/a")
17	+ git_rev_parse(REMMINA_GIT_REVISION --short)
18	+ endif()
19	endif()
20
21	message(STATUS "Git Revision: ${REMMINA_GIT_REVISION}")