From 828d2b7aca107d3734124451ce2070bf0e79df64 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 8 Jan 2021 13:44:01 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/evolution.git#2dbea5a9cc2ac8390e94c5e65b69c0aa5669e8dd
---
 evolution.spec                  | 17 ++++++++++++-----
 flatpak-evolution-wrapper.sh.in |  5 +----
 sources                         |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index a65ab8b..099af85 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,13 +11,13 @@
 %global tnef_support 1
 %endif
 
-%define glib2_version 2.46.0
-%define gtk3_version 3.10.0
+%define glib2_version 2.56
+%define gtk3_version 3.22
 %define gnome_autoar_version 0.1.1
 %define gnome_desktop_version 2.91.3
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
-%define libgweather_version 3.5.0
+%define libgweather_version 3.10
 %define libsoup_version 2.42
 %define webkit2gtk_version 2.28.0
 
@@ -42,12 +42,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.38.2
+Version: 3.39.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.39/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -360,6 +360,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.sender-validator.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 
 # The main executable
@@ -503,6 +504,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
+%{evo_plugin_dir}/org-gnome-evolution-sender-validation.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-sender-validation.so
+
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/liborg-gnome-templates.so
 
@@ -556,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 08 2021 Milan Crha <mcrha@redhat.com> - 3.39.1-1
+- Update to 3.39.1
+
 * Fri Nov 20 2020 Milan Crha <mcrha@redhat.com> - 3.38.2-1
 - Update to 3.38.2
 
diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
index c57bfbe..1b42f20 100644
--- a/flatpak-evolution-wrapper.sh.in
+++ b/flatpak-evolution-wrapper.sh.in
@@ -5,10 +5,9 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
 else
    export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
    export GIO_USE_NETWORK_MONITOR=base
+   export WEBKIT_FORCE_SANDBOX=0
    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 +27,4 @@ else
    fi
 
    /app/bin/evolution.bin "$@"
-
-   pkill -TERM gpg-agent
 fi
diff --git a/sources b/sources
index 99e7fdc..3eac6d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.38.2.tar.xz) = 30d40e9e8934afa2a8b602bccf740a055423892cc435b54e2cb116d0a8f24a369975f90a253da0c3554fd315a378c014a26c5b85af5b588c2afd9e8ad4698f3e
+SHA512 (evolution-3.39.1.tar.xz) = 74310c62816e0f140a4b9161c78eaacbd37858c9b666d949ec6a554cf8463c2a45a4b42e8e4d59cd15d032571d1e3a6cd01e93212f77f7667d35f8c8869bd776