On Thu, Feb 22, 2024 at 09:05:44PM +0000, Stuart Henderson wrote: > > +WANTLIB += json-glib-1.0 pango-1.0 pthread python3.10 secret-1 > > Please drop the hardcoded python3.10, you already have MODPY_WANTLIB.
Of course, copy/paste after WANTLIB= and port-lib-depends-check. > > +WANTLIB += sndio sodium spice-client-glib-2.0 spice-client-gtk-3.0 > > +WANTLIB += ssh ssl vncclient vncserver vte-2.91 winpr2 > > + > > +SITES= > > https://gitlab.com/Remmina/Remmina/-/archive/v${V}/ > > +SITES.fix= https://gitlab.com/Remmina/Remmina/commit/ > > +# "Fix build for openssl-1.1" > > +PATCHFILES.fix= 93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch > > truncated hashes in the index lines, this isn't a stable file I see what you mean, thanks. Thanks to minimal differences between release and fix commit, we can safely use DIST_TUPLE and the latter. 93d703ec8 Fix build for openssl-1.1 f6f3b3e5d Translated using Weblate ... b918127da Translated using Weblate ... 83f1c29ed Translated using Weblate ... a0828e365 Translated using Weblate ... 71009501c Translated using Weblate ... d2335e45c Update translation files 98a83761f Updating pot file via remmina-ci 75a0bdb79 (tag: v1.4.34) Update translation files Feedback? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/x11/remmina/Makefile,v diff -u -p -r1.62 Makefile --- Makefile 3 Feb 2024 12:39:41 -0000 1.62 +++ Makefile 22 Feb 2024 21:32:37 -0000 @@ -1,9 +1,10 @@ COMMENT= GTK+ remote desktop client -V= 1.4.33 -DISTNAME= Remmina-v.${V} -PKGNAME= ${DISTNAME:L:S/v.//} - +# post-release "Fix build for openssl-1.1" +C= 93d703ec8524dec774f36d2285a6ec87c6fabb8d +DIST_TUPLE= gitlab Remmina Remmina ${C} . +DISTNAME= Remmina-${C} +PKGNAME= remmina-1.4.34 CATEGORIES= x11 net HOMEPAGE= https://www.remmina.org/ @@ -13,12 +14,11 @@ PERMIT_PACKAGE= Yes WANTLIB += ${MODPY_WANTLIB} WANTLIB += avahi-client avahi-common avahi-ui-gtk3 c cairo crypto -WANTLIB += cups freerdp-client2 freerdp2 gcrypt gdk-3 gdk_pixbuf-2.0 +WANTLIB += cups curl freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 intl -WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sodium spice-client-glib-2.0 -WANTLIB += spice-client-gtk-3.0 ssh ssl vncclient vncserver vte-2.91 winpr2 - -SITES= https://gitlab.com/Remmina/Remmina/-/archive/v.${V}/ +WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sndio sodium +WANTLIB += spice-client-glib-2.0 spice-client-gtk-3.0 ssh ssl +WANTLIB += vncclient vncserver vte-2.91 winpr2 MODULES= devel/cmake \ lang/python @@ -34,6 +34,7 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \ devel/json-glib \ devel/vte3 \ net/avahi,,-gtk3 \ + net/curl \ net/libvncserver \ security/libsodium \ security/libssh \ @@ -46,6 +47,8 @@ RUN_DEPENDS= devel/desktop-file-utils \ misc/shared-mime-info \ x11/gtk+4,-guic +CONFIGURE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + # Appindicator is only used by Ubuntu's Unity. CONFIGURE_ARGS += -DHAVE_LIBAPPINDICATOR=OFF \ -DWITH_ICON_CACHE=OFF \ @@ -64,5 +67,10 @@ CONFIGURE_ARGS += -DWITH_KF5WALLET=OFF \ -DWITH_WWW=OFF DEBUG_PACKAGES= ${BUILD_PACKAGES} + +post-install: + # pending "Use universal /bin/sh shebang in remmina-rile-wrapper(1)" + # https://gitlab.com/Remmina/Remmina/-/merge_requests/2572 + sed -i '1s,/usr/bin/env bash,/bin/sh,' ${PREFIX}/bin/remmina-file-wrapper .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/remmina/distinfo,v diff -u -p -r1.13 distinfo --- distinfo 3 Feb 2024 12:39:41 -0000 1.13 +++ distinfo 22 Feb 2024 21:31:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (Remmina-v.1.4.33.tar.gz) = CYj47FyX8puDx+NNuicFjuOCydC6+qbVggCKdKIYcFM= -SIZE (Remmina-v.1.4.33.tar.gz) = 3690770 +SHA256 (Remmina-Remmina-93d703ec8524dec774f36d2285a6ec87c6fabb8d.tar.gz) = sQPaF6QTHIshMfabsWcfDerj1BT3N8qt6KV8ieZu/jw= +SIZE (Remmina-Remmina-93d703ec8524dec774f36d2285a6ec87c6fabb8d.tar.gz) = 3774333 Index: patches/patch-src_remmina_ssh_c =================================================================== RCS file: /cvs/ports/x11/remmina/patches/patch-src_remmina_ssh_c,v diff -u -p -r1.2 patch-src_remmina_ssh_c --- patches/patch-src_remmina_ssh_c 11 Jun 2023 20:59:09 -0000 1.2 +++ patches/patch-src_remmina_ssh_c 22 Feb 2024 16:49:44 -0000 @@ -1,7 +1,7 @@ Index: src/remmina_ssh.c --- src/remmina_ssh.c.orig +++ src/remmina_ssh.c -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #ifdef HAVE_LIBSSH /* To get definitions of NI_MAXHOST and NI_MAXSERV from <netdb.h> */ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/remmina/pkg/PLIST,v diff -u -p -r1.18 PLIST --- pkg/PLIST 11 Jun 2023 20:59:09 -0000 1.18 +++ pkg/PLIST 22 Feb 2024 18:07:32 -0000 @@ -79,6 +79,7 @@ share/icons/hicolor/scalable/emblems/org share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg share/locale/ar/LC_MESSAGES/remmina.mo share/locale/ast/LC_MESSAGES/remmina.mo +share/locale/be/LC_MESSAGES/remmina.mo share/locale/ber/ share/locale/ber/LC_MESSAGES/ share/locale/ber/LC_MESSAGES/remmina.mo
