Accepting request 890124 from GNOME:Factory

Scripted push from GNOME:Next (forwarded request 890062 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/890124
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=244

7cfe4190e.patch

@@ -1,75 +0,0 @@
-From 7cfe4190e3e72b40472d57871459f1b136393003 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 14 Apr 2021 16:58:08 +0200
-Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
-
-CMake 3.20.1 errors out with:
-
-CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
-   variable name cannot be empty
- Call Stack (most recent call first):
-   CMakeLists.txt:152 (add_printable_variable)
-
-Change how the parameter value is compared, to fix it.
----
- cmake/modules/PrintableOptions.cmake | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
-index ba1c9d0b7f..339f1da4b4 100644
---- a/cmake/modules/PrintableOptions.cmake
-+++ b/cmake/modules/PrintableOptions.cmake
-@@ -19,40 +19,40 @@
- #    prints all the build options previously added with the above functions
- 
- macro(add_printable_variable_bare _name)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	list(APPEND _printable_options ${_name})
- endmacro()
- 
- macro(add_printable_option _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "option name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	option(${_name} ${_description} ${_default_value})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE STRING ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable_path _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "path variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE PATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
- 
- macro(add_printable_variable_filepath _name _description _default_value)
--	if(_name STREQUAL "")
-+	if("${_name}" STREQUAL "")
- 		message(FATAL_ERROR "filepath variable name cannot be empty")
--	endif(_name STREQUAL "")
-+	endif("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
--- 
-GitLab
-

evolution-3.40.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
-size 12215660

evolution-3.40.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f7962bc9fd0263822c6fbd1f74aa1b418a80af1bb7a516c86c903a8dfd2c41e
+size 12223944

evolution.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Apr 30 12:55:37 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 3.40.1:
+  + EWebDAVBrowser: Preset default calendar color and order.
+  + Composer: Incorrect <BR> in quoted line with spaces only.
+  + ESourceComboBox: Check ESource's BackendName is filled before
+    using it.
+  + Ensure non-const pointers passed to I_CAL_IS_... functions.
+  + EToDoPane: Do not pass recurrence ID when deleting all
+    instances.
+  + PrintableOptions.cmake: Correct variable name comparison.
+  + Use GWeakRef in html_editor_actions_notify_html_mode_cb().
+  + help: Cover selecting composer fonts; update composer toolbar
+    items.
+  + Updated translations.
+- Drop 7cfe4190e.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Thu Apr 29 07:46:08 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

evolution.spec

@@ -20,7 +20,7 @@
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
 
 Name:           evolution
-Version:        3.40.0
+Version:        3.40.1
 Release:        0
 # FIXME: check if note on license is still valid (comment before license)
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
@@ -29,8 +29,6 @@ License:        CC-BY-SA-3.0 AND LGPL-2.0-only AND LGPL-3.0-only AND OLDAP-2.8 A
 Group:          Productivity/Networking/Email/Clients
 URL:            https://wiki.gnome.org/Apps/Evolution/
 Source0:        https://download.gnome.org/sources/evolution/3.40/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM 7cfe4190e.patch dimstar@opensuse.org -- PrintableOptions.cmake: Correct variable name comparison, fix build with cmake 3.20.1
-Patch0:         https://gitlab.gnome.org/GNOME/evolution/-/commit/7cfe4190e.patch
 BuildRequires:  bison
 BuildRequires:  bogofilter
 BuildRequires:  cmake