From 8bcdb0afd5045d30b98798d6a623b7d4f163ef88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Sat, 10 Feb 2024 05:44:08 +0100 Subject: Bump liberty, install rasterized icons --- CMakeLists.txt | 14 ++++++++++++++ README.adoc | 5 +++-- liberty | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cde3640..dd1ee1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,8 +130,22 @@ install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) install (DIRECTORY contrib DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) install (DIRECTORY info DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) if (WITH_X11) + include (IconUtils) + + set (icon_base ${PROJECT_BINARY_DIR}/icons) + set (icon_png_list) + foreach (icon_size 16 32 48) + icon_to_png (${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}.svg + ${icon_size} ${icon_base} icon_png) + list (APPEND icon_png_list ${icon_png}) + endforeach () + + add_custom_target (icons ALL DEPENDS ${icon_png_list}) + install (FILES ${PROJECT_NAME}.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) + install (DIRECTORY ${icon_base} + DESTINATION ${CMAKE_INSTALL_DATADIR}) install (FILES ${PROJECT_NAME}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) endif () diff --git a/README.adoc b/README.adoc index c5b9e15..312addb 100644 --- a/README.adoc +++ b/README.adoc @@ -40,8 +40,9 @@ The rest of this README will concern itself with externalities. Building -------- -Build dependencies: CMake, pkg-config, awk, liberty (included), - termo (included), asciidoctor or asciidoc (recommended but optional) + +Build-only dependencies: CMake, pkg-config, awk, liberty (included), + termo (included), asciidoctor or asciidoc (recommended but optional), + rsvg-convert (X11) + Runtime dependencies: ncursesw, libunistring, cURL + Optional runtime dependencies: fftw3, libpulse, x11, xft, Perl + cURL (lyrics) diff --git a/liberty b/liberty index 4c28746..cb9d162 160000 --- a/liberty +++ b/liberty @@ -1 +1 @@ -Subproject commit 4c2874649d4b1d2414793d60915d309f0bf67117 +Subproject commit cb9d162a265e9e7b86bec92051f40374e79b7a51 -- cgit v1.2.3