CMakeLists.txt

@@ -68,7 +68,7 @@ if (WITH_PULSE)
 	list (APPEND extra_libraries ${libpulse_LIBRARIES})
 endif ()
 
-pkg_check_modules (x11 x11 xrender xft fontconfig libpng)
+pkg_check_modules (x11 x11 xrender xft fontconfig)
 add_option (WITH_X11 "Build with X11 support" "${x11_FOUND}")
 if (WITH_X11)
 	if (NOT x11_FOUND)
@@ -130,22 +130,8 @@ 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 ()

README.adoc

@@ -40,12 +40,10 @@ The rest of this README will concern itself with externalities.
 
 Building
 --------
-Build-only dependencies: CMake, pkg-config, awk, liberty (included),
- termo (included), asciidoctor or asciidoc (recommended but optional),
- rsvg-convert (X11) +
+Build dependencies: CMake, pkg-config, awk, liberty (included),
+ termo (included), asciidoctor or asciidoc (recommended but optional) +
 Runtime dependencies: ncursesw, libunistring, cURL +
-Optional runtime dependencies: fftw3, libpulse, x11 + xft + libpng (X11), +
- Perl + cURL (lyrics)
+Optional runtime dependencies: fftw3, libpulse, x11, xft, Perl + cURL (lyrics)
 
  $ git clone --recursive https://git.janouch.name/p/nncmpp.git
  $ mkdir nncmpp/build

liberty

@@ -1 +1 @@
-Subproject commit 1966b81b4d51998666c81e4618d42c25712f17a1
+Subproject commit 4c2874649d4b1d2414793d60915d309f0bf67117