From 9b562a4e0ad2cfc87c3e004bdbd00735b20c856d Mon Sep 17 00:00:00 2001
From: Chris Mayo <aklhfex@gmail.com>
Date: Tue, 8 Aug 2023 19:25:14 +0100
Subject: [PATCH] Finish renaming desktop filename to org.freecad.FreeCAD

The QGuiApplication::setDesktopFileName() call was changed in [1] but
the desktop file and other files that reference it were not.

As shown by Looking Glass [2] on X11 updating these files is still
not enough for GNOME to associate the process with the desktop file,
a StartupWMClass entry is added to the desktop file to fix this.

[1]
129d5882a7 ("Migrate domain name from freecadweb to freecad (#9352)", 2023-04-24)

[2]
https://blogs.gnome.org/mclasen/2016/11/15/help-my-app-icon-is-missing/
---
 package/fedora/freecad.spec                          |  2 +-
 src/XDGData/CMakeLists.txt                           | 12 ++++++------
 ...ata.xml.in => org.freecad.FreeCAD.appdata.xml.in} |  4 ++--
 ...b.FreeCAD.desktop => org.freecad.FreeCAD.desktop} |  3 ++-
 ...reecadweb.FreeCAD.svg => org.freecad.FreeCAD.svg} |  0
 ...reecadweb.FreeCAD.xml => org.freecad.FreeCAD.xml} |  0
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename src/XDGData/{org.freecadweb.FreeCAD.appdata.xml.in => org.freecad.FreeCAD.appdata.xml.in} (96%)
 rename src/XDGData/{org.freecadweb.FreeCAD.desktop => org.freecad.FreeCAD.desktop} (95%)
 rename src/XDGData/{org.freecadweb.FreeCAD.svg => org.freecad.FreeCAD.svg} (100%)
 rename src/XDGData/{org.freecadweb.FreeCAD.xml => org.freecad.FreeCAD.xml} (100%)

diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec
index 4e25bc37e2..35ac2c00c1 100644
--- a/package/fedora/freecad.spec
+++ b/package/fedora/freecad.spec
@@ -315,7 +315,7 @@ done
 
 %check
 desktop-file-validate \
-    %{buildroot}%{_datadir}/applications/org.freecadweb.FreeCAD.desktop
+    %{buildroot}%{_datadir}/applications/org.freecad.FreeCAD.desktop
 %{?fedora:appstream-util validate-relax --nonet \
     %{buildroot}%{_metainfodir}/*.appdata.xml}
 
diff --git a/src/XDGData/CMakeLists.txt b/src/XDGData/CMakeLists.txt
index 9c70207f59..b9d6f0c555 100644
--- a/src/XDGData/CMakeLists.txt
+++ b/src/XDGData/CMakeLists.txt
@@ -16,26 +16,26 @@ if(NOT DEFINED APPDATA_RELEASE_DATE)
 endif()
 
 configure_file(
-    org.freecadweb.FreeCAD.appdata.xml.in
-    ${CMAKE_BINARY_DIR}/org.freecadweb.FreeCAD.appdata.xml
+    org.freecad.FreeCAD.appdata.xml.in
+    ${CMAKE_BINARY_DIR}/org.freecad.FreeCAD.appdata.xml
 )
 install(
-    FILES ${CMAKE_BINARY_DIR}/org.freecadweb.FreeCAD.appdata.xml
+    FILES ${CMAKE_BINARY_DIR}/org.freecad.FreeCAD.appdata.xml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
 )
 
 install(
-    FILES org.freecadweb.FreeCAD.desktop
+    FILES org.freecad.FreeCAD.desktop
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
 )
 
 install(
-    FILES org.freecadweb.FreeCAD.svg
+    FILES org.freecad.FreeCAD.svg
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
 )
 
 install(
-    FILES org.freecadweb.FreeCAD.xml
+    FILES org.freecad.FreeCAD.xml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
 )
 
diff --git a/src/XDGData/org.freecadweb.FreeCAD.appdata.xml.in b/src/XDGData/org.freecad.FreeCAD.appdata.xml.in
similarity index 96%
rename from src/XDGData/org.freecadweb.FreeCAD.appdata.xml.in
rename to src/XDGData/org.freecad.FreeCAD.appdata.xml.in
index 582eecc9a6..a8ad2476a3 100644
--- a/src/XDGData/org.freecadweb.FreeCAD.appdata.xml.in
+++ b/src/XDGData/org.freecad.FreeCAD.appdata.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>org.freecadweb.FreeCAD</id>
+  <id>org.freecad.FreeCAD</id>
   <project_license>LGPL-2.1</project_license>
   <metadata_license>CC0-1.0</metadata_license>
   <developer_name>The FreeCAD Team</developer_name>
-  <launchable type="desktop-id">org.freecadweb.FreeCAD.desktop</launchable>
+  <launchable type="desktop-id">org.freecad.FreeCAD.desktop</launchable>
   <name>FreeCAD</name>
   <summary>An open source parametric 3D CAD modeler</summary>
   <description>
diff --git a/src/XDGData/org.freecadweb.FreeCAD.desktop b/src/XDGData/org.freecad.FreeCAD.desktop
similarity index 95%
rename from src/XDGData/org.freecadweb.FreeCAD.desktop
rename to src/XDGData/org.freecad.FreeCAD.desktop
index 5b0dbc55cb..c100f25445 100644
--- a/src/XDGData/org.freecadweb.FreeCAD.desktop
+++ b/src/XDGData/org.freecad.FreeCAD.desktop
@@ -17,7 +17,8 @@ GenericName[ru]=Система автоматизированного проек
 Exec=FreeCAD - --single-instance %F
 Terminal=false
 Type=Application
-Icon=org.freecadweb.FreeCAD
+Icon=org.freecad.FreeCAD
 Categories=Graphics;Science;Education;Engineering;
 StartupNotify=true
+StartupWMClass=FreeCAD
 MimeType=application/x-extension-fcstd;model/obj;model/iges;image/vnd.dwg;image/vnd.dxf;model/vnd.collada+xml;application/iges;model/iges;model/step;model/step+zip;model/stl;application/vnd.shp;model/vrml;
diff --git a/src/XDGData/org.freecadweb.FreeCAD.svg b/src/XDGData/org.freecad.FreeCAD.svg
similarity index 100%
rename from src/XDGData/org.freecadweb.FreeCAD.svg
rename to src/XDGData/org.freecad.FreeCAD.svg
diff --git a/src/XDGData/org.freecadweb.FreeCAD.xml b/src/XDGData/org.freecad.FreeCAD.xml
similarity index 100%
rename from src/XDGData/org.freecadweb.FreeCAD.xml
rename to src/XDGData/org.freecad.FreeCAD.xml