From b646b284bf7985cac429ba0e060f7d8392385278 Mon Sep 17 00:00:00 2001 From: Connor Lirot Date: Sat, 20 May 2017 18:51:23 -0500 Subject: [PATCH 1/3] Fix icon path on Linux --- res/synergy.desktop | 2 +- res/synergy2.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/synergy.desktop b/res/synergy.desktop index 809caeb8..b7c27efc 100644 --- a/res/synergy.desktop +++ b/res/synergy.desktop @@ -5,7 +5,7 @@ Name=Synergy Comment=Keyboard and mouse sharing solution Path=/usr/bin Exec=/usr/bin/synergy -Icon=/usr/share/icons/synergy.svg +Icon=synergy Terminal=false Categories=Network; diff --git a/res/synergy2.desktop b/res/synergy2.desktop index aa191679..4acbcc23 100644 --- a/res/synergy2.desktop +++ b/res/synergy2.desktop @@ -5,7 +5,7 @@ Name=Synergy Comment=Keyboard and mouse sharing solution Path=/usr/bin Exec=/usr/bin/synergy2 -Icon=/usr/share/icons/synergy.svg +Icon=synergy Terminal=false Categories=Network; From da2754d41ebdea22892f8129968efcc18634d4bb Mon Sep 17 00:00:00 2001 From: Connor Lirot Date: Mon, 22 May 2017 19:56:47 -0500 Subject: [PATCH 2/3] Fix icon installation path on Linux --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3afd4521..90da055f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -406,7 +406,7 @@ endif() # if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) - install(FILES res/synergy.svg DESTINATION share/icons) + install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps) if("${VERSION_MAJOR}" STREQUAL "2") install(FILES res/synergy2.desktop DESTINATION share/applications) else() From 32f4dea7f5d6be1b3d132b747b3251ed3d27a0e7 Mon Sep 17 00:00:00 2001 From: Connor Lirot Date: Mon, 22 May 2017 20:26:21 -0500 Subject: [PATCH 3/3] Fix icon path in RPM spec --- dist/rpm/synergy.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index e543a12e..48615450 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -20,7 +20,7 @@ Work seamlessly across Windows, macOS and Linux. %{_bindir}/synergys %{_bindir}/syntool %attr(644,-,-) %{_datarootdir}/applications/synergy.desktop -%attr(644,-,-) %{_datarootdir}/icons/synergy.svg +%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg %changelog * Wed Apr 26 2017 Symless