Rebase to 40.5

Resolves: #2066166
This commit is contained in:
Marek Kasik 2022-05-23 16:51:42 +02:00
parent d81eb73a92
commit b99599efa6
4 changed files with 8 additions and 35 deletions

1
.gitignore vendored
View File

@ -100,3 +100,4 @@ evince-3.0.0.tar.bz2
/evince-40.1.tar.xz /evince-40.1.tar.xz
/evince-40.2.tar.xz /evince-40.2.tar.xz
/evince-40.4.tar.xz /evince-40.4.tar.xz
/evince-40.5.tar.xz

View File

@ -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

View File

@ -3,8 +3,8 @@
%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -)) %global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/evince/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
Name: evince Name: evince
Version: 40.4 Version: 40.5
Release: 4%{?dist} Release: 1%{?dist}
Summary: Document viewer Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse 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 # https://bugzilla.redhat.com/show_bug.cgi?id=2006768
Patch2: evince-40.4-quit-shortcut.patch 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-c++
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -272,6 +269,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
%{_mandir}/man1/evince-previewer.1* %{_mandir}/man1/evince-previewer.1*
%changelog %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 * Wed Jan 19 2022 Marek Kasik <mkasik@redhat.com> - 40.4-4
- Allow annotation actions for PDFs only - Allow annotation actions for PDFs only
- Resolves: #2041333 - Resolves: #2041333

View File

@ -1 +1 @@
SHA512 (evince-40.4.tar.xz) = dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd SHA512 (evince-40.5.tar.xz) = fb1df1e5dc7aa2fa7878c34157619f0e15b5aa4ba4305ab2250af109015a971594927b570238853ba1db52a3d0c6df70c678cea43721dcc345c25cb3d2d8a1c1