rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport fix to strip closing > from URLs when linkifying

Browse Source
This commit is contained in:
Adam Williamson 2018-04-10 12:01:24 -07:00
parent 0826fc41c2
commit 4db821e61f
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
evolution-3.28.1-angle-bracket-url.patch Normal file
View File

@ -0,0 +1,26 @@
From 8df33a2da490f1201da01f2d959b515e3d98ae9f Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 10 Apr 2018 16:08:28 +0200
Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside
angle brackets
---
src/modules/webkit-editor/web-extension/e-editor-dom-functions.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h
index 071c48e..4191d2c 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h
+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h
@@ -31,7 +31,7 @@
#define URL_PATTERN "((?:(?:(?:" URL_PROTOCOLS ")\\:\\/\\/)|(?:www\\.|ftp\\.))[^\\s\\/\\$\\.\\?#].[^\\s]*+)"
#define URL_PATTERN_SPACE URL_PATTERN "\\s$"
/* Taken from camel-url-scanner.c */
-#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\""
+#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\">"
/* http://www.w3.org/TR/html5/forms.html#valid-e-mail-address */
#define E_MAIL_PATTERN \
--
cgit v0.12

12
evolution.spec
View File

@ -28,13 +28,17 @@
Name: evolution
Version: 3.28.1
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
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/commit/?id=8df33a2da490f1201da01f2d959b515e3d98ae9f
Patch0: evolution-3.28.1-angle-bracket-url.patch
Obsoletes: anjal <= %{last_anjal_version}
Obsoletes: libgal2 <= %{last_libgal2_version}
Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@ -211,8 +215,7 @@ The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package.
%prep
%setup -q -n evolution-%{version}
#%patch01 -p1 -b .doc-e-cell-renderer-color
%autosetup -p1 -n evolution-%{version}
# Remove the welcome email from Novell
for inbox in src/mail/default/*/Inbox; do
@ -505,6 +508,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
%{_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