refreshed patches for the new version

debian/changelog

@@ -3,6 +3,8 @@ evolution (3.39.2-1) UNRELEASED; urgency=medium
   * New upstream release
   * debian/control:
     - updated eds and glib requirements
+  * d/p/eds-I-281-GLibTools.cmake-Use-basename-in-glib-mkenums-te.patch:
+    - removed patch included in the new version
 
  -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 25 Feb 2021 17:39:06 +0100
 

debian/patches/10_revert_libevolution_avoid-version.patch

@@ -181,7 +181,7 @@ Index: evolution/src/e-util/CMakeLists.txt
 ===================================================================
 --- evolution.orig/src/e-util/CMakeLists.txt
 +++ evolution/src/e-util/CMakeLists.txt
-@@ -591,6 +591,11 @@ add_dependencies(evolution-util
+@@ -593,6 +593,11 @@ add_dependencies(evolution-util
  	${DEPENDENCIES}
  )
  

debian/patches/eds-I-281-GLibTools.cmake-Use-basename-in-glib-mkenums-te.patch

@@ -1,100 +0,0 @@
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 8 Dec 2020 08:48:32 +0100
-Subject: eds-I#281 - GLibTools.cmake: Use basename in glib-mkenums templates
-
-This change helps to create reproducible builds.
-
-Related to https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/281
----
- cmake/modules/GLibTools.cmake      | 6 +++---
- src/e-util/CMakeLists.txt          | 1 +
- src/em-format/CMakeLists.txt       | 1 +
- src/libemail-engine/CMakeLists.txt | 1 +
- src/mail/CMakeLists.txt            | 1 +
- src/shell/CMakeLists.txt           | 1 +
- 6 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index d40953c..d262fd8 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -65,7 +65,7 @@ function(glib_mkenums _output_filename_noext _enums_header _define_name)
- 
- G_BEGIN_DECLS
- 
--/* Enumerations from \"@filename@\" */
-+/* Enumerations from \"@basename@\" */
- 
- /*** END file-production ***/
- 
-@@ -95,8 +95,8 @@ set(SOURCE_TMPL "
- /*** END file-header ***/
- 
- /*** BEGIN file-production ***/
--/* enumerations from \"@filename@\" */
--#include \"@filename@\"
-+/* enumerations from \"@basename@\" */
-+#include \"@basename@\"
- 
- /*** END file-production ***/
- 
-diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
-index b35f641..b56c5c0 100644
---- a/src/e-util/CMakeLists.txt
-+++ b/src/e-util/CMakeLists.txt
-@@ -641,6 +641,7 @@ target_include_directories(evolution-util PUBLIC
- 	${CMAKE_SOURCE_DIR}
- 	${CMAKE_SOURCE_DIR}/src
- 	${CMAKE_CURRENT_BINARY_DIR}
-+	${CMAKE_CURRENT_SOURCE_DIR}
- 	${AUTOAR_INCLUDE_DIRS}
- 	${ENCHANT_INCLUDE_DIRS}
- 	${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
-diff --git a/src/em-format/CMakeLists.txt b/src/em-format/CMakeLists.txt
-index 4b7a20d..1f0805e 100644
---- a/src/em-format/CMakeLists.txt
-+++ b/src/em-format/CMakeLists.txt
-@@ -132,6 +132,7 @@ target_include_directories(evolution-mail-formatter PUBLIC
- 	${CMAKE_CURRENT_BINARY_DIR}
- 	${CMAKE_SOURCE_DIR}/src/smime/lib
- 	${CMAKE_SOURCE_DIR}/src/smime/gui
-+	${CMAKE_CURRENT_SOURCE_DIR}
- 	${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
- 	${GNOME_PLATFORM_INCLUDE_DIRS}
- )
-diff --git a/src/libemail-engine/CMakeLists.txt b/src/libemail-engine/CMakeLists.txt
-index 90efa3f..9fef269 100644
---- a/src/libemail-engine/CMakeLists.txt
-+++ b/src/libemail-engine/CMakeLists.txt
-@@ -77,6 +77,7 @@ target_include_directories(email-engine PUBLIC
- 	${CMAKE_BINARY_DIR}/src
- 	${CMAKE_SOURCE_DIR}/src
- 	${CMAKE_CURRENT_BINARY_DIR}
-+	${CMAKE_CURRENT_SOURCE_DIR}
- 	${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
- 	${GNOME_PLATFORM_INCLUDE_DIRS}
- )
-diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt
-index 2e82a9d..5699f42 100644
---- a/src/mail/CMakeLists.txt
-+++ b/src/mail/CMakeLists.txt
-@@ -255,6 +255,7 @@ target_include_directories(evolution-mail PUBLIC
- 	${CMAKE_SOURCE_DIR}/src/shell
- 	${CMAKE_SOURCE_DIR}/src/smime/lib
- 	${CMAKE_SOURCE_DIR}/src/smime/gui
-+	${CMAKE_CURRENT_SOURCE_DIR}
- 	${CERT_UI_INCLUDES}
- 	${CANBERRA_INCLUDE_DIRS}
- 	${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
-diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
-index c2afd0e..5366330 100644
---- a/src/shell/CMakeLists.txt
-+++ b/src/shell/CMakeLists.txt
-@@ -86,6 +86,7 @@ target_include_directories(evolution-shell PUBLIC
- 	${CMAKE_BINARY_DIR}/src
- 	${CMAKE_SOURCE_DIR}/src
- 	${CMAKE_CURRENT_BINARY_DIR}
-+	${CMAKE_CURRENT_SOURCE_DIR}
- 	${CLUTTER_GTK_INCLUDE_DIRS}
- 	${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
- 	${GNOME_PLATFORM_INCLUDE_DIRS}

debian/patches/series

@@ -1,4 +1,3 @@
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch
 ubuntu_gettext_domain.patch
-eds-I-281-GLibTools.cmake-Use-basename-in-glib-mkenums-te.patch