commit:     3385fcbbd1266555c3927623a747d760f65558d4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 13:00:23 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 13:00:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3385fcbb

games-engines/devilutionx: Revbump to fix remaining font issue

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...ilutionx-1.1.0-r1.ebuild => devilutionx-1.1.0-r2.ebuild} |  0
 .../files/devilutionx-1.1.0-no_bundled_font.patch           | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild 
b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
similarity index 100%
rename from games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
rename to games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild

diff --git 
a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch 
b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
index 7944a8221d2..69131b562c8 100644
--- a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -38,6 +38,17 @@ https://bugs.gentoo.org/704508
  
      # -G DEB
      set(CPACK_PACKAGE_CONTACT "[email protected]")
+--- 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 @@
@@ -45,7 +56,7 @@ https://bugs.gentoo.org/704508
  
  #ifndef TTF_FONT_NAME
 -#define TTF_FONT_NAME "CharisSILB.ttf"
-+#define TTF_FONT_NAME "CharisSIL-B.ttf"
++#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"
  #endif
  
  namespace dvl {

Reply via email to