commit: 4e3c1d7c6209e4b36fb34ee9c72d8d34a456ae8a Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Mar 31 16:05:39 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Mar 31 16:05:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3c1d7c
games-engines/devilutionx: New bundled font patch for live ebuild Closes: https://bugs.gentoo.org/779547 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> games-engines/devilutionx/devilutionx-9999.ebuild | 2 +- .../devilutionx-1.2.0_pre-no_bundled_font.patch | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild index 3c50e3ab9fb..70c9bb47460 100644 --- a/games-engines/devilutionx/devilutionx-9999.ebuild +++ b/games-engines/devilutionx/devilutionx-9999.ebuild @@ -40,7 +40,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508 + "${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508 ) src_configure() { diff --git a/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch new file mode 100644 index 00000000000..01f4006dd13 --- /dev/null +++ b/games-engines/devilutionx/files/devilutionx-1.2.0_pre-no_bundled_font.patch @@ -0,0 +1,40 @@ +From 6e75bb9550bd8b4c6249fcfc0cd488224336060e Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomia...@gentoo.org> +Date: Wed, 31 Mar 2021 17:55:03 +0200 +Subject: [PATCH] Fix font location + +https://bugs.gentoo.org/704508 +--- + SourceS/paths.cpp | 2 +- + SourceX/DiabloUI/fonts.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SourceS/paths.cpp b/SourceS/paths.cpp +index dd60fcb5..1c4f9d69 100644 +--- a/SourceS/paths.cpp ++++ b/SourceS/paths.cpp +@@ -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 { +diff --git a/SourceX/DiabloUI/fonts.cpp b/SourceX/DiabloUI/fonts.cpp +index 178dcbe9..5f825886 100644 +--- a/SourceX/DiabloUI/fonts.cpp ++++ b/SourceX/DiabloUI/fonts.cpp +@@ -66,7 +66,7 @@ void LoadTtfFont() + std::string ttf_font_path = GetTtfPath() + GetTtfName(); + #ifdef __linux__ + if (!FileExists(ttf_font_path.c_str())) { +- ttf_font_path = "/usr/share/fonts/truetype/" + GetTtfName(); ++ ttf_font_path = "/usr/share/fonts/" + GetTtfName(); + } + #endif + font = TTF_OpenFont(ttf_font_path.c_str(), 17); +-- +2.31.1 +
