https://bugs.gentoo.org/704508 --- devilutionX-1.1.0/CMakeLists.txt +++ devilutionX-1.1.0/CMakeLists.txt @@ -298,7 +298,6 @@ SourceX/main.cpp SourceX/devilutionx.exe.manifest Packaging/macOS/AppIcon.icns - Packaging/resources/CharisSILB.ttf Packaging/windows/devilutionx.rc) if(NOT NONET) @@ -339,9 +338,6 @@ add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS}) -# Copy the font to the build directory to it works from the build directory -file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") - # Use file GENERATE instead of configure_file because configure_file # does not support generator expressions. get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -563,7 +559,6 @@ if(APPLE) set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - set_source_files_properties("./Packaging/resources/CharisSILB.ttf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx) set(MACOSX_BUNDLE_COPYRIGHT Unlicense) set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx) @@ -624,9 +619,6 @@ DESTINATION "share/icons/hicolor/512x512/apps" RENAME "${project_name}.png" ) - install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf" - DESTINATION "share/fonts/truetype" - ) # -G DEB set(CPACK_PACKAGE_CONTACT "anders@jenbo.dk") --- devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp +++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp @@ -69,7 +69,7 @@ #ifdef __linux__ if (!FileExists(ttf_font_path)) { - ttf_font_path = "/usr/share/fonts/truetype/" TTF_FONT_NAME; + ttf_font_path = "/usr/share/fonts/" TTF_FONT_NAME; } #endif font = TTF_OpenFont(ttf_font_path, 17); --- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h +++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h @@ -11,7 +11,7 @@ #endif #ifndef TTF_FONT_NAME -#define TTF_FONT_NAME "CharisSILB.ttf" +#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf" #endif namespace dvl {