VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #426 from AsciiWolf/icon

Browse Source 
Use svg icon on Linux
This commit is contained in:
f4exb 2019-10-11 14:21:40 +02:00 committed by GitHub
commit 4b0c580585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
cmake/cpack/sdrangel.desktop.in
View File

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

4
flatpak/org.sdrangel.SDRangel.json
View File

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

26
flatpak/sdrangel-fix-icon-file.patch
View File

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