From e6383f64f6430b835a7ae193e1271f84c1b7d20c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 23 Nov 2020 11:28:57 +0100
Subject: [PATCH] Flatpak: Do not start gpg-agent in the Fedora build

This is looking for a system-installed pinentry, in contrast to
the Flathub build, which builds its own pinentry, thus no need
to override where the pinentry is installed in the Fedora Flatpak.
---
 flatpak-evolution-wrapper.sh.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
index c57bfbe..6a311fc 100644
--- a/flatpak-evolution-wrapper.sh.in
+++ b/flatpak-evolution-wrapper.sh.in
@@ -7,8 +7,6 @@ else
    export GIO_USE_NETWORK_MONITOR=base
    gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
 
-   gpg-agent --homedir ~/.gnupg --daemon --pinentry-program=/app/bin/pinentry
-
    LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
    if [ "${LINES}" = "0" ]; then
       /app/libexec/evolution-source-registry &
@@ -28,6 +26,4 @@ else
    fi
 
    /app/bin/evolution.bin "$@"
-
-   pkill -TERM gpg-agent
 fi