On Tue, Sep 16, 2025 at 03:07:09PM +0200, Jeremie Courreges-Anglas wrote:
>
> Here's an update to latest pinentry.
>
> 1. The package now includes an icon referenced by the .desktop files.
> Instead of renaming/duplicating the icon in the qt* subpackages, I
> just ship the icon in the main package and add a rundep on -main.
>
> 2. Also, add the missing rundep on devel/desktop-file-utils to both
> packages.
>
> 3. pea: as discussed with Antoine, the diff moves maintainership to
> Antoine and me, so that we get notified when there are new versions
> available.
>
> 4. aja: I did not and *will not* test the gui parts for updates, so
> maybe it makes more sense that you take maintainership alone? *shrug*
>
> Thoughts? ok?
OK for me.
As you prefer for maintainership.
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/security/pinentry/Makefile,v
> diff -u -p -r1.38 Makefile
> --- Makefile 28 Jan 2025 14:49:51 -0000 1.38
> +++ Makefile 16 Sep 2025 12:10:04 -0000
> @@ -2,11 +2,8 @@ COMMENT-main = PIN or passphrase entry
> COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
> COMMENT-qt5 = PIN or passphrase entry dialog (Qt5 interface)
> COMMENT-qt6 = PIN or passphrase entry dialog (Qt6 interface)
> -REVISION-main = 1
> -REVISION-gnome3 = 0
> -REVISION-qt6 = 0
>
> -VERSION = 1.3.0
> +VERSION = 1.3.2
> DISTNAME = pinentry-${VERSION}
> CATEGORIES = security
> EXTRACT_SUFX = .tar.bz2
> @@ -15,7 +12,8 @@ SITES = ${SITE_GNUPG:=pinentry/}
>
> HOMEPAGE = https://www.gnupg.org/related_software/pinentry/index.en.html
>
> -MAINTAINER = Pierre-Emmanuel Andre <[email protected]>
> +MAINTAINER = Antoine Jacoutot <[email protected]>, \
> + Jeremie Courreges-Anglas <[email protected]>
>
> # GPLv2
> PERMIT_PACKAGE = Yes
> @@ -45,6 +43,8 @@ LIB_DEPENDS-qt5 = ${LIB_DEPENDS} \
> devel/kf5/kwayland \
> x11/qt5/qtbase \
> x11/qt5/qtx11extras
> +RUN_DEPENDS-qt5 = ${FULLPKGNAME-main}:${FULLPKGPATH-main} \
> + devel/desktop-file-utils
>
> WANTLIB-qt6 += ${WANTLIB}
> WANTLIB-qt6 += ${COMPILER_LIBCXX} Qt6Core Qt6Gui Qt6Widgets m
> @@ -54,6 +54,8 @@ LIB_DEPENDS-qt6 = ${LIB_DEPENDS} \
> devel/kf6/kguiaddons \
> devel/kf6/kwindowsystem \
> x11/qt6/qtbase
> +RUN_DEPENDS-qt6 = ${FULLPKGNAME-main}:${FULLPKGPATH-main} \
> + devel/desktop-file-utils
>
> CONFIGURE_STYLE = gnu
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include
> -D_XOPEN_SOURCE_EXTENDED" \
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/security/pinentry/distinfo,v
> diff -u -p -r1.11 distinfo
> --- distinfo 11 May 2024 10:47:47 -0000 1.11
> +++ distinfo 15 Sep 2025 16:54:57 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pinentry-1.3.0.tar.bz2) =
> mzzVIm51l/L97TmaO8ZZkjNRU2VZ6dsIJpgbyjFklN4=
> -SIZE (pinentry-1.3.0.tar.bz2) = 610363
> +SHA256 (pinentry-1.3.2.tar.bz2) =
> jphu2IVhtNpunv4MVPpMqJIwNcmSZN8LBGRJfF+5Tp4=
> +SIZE (pinentry-1.3.2.tar.bz2) = 612858
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /home/cvs/ports/security/pinentry/pkg/PLIST-main,v
> diff -u -p -r1.3 PLIST-main
> --- pkg/PLIST-main 30 Oct 2024 17:39:04 -0000 1.3
> +++ pkg/PLIST-main 16 Sep 2025 12:27:11 -0000
> @@ -2,3 +2,5 @@ bin/pinentry
> @bin bin/pinentry-curses
> @bin bin/pinentry-tty
> @info info/pinentry.info
> +share/pixmaps/
> +share/pixmaps/pinentry.png
> Index: pkg/PLIST-qt5
> ===================================================================
> RCS file: /home/cvs/ports/security/pinentry/pkg/PLIST-qt5,v
> diff -u -p -r1.3 PLIST-qt5
> --- pkg/PLIST-qt5 11 May 2024 10:47:47 -0000 1.3
> +++ pkg/PLIST-qt5 15 Sep 2025 17:13:55 -0000
> @@ -1,3 +1,4 @@
> @bin bin/pinentry-qt5
> +share/applications/
> share/applications/org.gnupg.pinentry-qt5.desktop
> @tag update-desktop-database
> Index: pkg/PLIST-qt6
> ===================================================================
> RCS file: /home/cvs/ports/security/pinentry/pkg/PLIST-qt6,v
> diff -u -p -r1.1 PLIST-qt6
> --- pkg/PLIST-qt6 11 May 2024 10:47:47 -0000 1.1
> +++ pkg/PLIST-qt6 15 Sep 2025 17:14:05 -0000
> @@ -1,4 +1,5 @@
> @conflict pinentry-qt5-<1.3.0
> @bin bin/pinentry-qt
> +share/applications/
> share/applications/org.gnupg.pinentry-qt.desktop
> @tag update-desktop-database
>
> --
> jca
--
Antoine
