Resolves: rhbz#1022649 don't complain about inability to copy metadata

This commit is contained in:
Caolán McNamara 2016-12-09 12:14:38 +00:00
parent 54c05a1b3c
commit 039fcf39b8
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 15e7b658315d0a9254e5c2ff7fcc1a15a15dceef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 9 Dec 2016 12:09:02 +0000
Subject: [PATCH] gnome#692552 don't complain about inability to copy metadata
related rhbz#1022649
nautilus just takes the view that copying metadata is a "nice to have",
but if it doesn't work it's not a hard error so just do that
---
libview/ev-jobs.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index dea5aa4..f24808b 100644
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -1574,8 +1574,10 @@ ev_job_save_run (EvJob *job)
ev_tmp_uri_unlink (local_uri);
/* Copy the metadata from the original file */
- if (!error)
- ev_file_copy_metadata (job_save->document_uri, job_save->uri, &error);
+ if (!error) {
+ /* Ignore errors here. Failure to copy metadata is not a hard error */
+ ev_file_copy_metadata (job_save->document_uri, job_save->uri, NULL);
+ }
if (error) {
ev_job_failed_from_error (job, error);
--
2.9.3

View File

@ -5,7 +5,7 @@
Name: evince
Version: 3.22.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Document viewer
License: GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@ -13,6 +13,7 @@ URL: https://wiki.gnome.org/Apps/Evince
Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
Patch0: evince-3.21.4-NPNVToolKit.patch
Patch1: 0001-gnome-692552-don-t-complain-about-inability-to-copy-.patch
BuildRequires: pkgconfig(adwaita-icon-theme)
BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
@ -255,6 +256,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||:
%{_libdir}/mozilla/plugins/libevbrowserplugin.so
%changelog
* Fri Dec 09 2016 Caolán McNamara <caolanm@redhat.com> - 3.22.1-2
- Resolves: rhbz#1022649 don't complain about inability to copy metadata
* Wed Oct 12 2016 Kalev Lember <klember@redhat.com> - 3.22.1-1
- Update to 3.22.1