Backport fix to strip closing > from URLs when linkifying

This commit is contained in:
Adam Williamson 2018-04-10 11:23:42 -07:00
parent 4bc48ac8d3
commit 5ded74649a
2 changed files with 35 additions and 4 deletions

View File

@ -0,0 +1,26 @@
From 0e8f3646a182da1f9157c0426b1fa6f966ef4fcd Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 10 Apr 2018 16:05:17 +0200
Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside
angle brackets
---
src/camel/camel-url-scanner.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/camel/camel-url-scanner.c b/src/camel/camel-url-scanner.c
index e1bb62c..ed42033 100644
--- a/src/camel/camel-url-scanner.c
+++ b/src/camel/camel-url-scanner.c
@@ -235,7 +235,7 @@ camel_url_pattern_end (const gchar *in,
* punctuation, so strip any trailing
* punctuation off. Also strip off any closing
* double-quotes. */
- while (inptr > pos && strchr (",.:;?!-|}])\"", inptr[-1]))
+ while (inptr > pos && strchr (",.:;?!-|}])\">", inptr[-1]))
inptr--;
}
--
cgit v0.12

View File

@ -32,13 +32,17 @@
Name: evolution-data-server
Version: 3.28.1
Release: 1%{?dist}
Release: 2%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
URL: https://wiki.gnome.org/Apps/Evolution
Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
# Backport upstream fix for stripping closing > from URLs when linkifying
# https://git.gnome.org/browse/evolution-data-server/commit/?h=gnome-3-28&id=0e8f3646a182da1f9157c0426b1fa6f966ef4fcd
Patch0: evolution-data-server-3.28.1-angle-bracket-url.patch
Provides: evolution-webcal = %{version}
Obsoletes: evolution-webcal < 2.24.0
@ -172,9 +176,7 @@ The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package.
%prep
%setup -q
#%patch01 -p1 -b .krb5-fix
%autosetup -p1
%build
@ -436,6 +438,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/installed-tests
%changelog
* Tue Apr 10 2018 Adam Williamson <awilliam@redhat.com> - 3.28.1-2
- Backport fix to strip closing > from URLs when linkifying (BGO#795108)
* Mon Apr 09 2018 Milan Crha <mcrha@redhat.com> - 3.28.1-1
- Update to 3.28.1