From 2cc1fa380fda6430adf923173da021bfe953fbcc Mon Sep 17 00:00:00 2001 From: AsciiWolf Date: Fri, 11 Oct 2019 12:32:16 +0200 Subject: [PATCH] Use svg icon + Install the icon in a standard path --- CMakeLists.txt | 2 +- cmake/cpack/sdrangel.desktop.in | 2 +- flatpak/org.sdrangel.SDRangel.json | 4 ---- flatpak/sdrangel-fix-icon-file.patch | 26 -------------------------- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 flatpak/sdrangel-fix-icon-file.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 6567e8230..dae784e7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -574,7 +574,7 @@ endif() #install files and directories (linux specific) if (LINUX) install(FILES ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop DESTINATION share/applications) - install(FILES ${CMAKE_SOURCE_DIR}/cmake/cpack/${CMAKE_PROJECT_NAME}_icon.png DESTINATION share/pixmaps) + install(FILES ${CMAKE_SOURCE_DIR}/cmake/cpack/${CMAKE_PROJECT_NAME}_icon.svg DESTINATION share/icons/hicolor/scalable/apps) endif() ############ uninstall target ################ diff --git a/cmake/cpack/sdrangel.desktop.in b/cmake/cpack/sdrangel.desktop.in index 88aa2b9a5..918c5ff03 100644 --- a/cmake/cpack/sdrangel.desktop.in +++ b/cmake/cpack/sdrangel.desktop.in @@ -3,7 +3,7 @@ Name=@APPLICATION_NAME@ GenericName=SDR/Analyzer frontend Comment=SDR/Analyzer frontend for Airspy, Airspy HF+, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube Exec=@CMAKE_PROJECT_NAME@ -Icon=@CMAKE_PROJECT_NAME@_icon.png +Icon=@CMAKE_PROJECT_NAME@_icon StartupNotify=true Terminal=false Type=Application diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json index e7aa0c6cc..e55aa7712 100644 --- a/flatpak/org.sdrangel.SDRangel.json +++ b/flatpak/org.sdrangel.SDRangel.json @@ -510,10 +510,6 @@ "type": "patch", "path": "sdrangel-set-serialdv-path.patch" }, - { - "type": "patch", - "path": "sdrangel-fix-icon-file.patch" - }, { "type": "file", "path": "org.sdrangel.SDRangel.appdata.xml" diff --git a/flatpak/sdrangel-fix-icon-file.patch b/flatpak/sdrangel-fix-icon-file.patch deleted file mode 100644 index a86849d26..000000000 --- a/flatpak/sdrangel-fix-icon-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a58eef70f..4f75350d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -574,7 +574,7 @@ endif() - #install files and directories (linux specific) - if (LINUX) - install(FILES ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop DESTINATION share/applications) -- install(FILES ${CMAKE_SOURCE_DIR}/cmake/cpack/${CMAKE_PROJECT_NAME}_icon.png DESTINATION share/pixmaps) -+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/cpack/${CMAKE_PROJECT_NAME}_icon.svg DESTINATION share/icons/hicolor/scalable/apps) - endif() - - ############ uninstall target ################ -diff --git a/cmake/cpack/sdrangel.desktop.in b/cmake/cpack/sdrangel.desktop.in -index 88aa2b9a5..918c5ff03 100644 ---- a/cmake/cpack/sdrangel.desktop.in -+++ b/cmake/cpack/sdrangel.desktop.in -@@ -3,7 +3,7 @@ Name=@APPLICATION_NAME@ - GenericName=SDR/Analyzer frontend - Comment=SDR/Analyzer frontend for Airspy, Airspy HF+, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube - Exec=@CMAKE_PROJECT_NAME@ --Icon=@CMAKE_PROJECT_NAME@_icon.png -+Icon=@CMAKE_PROJECT_NAME@_icon - StartupNotify=true - Terminal=false - Type=Application