From 2137caffeef066822ffd6de90a49535852da113b Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Thu, 7 Apr 2022 23:45:42 +0200
Subject: [PATCH] Use versioned svg file

To avoid conflicts between different major versions, add the major
version to the svg filename.
---
 CMakeLists.txt                                                | 1 +
 tools/desktop/ignition-gazebo.desktop.in                      | 2 +-
 tools/desktop/{ignition-gazebo.svg => ignition-gazebo.svg.in} | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename tools/desktop/{ignition-gazebo.svg => ignition-gazebo.svg.in} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdd0c6d0a4..550e666c33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,6 +173,7 @@ ign_create_packages()
 configure_file(${CMAKE_SOURCE_DIR}/api.md.in ${CMAKE_BINARY_DIR}/api.md)
 configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials.md)
 configure_file(${CMAKE_SOURCE_DIR}/tools/desktop/ignition-gazebo.desktop.in ${CMAKE_BINARY_DIR}/ignition-gazebo${PROJECT_VERSION_MAJOR}.desktop)
+configure_file(${CMAKE_SOURCE_DIR}/tools/desktop/ignition-gazebo.svg.in ${CMAKE_BINARY_DIR}/ignition-gazebo${PROJECT_VERSION_MAJOR}.svg)
 
 # disable doxygen on macOS due to issues with doxygen 1.9.0
 # there is an unreleased fix; revert this when 1.9.1 is released
diff --git a/tools/desktop/ignition-gazebo.desktop.in b/tools/desktop/ignition-gazebo.desktop.in
index 79be98bcc9..30c7186def 100644
--- a/tools/desktop/ignition-gazebo.desktop.in
+++ b/tools/desktop/ignition-gazebo.desktop.in
@@ -4,6 +4,6 @@ Type=Application
 Name=Igniton Gazebo @PROJECT_VERSION_MAJOR@
 Comment=3D Robot Simulator
 Exec=/usr/bin/ign gazebo --force-version @PROJECT_VERSION_MAJOR@
-Icon=ignition-gazebo
+Icon=ignition-gazebo@PROJECT_VERSION_MAJOR@
 Categories=Education;Science;Robotics;Development;
 StartupNotify=true
diff --git a/tools/desktop/ignition-gazebo.svg b/tools/desktop/ignition-gazebo.svg.in
similarity index 100%
rename from tools/desktop/ignition-gazebo.svg
rename to tools/desktop/ignition-gazebo.svg.in