[evolution] I#1620 - Flatpak: Set StartupWMClass in the .desktop file

[Milan Crha <mcrha src gnome org>]

commit e42772444a96cd148d51781d062db53dec2ef5a9
Author: Milan Crha <mcrha redhat com>
Date:   Wed Sep 8 19:21:59 2021 +0200

    I#1620 - Flatpak: Set StartupWMClass in the .desktop file
    
    Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1620

 data/CMakeLists.txt                     | 8 ++++++++
 data/org.gnome.Evolution.desktop.in.in  | 2 +-
 flatpak/org.gnome.Evolution-master.json | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index dd76d93556..2c40549a91 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,14 @@
 set(filedeps)
 set(desktopdir ${SHARE_INSTALL_PREFIX}/applications)
 
+option(WITH_WMCLASS_OVERRIDE "Override WMClass in the .desktop file" "")
+
+if("${WITH_WMCLASS_OVERRIDE}" STREQUAL "" OR "${WITH_WMCLASS_OVERRIDE}" STREQUAL "OFF")
+       set(WMCLASS_OVERRIDE "")
+else("${WITH_WMCLASS_OVERRIDE}" STREQUAL "" OR "${WITH_WMCLASS_OVERRIDE}" STREQUAL "OFF")
+       set(WMCLASS_OVERRIDE "StartupWMClass=${WITH_WMCLASS_OVERRIDE}\n")
+endif("${WITH_WMCLASS_OVERRIDE}" STREQUAL "" OR "${WITH_WMCLASS_OVERRIDE}" STREQUAL "OFF")
+
 configure_file(org.gnome.Evolution.desktop.in.in
        org.gnome.Evolution.desktop.in
        @ONLY
diff --git a/data/org.gnome.Evolution.desktop.in.in b/data/org.gnome.Evolution.desktop.in.in
index 4e29a26f1b..4278aa9e95 100644
--- a/data/org.gnome.Evolution.desktop.in.in
+++ b/data/org.gnome.Evolution.desktop.in.in
@@ -19,7 +19,7 @@ X-GNOME-Bugzilla-OtherBinaries=evolution-addressbook-factory;evolution-calendar-
 X-GNOME-UsesNotifications=true
 X-Flatpak-RenamedFrom=evolution
 
MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;x-scheme-handler/webcal;x-scheme-handler/calendar;x-scheme-handler/task;x-scheme-handler/memo;
-
+@WMCLASS_OVERRIDE@
 [Desktop Action new-window]
 _Name=New Window
 Exec=evolution -c current
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index e3038a7f29..0369ccf500 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -329,7 +329,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",