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/
This commit is contained in:
Chris Mayo
2023-08-08 19:25:14 +01:00
parent 292196a606
commit 9b562a4e0a
6 changed files with 11 additions and 10 deletions

View File

@@ -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}

View File

@@ -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
)

View File

@@ -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>

View File

@@ -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;

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB