Browse Source

fix(flatpak): use SVG for icon

Flatpak doesn't allow compressed SVGs as icons because this is against
the specification.
reviewable/pr5549/r1
sudden6 7 years ago
parent
commit
489027ea1e
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 1
      CMakeLists.txt
  2. 17
      cmake/Installation.cmake
  3. 1
      flatpak/io.github.qtox.qTox.json

1
CMakeLists.txt

@ -12,6 +12,7 @@ option(USE_FILTERAUDIO "Enable the echo canceling backend" ON) @@ -12,6 +12,7 @@ option(USE_FILTERAUDIO "Enable the echo canceling backend" ON)
option(UPDATE_CHECK "Enable automatic update check" ON)
option(USE_CCACHE "Use ccache when available" ON)
option(SPELL_CHECK "Enable spell cheching support" ON)
option(SVGZ_ICON "Compress the SVG icon of qTox" ON)
option(ASAN "Compile with AddressSanitizer" OFF)
# process generated files if cmake >= 3.10

17
cmake/Installation.cmake

@ -46,10 +46,17 @@ else() @@ -46,10 +46,17 @@ else()
install(FILES ${path_from} DESTINATION ${path_to})
endforeach(size)
# process the icon, compress if enabled
set(SVG_SRC "${CMAKE_SOURCE_DIR}/img/icons/qtox.svg")
set(SVG_GZIP "${CMAKE_BINARY_DIR}/qtox.svgz")
install(CODE "
execute_process(COMMAND gzip -S z INPUT_FILE ${SVG_SRC} OUTPUT_FILE ${SVG_GZIP})
" COMPONENT Runtime)
install(FILES "${SVG_GZIP}" DESTINATION "share/icons/hicolor/scalable/apps")
if(${SVGZ_ICON})
set(SVG_GZIP "${CMAKE_BINARY_DIR}/qtox.svgz")
install(CODE "
execute_process(COMMAND gzip -S z INPUT_FILE ${SVG_SRC} OUTPUT_FILE ${SVG_GZIP})
" COMPONENT Runtime)
set(SVG_DEST "${SVG_GZIP}")
else()
set(SVG_DEST "${SVG_SRC}")
endif()
install(FILES "${SVG_DEST}" DESTINATION "share/icons/hicolor/scalable/apps")
endif()

1
flatpak/io.github.qtox.qTox.json

@ -145,6 +145,7 @@ @@ -145,6 +145,7 @@
{
"name": "qTox",
"buildsystem": "cmake-ninja",
"config-opts": ["-DSVGZ_ICON=OFF"],
"sources": [
{
"type": "dir",

Loading…
Cancel
Save