From f315305bb083a4b7ad7419b692c1820dd222ea9f Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 17 Sep 2021 08:23:52 +0200
Subject: [PATCH] NEWS update for 3.42.0

---
 ChangeLog                               |  2 +-
 NEWS                                    | 30 +++++++++++++++++++++++++
 flatpak/org.gnome.Evolution-master.json |  2 +-
 flatpak/org.gnome.Evolution-stable.json | 15 +++++++------
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc37e3a74c..bfedd1c24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,4 +4,4 @@
 	Get a clone of git repository and list changes with 'git log' there,
 	   $ git clone https://gitlab.gnome.org/GNOME/evolution.git
 	or browse changes online at
-	   https://gitlab.gnome.org/GNOME/evolution/commits/master
+	   https://gitlab.gnome.org/GNOME/evolution/commits/gnome-41
diff --git a/NEWS b/NEWS
index 9b09604446..6af73468c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+Evolution 3.42.0 2021-09-17
+---------------------------
+
+Bug Fixes:
+	I#1620 - Flatpak: Set StartupWMClass in the .desktop file (Milan Crha)
+	I#1630 - help: fix its:locNote placement (Anders Jonsson)
+	M!85 - help/ldap - clarify search scopes (Дилян Палаузов)
+
+Miscellaneous:
+	help: Remove unused translated images (Andre Klapper)
+
+Translations:
+	Alan Mortensen (da)
+	Anders Jonsson (sv)
+	Andika Triwidada (id)
+	Balázs Úr (hu)
+	Boyuan Yang (zh_CN)
+	Changwoo Ryu (ko)
+	Christian Kirbach (de)
+	Daniel Mustieles (es)
+	Daniel Șerbănescu (ro)
+	Efstathios Iosifidis (el)
+	Goran Vidović (hr)
+	Guillaume Bernard (fr)
+	Jiri Grönroos (fi)
+	Marek Černocký (cs)
+	Nathan Follens (nl)
+	Piotr Drąg (pl)
+	Yuri Chornoivan (uk)
+
 Evolution 3.41.3 2021-09-03
 ---------------------------
 
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 0369ccf500..739edf756e 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -1,7 +1,7 @@
 {
 	"app-id": "org.gnome.Evolution",
 	"runtime": "org.gnome.Platform",
-	"runtime-version": "3.38",
+	"runtime-version": "40",
 	"sdk": "org.gnome.Sdk",
 	"command": "evolution",
 	"rename-icon": "evolution",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 268c2850e9..f5c60f9b9b 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -1,13 +1,13 @@
 {
 	"app-id": "org.gnome.Evolution",
 	"runtime": "org.gnome.Platform",
-	"runtime-version": "3.38",
+	"runtime-version": "40",
 	"sdk": "org.gnome.Sdk",
 	"command": "evolution",
 	"rename-icon": "evolution",
 	"copy-icon": true,
-	"branch": "gnome-40",
-	"desktop-file-name-suffix": " (3.40)",
+	"branch": "gnome-41",
+	"desktop-file-name-suffix": " (3.42)",
 	"build-options" : {
 		"cflags": "-O2 -g -Wno-deprecated-declarations",
 		"cxxflags": "-O2 -g -Wno-deprecated-declarations"
@@ -309,7 +309,7 @@
 				{
 					"type": "git",
 					"url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
-					"branch": "gnome-40"
+					"branch": "gnome-41"
 				}
 			]
 		},
@@ -328,7 +328,8 @@
 				"-DENABLE_YTNEF=OFF",
 				"-DWITH_BOGOFILTER=/app/bin/bogofilter",
 				"-DWITH_GLADE_CATALOG=OFF",
-				"-DWITH_HELP=OFF"
+				"-DWITH_HELP=OFF",
+				"-DWITH_WMCLASS_OVERRIDE=evolution.bin"
 			],
 			"cleanup": [
 				"/etc/xdg",
@@ -338,7 +339,7 @@
 				{
 					"type": "git",
 					"url": "https://gitlab.gnome.org/GNOME/evolution.git",
-					"branch": "gnome-40"
+					"branch": "gnome-41"
 				},
 				{
 					"type": "shell",
@@ -420,7 +421,7 @@
 				{
 					"type": "git",
 					"url": "https://gitlab.gnome.org/GNOME/evolution-ews.git",
-					"branch": "gnome-40"
+					"branch": "gnome-41"
 				}
 			]
 		}