Hello community, here is the log from the commit of package geary for openSUSE:Factory checked in at 2018-12-27 00:29:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geary (Old) and /work/SRC/openSUSE:Factory/.geary.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary" Thu Dec 27 00:29:52 2018 rev:41 rq:660935 version:0.12.4 Changes: -------- --- /work/SRC/openSUSE:Factory/geary/geary.changes 2018-09-03 10:35:47.984777424 +0200 +++ /work/SRC/openSUSE:Factory/.geary.new.28833/geary.changes 2018-12-27 00:29:53.811638235 +0100 @@ -1,0 +2,7 @@ +Fri Dec 21 08:39:06 UTC 2018 - bjorn....@gmail.com + +- Add geary-Fix-variable-check-for-IOError.CANCELLED.patch: + Actually use error variable to check for IOError.CANCELLED. Fix + build with new vala. + +------------------------------------------------------------------- New: ---- geary-Fix-variable-check-for-IOError.CANCELLED.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geary.spec ++++++ --- /var/tmp/diff_new_pack.dSPRn4/_old 2018-12-27 00:29:54.259637868 +0100 +++ /var/tmp/diff_new_pack.dSPRn4/_new 2018-12-27 00:29:54.263637865 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,6 +26,8 @@ Source0: https://download.gnome.org/sources/geary/0.12/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM geary-javascript-fixes.patch -- Fix fails to build with WebkitGTK >= 2.21 Patch0: geary-javascript-fixes.patch +# PATCH-FIX-UPSTREAM geary-Fix-variable-check-for-IOError.CANCELLED.patch -- Actually use error variable to check for IOError.CANCELLED +Patch1: geary-Fix-variable-check-for-IOError.CANCELLED.patch BuildRequires: cmake BuildRequires: fdupes ++++++ geary-Fix-variable-check-for-IOError.CANCELLED.patch ++++++ >From 088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <ric...@ubuntu.com> Date: Tue, 27 Nov 2018 14:53:56 +0100 Subject: [PATCH] Actually use error variable to check for IOError.CANCELLED --- src/client/application/geary-controller.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala index 3e6c8fcb..6bfeaab9 100644 --- a/src/client/application/geary-controller.vala +++ b/src/client/application/geary-controller.vala @@ -2599,7 +2599,7 @@ public class GearyController : Geary.BaseObject { yield do_empty_folder_async(emptyable, cancellable); } catch (Error err) { // don't report to user if cancelled - if (cancellable is IOError.CANCELLED) + if (err is IOError.CANCELLED) return; ErrorDialog dialog = new ErrorDialog(main_window, -- 2.18.1
