commit: 23d1560478908752f77b0ad4d31c9a4060a59389 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Wed Dec 25 20:49:24 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Wed Dec 25 20:50:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d15604
app-crypt/gcr: fix desktop files Closes: https://bugs.gentoo.org/702040 Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> app-crypt/gcr/files/3.34.0-fix-desktop-files.patch | 61 ++++++++++++++++++++++ .../{gcr-3.34.0.ebuild => gcr-3.34.0-r1.ebuild} | 5 ++ 2 files changed, 66 insertions(+) diff --git a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch new file mode 100644 index 00000000000..0678937fcc0 --- /dev/null +++ b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch @@ -0,0 +1,61 @@ +From a69dc44e11270ce092babfa57fe3aab31da9619c Mon Sep 17 00:00:00 2001 +From: Daiki Ueno <[email protected]> +Date: Mon, 21 Oct 2019 12:02:05 +0200 +Subject: [PATCH] build: Use sed for .desktop variables substitution + +We can't do that with configure, as it leaves ${exec_prefix}. +--- + configure.ac | 2 -- + ui/Makefile.am | 6 ++++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1ba43d6..6286f16 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -423,8 +423,6 @@ gcr/gcr-version.h + po/Makefile.in + ui/gcr.pc + ui/gcr-ui.pc +-ui/gcr-prompter.desktop.in +-ui/gcr-viewer.desktop.in + ui/icons/16x16/Makefile + ui/icons/22x22/Makefile + ui/icons/24x24/Makefile +diff --git a/ui/Makefile.am b/ui/Makefile.am +index 29c33e7..7594621 100644 +--- a/ui/Makefile.am ++++ b/ui/Makefile.am +@@ -209,6 +209,8 @@ gcr_viewer_LDADD = \ + viewer_desktop_in_in = ui/gcr-viewer.desktop.in.in + viewer_desktop_in = $(viewer_desktop_in_in:.desktop.in.in=.desktop.in) + viewer_desktop = $(viewer_desktop_in:.desktop.in=.desktop) ++$(viewer_desktop_in): $(viewer_desktop_in_in) ++ $(AM_V_GEN) sed 's|@bindir[@]|$(bindir)|g' $< > $@ + $(viewer_desktop): $(viewer_desktop_in) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +@@ -231,9 +233,12 @@ gcr_prompter_LDADD = \ + prompter_desktop_in_in = ui/gcr-prompter.desktop.in.in + prompter_desktop_in = $(prompter_desktop_in_in:.desktop.in.in=.desktop.in) + prompter_desktop = $(prompter_desktop_in:.desktop.in=.desktop) ++$(prompter_desktop_in): $(prompter_desktop_in_in) ++ $(AM_V_GEN) sed 's|@libexecdir[@]|$(libexecdir)|g' $< > $@ + $(prompter_desktop): $(prompter_desktop_in) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + ++desktop_in_in_files = $(viewer_desktop_in_in) $(prompter_desktop_in_in) + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) + desktopdir = $(datadir)/applications + desktop_DATA = \ +@@ -247,6 +252,7 @@ EXTRA_DIST += \ + ui/gcr.gresource.xml \ + $(ui_RESOURCES) \ + $(mime_DATA) \ ++ $(desktop_in_in_files) \ + ui/fixtures + + CLEANFILES += \ +-- +2.24.1 + diff --git a/app-crypt/gcr/gcr-3.34.0.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild similarity index 95% rename from app-crypt/gcr/gcr-3.34.0.ebuild rename to app-crypt/gcr/gcr-3.34.0-r1.ebuild index c6e3d16d6c3..3c984e3e1e3 100644 --- a/app-crypt/gcr/gcr-3.34.0.ebuild +++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild @@ -4,6 +4,7 @@ EAPI=6 VALA_USE_DEPEND="vapigen" PYTHON_COMPAT=( python3_{6,7,8} ) +GNOME2_EAUTORECONF="yes" inherit gnome2 python-any-r1 vala virtualx @@ -46,6 +47,10 @@ DEPEND="${COMMON_DEPEND} # dev-libs/gobject-introspection-common # dev-libs/vala-common +PATCHES=( + "${FILESDIR}"/${PV}-fix-desktop-files.patch +) + pkg_setup() { python-any-r1_pkg_setup }
