From b99599efa6cfde6287ebf709481193219d18bece Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Mon, 23 May 2022 16:51:42 +0200
Subject: [PATCH] Rebase to 40.5

Resolves: #2066166
---
 .gitignore                           |  1 +
 evince-40.4-annotation-actions.patch | 29 ----------------------------
 evince.spec                          | 11 ++++++-----
 sources                              |  2 +-
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 evince-40.4-annotation-actions.patch

diff --git a/.gitignore b/.gitignore
index 71df29c..bed9728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@ evince-3.0.0.tar.bz2
 /evince-40.1.tar.xz
 /evince-40.2.tar.xz
 /evince-40.4.tar.xz
+/evince-40.5.tar.xz
diff --git a/evince-40.4-annotation-actions.patch b/evince-40.4-annotation-actions.patch
deleted file mode 100644
index a4bba00..0000000
--- a/evince-40.4-annotation-actions.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 31ad19f0812212412b01cc933c9c1806245735ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org>
-Date: Thu, 22 Jul 2021 13:47:23 -0400
-Subject: [PATCH] shell: Enable annotation actions only in document that
- supports them
-
-Fixes #1638
----
- shell/ev-window.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/shell/ev-window.c b/shell/ev-window.c
-index fab121ca..0043074a 100644
---- a/shell/ev-window.c
-+++ b/shell/ev-window.c
-@@ -532,6 +532,10 @@ ev_window_update_actions_sensitivity (EvWindow *ev_window)
- 				      !recent_view_mode);
- 	ev_window_set_action_enabled (ev_window, "toggle-find", can_find &&
- 				      !recent_view_mode);
-+	ev_window_set_action_enabled (ev_window, "add-annotation", can_annotate &&
-+				      !recent_view_mode);
-+	ev_window_set_action_enabled (ev_window, "highlight-annotation", can_annotate &&
-+				      !recent_view_mode);
- 	ev_window_set_action_enabled (ev_window, "toggle-edit-annots", can_annotate &&
- 				      !recent_view_mode);
- 	ev_window_set_action_enabled (ev_window, "rotate-left", has_pages &&
--- 
-2.34.1
-
diff --git a/evince.spec b/evince.spec
index 5870e4e..397ee99 100644
--- a/evince.spec
+++ b/evince.spec
@@ -3,8 +3,8 @@
 %global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
 
 Name:           evince
-Version:        40.4
-Release:        4%{?dist}
+Version:        40.5
+Release:        1%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@@ -17,9 +17,6 @@ Patch1:         evince-40.1-covscan.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2006768
 Patch2:         evince-40.4-quit-shortcut.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=2041333
-Patch3:         evince-40.4-annotation-actions.patch
-
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
 BuildRequires:  gettext-devel
@@ -272,6 +269,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_mandir}/man1/evince-previewer.1*
 
 %changelog
+* Mon May 23 2022 Marek Kasik <mkasik@redhat.com> - 40.5-1
+- Rebase to 40.5
+- Resolves: #2066166
+
 * Wed Jan 19 2022 Marek Kasik <mkasik@redhat.com> - 40.4-4
 - Allow annotation actions for PDFs only
 - Resolves: #2041333
diff --git a/sources b/sources
index c2edfef..d78e2b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evince-40.4.tar.xz) = dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
+SHA512 (evince-40.5.tar.xz) = fb1df1e5dc7aa2fa7878c34157619f0e15b5aa4ba4305ab2250af109015a971594927b570238853ba1db52a3d0c6df70c678cea43721dcc345c25cb3d2d8a1c1