commit: e240e34daa7580d75bf3e5189d0e86c7fdd2a57a Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Nov 30 21:01:01 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Nov 30 21:02:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e240e34d
app-crypt/gpa: fix icon install directory Bug: https://bugs.gentoo.org/966859 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> app-crypt/gpa/files/gpa-0.11.0-icondir.patch | 32 ++++++++++++++++++++++ .../{gpa-0.11.0-r1.ebuild => gpa-0.11.0-r2.ebuild} | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app-crypt/gpa/files/gpa-0.11.0-icondir.patch b/app-crypt/gpa/files/gpa-0.11.0-icondir.patch new file mode 100644 index 000000000000..b46ba658280a --- /dev/null +++ b/app-crypt/gpa/files/gpa-0.11.0-icondir.patch @@ -0,0 +1,32 @@ +From c37e514a51d365640a55973d77cf5e8885c1a520 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Sun, 30 Nov 2025 15:47:29 -0500 +Subject: [PATCH] Makefile.am: revert icondir to previous value + +Setting icondir to src/ results in gpa.png being installed to +$(DESTDIR)src/gpa.png. This is likely a mistake. + +Partially reverts f6dfae5e822b8079a2a68c5185fedf0721ce8090. + +Bug: https://bugs.gentoo.org/966859 +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index c6be8c7..bf6265c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,8 +45,8 @@ DISTCLEANFILES = gpadefs.h + desktopdir = $(datadir)/applications/ + desktop_DATA = gpa.desktop + ++icondir = $(datadir)/pixmaps + icon_DATA = gpa.png +-icondir = src/ + + pkgdata_DATA = gpa.png + +-- +2.52.0 + diff --git a/app-crypt/gpa/gpa-0.11.0-r1.ebuild b/app-crypt/gpa/gpa-0.11.0-r2.ebuild similarity index 88% rename from app-crypt/gpa/gpa-0.11.0-r1.ebuild rename to app-crypt/gpa/gpa-0.11.0-r2.ebuild index ebd5bee2c23c..a065fe0b7ca9 100644 --- a/app-crypt/gpa/gpa-0.11.0-r1.ebuild +++ b/app-crypt/gpa/gpa-0.11.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit xdg +inherit autotools xdg DESCRIPTION="GNU Privacy Assistant (GPA): a graphical user interface for GnuPG" HOMEPAGE="https://gnupg.org/software/gpa/"; @@ -30,10 +30,14 @@ BDEPEND=" PATCHES=( # Backports, drop on bump "${FILESDIR}"/${PV} + + # https://bugs.gentoo.org/966859 + "${FILESDIR}"/gpa-0.11.0-icondir.patch ) src_prepare() { default + eautoreconf sed -i 's/Application;//' gpa.desktop || die }
