Accepting request 617554 from GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/617554 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=213
This commit is contained in:
Yuchen Lin
Git OBS Bridge
commit
b319ed9fd7
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e444a22d0bdca348b76edb59c7d15935dfa46bf731bf840060dcbada6555a953
|
||||
size 12129128
|
||||
3
evolution-3.28.3.tar.xz
Normal file
3
evolution-3.28.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d374511b7866df399c30458b92ac59a24cd5517c0f3a541d72010bc1eca73be8
|
||||
size 12113760
|
||||
@ -1,34 +0,0 @@
|
||||
From 7dc7f0d9574355e5ad94a842ac3769d6e2313743 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Wed, 16 May 2018 11:59:51 +0200
|
||||
Subject: [alarm-notify] Do not use markup around organizer name in libnotify
|
||||
text
|
||||
|
||||
This markup (making the text bold) might not be always used in the notification,
|
||||
resulting in the markup being shown to the user instead.
|
||||
---
|
||||
src/calendar/alarm-notify/alarm-queue.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/calendar/alarm-notify/alarm-queue.c b/src/calendar/alarm-notify/alarm-queue.c
|
||||
index c248f39..e1070fa 100644
|
||||
--- a/src/calendar/alarm-notify/alarm-queue.c
|
||||
+++ b/src/calendar/alarm-notify/alarm-queue.c
|
||||
@@ -1965,12 +1965,12 @@ popup_notification (time_t trigger,
|
||||
if (organiser.cn) {
|
||||
if (location)
|
||||
body = g_strdup_printf (
|
||||
- "<b>%s</b>\n%s %s\n%s %s",
|
||||
+ "%s\n%s %s\n%s %s",
|
||||
organiser.cn, _("Location:"),
|
||||
location, start_str, time_str);
|
||||
else
|
||||
body = g_strdup_printf (
|
||||
- "<b>%s</b>\n%s %s",
|
||||
+ "%s\n%s %s",
|
||||
organiser.cn, start_str, time_str);
|
||||
}
|
||||
else {
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From ccc936b4971a8f9a9be7f4712a5dd23813c936cf Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Mon, 14 May 2018 11:51:13 +0200
|
||||
Subject: Bug 795977 - AutoArchive archives Junk and Deleted messages too
|
||||
|
||||
---
|
||||
src/mail/em-utils.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/mail/em-utils.c b/src/mail/em-utils.c
|
||||
index 0f604bd..fd39154 100644
|
||||
--- a/src/mail/em-utils.c
|
||||
+++ b/src/mail/em-utils.c
|
||||
@@ -1803,12 +1803,16 @@ em_utils_process_autoarchive_sync (EMailBackend *mail_backend,
|
||||
|
||||
g_date_time_unref (now_time);
|
||||
|
||||
- search_sexp = g_strdup_printf ("(match-all (< (get-sent-date) %" G_GINT64_FORMAT "))", g_date_time_to_unix (use_time));
|
||||
+ search_sexp = g_strdup_printf ("(match-all (and "
|
||||
+ "(not (system-flag \"junk\")) "
|
||||
+ "(not (system-flag \"deleted\")) "
|
||||
+ "(< (get-sent-date) %" G_GINT64_FORMAT ")"
|
||||
+ "))", g_date_time_to_unix (use_time));
|
||||
uids = camel_folder_search_by_expression (folder, search_sexp, cancellable, error);
|
||||
|
||||
if (!uids) {
|
||||
success = FALSE;
|
||||
- } else {
|
||||
+ } else if (uids->len > 0) {
|
||||
gint ii;
|
||||
|
||||
if (aa_config == E_AUTO_ARCHIVE_CONFIG_MOVE_TO_ARCHIVE ||
|
||||
@@ -1863,9 +1867,10 @@ em_utils_process_autoarchive_sync (EMailBackend *mail_backend,
|
||||
|
||||
camel_folder_thaw (folder);
|
||||
}
|
||||
+ }
|
||||
|
||||
+ if (uids)
|
||||
camel_folder_search_free (folder, uids);
|
||||
- }
|
||||
|
||||
g_free (search_sexp);
|
||||
g_free (aa_custom_target_folder_uri);
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,3 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 18 09:44:56 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.28.3:
|
||||
+ Address some of the clang warnings.
|
||||
+ Fix a 'variable hides parameter' warning.
|
||||
+ [alarm-notify] Do not use markup around organizer name in
|
||||
libnotify text.
|
||||
+ Address some of the compiler and static analyzers warnings.
|
||||
+ Crash when making links clickable in composer.
|
||||
+ Shift+Click on switcher button to open a new window.
|
||||
+ Fix a possible memory leak in mail_display_uri_requested_cb().
|
||||
+ [composer-autosave] Use-after-free during snapshot save to
|
||||
file ][.
|
||||
+ Update bug URL and switch to https:// in the DOAP file.
|
||||
+ Fix few memory leaks around camel_data_wrapper_get_mime_type().
|
||||
+ [ENameSelectorEntry] Plain text drag & drop between entries
|
||||
misbehaves.
|
||||
+ Mail Accounts in Preferences not always properly sorted.
|
||||
+ Drop dependency on libcryptui.
|
||||
+ Bugs fixed: bgo#795977, bgo#796114, bgo#796294, bgo#776162,
|
||||
glgo#GNOME/evolution#19.
|
||||
+ Updated translations.
|
||||
- Drop upstream fixed/applied patches:
|
||||
+ evolution-alarm-notify-do-not-use-markup.patch.
|
||||
+ evolution-autoArchive-archives-Junk-and-Deleted-too.patch.
|
||||
- Drop pkgconfig(cryptui-0.0) BuildRequires: No longer needed, nor
|
||||
used following upstream changes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 16 21:47:45 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
# _version needs to be %{version} stripped to major.minor.micro only...
|
||||
%define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
|
||||
Name: evolution
|
||||
Version: 3.28.2
|
||||
Version: 3.28.3
|
||||
Release: 0
|
||||
# FIXME: check if note on license is still valid (comment before license)
|
||||
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
||||
@ -33,10 +33,6 @@ License: LGPL-2.0-only AND LGPL-3.0-only
|
||||
Group: Productivity/Networking/Email/Clients
|
||||
URL: http://wiki.gnome.org/Apps/Evolution/
|
||||
Source0: http://download.gnome.org/sources/evolution/%{evolution_base_version}/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM evolution-autoArchive-archives-Junk-and-Deleted-too.patch bgo#795977 -- AutoArchive archives Junk and Deleted messages too
|
||||
Patch0: evolution-autoArchive-archives-Junk-and-Deleted-too.patch
|
||||
# PATCH-FIX-UPSTREAM evolution-alarm-notify-do-not-use-markup.patch -- [alarm-notify] Do not use markup around organizer name in libnotify text
|
||||
Patch1: evolution-alarm-notify-do-not-use-markup.patch
|
||||
|
||||
# The icon we rely on is from adwaita-icon-theme
|
||||
BuildRequires: adwaita-icon-theme
|
||||
@ -60,7 +56,6 @@ BuildRequires: translation-update-upstream
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: yelp-tools
|
||||
BuildRequires: pkgconfig(atk)
|
||||
BuildRequires: pkgconfig(cryptui-0.0)
|
||||
BuildRequires: pkgconfig(gail-3.0) >= 3.2.0
|
||||
BuildRequires: pkgconfig(gcr-3) >= 3.4
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user