| 1 |
commit: c94241e125b0f4037e2886b3f3f661dfb8a5dfbc |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 30 02:46:56 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 02:46:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94241e1 |
| 7 |
|
| 8 |
games-engines/devilutionx: remove obsolete patch |
| 9 |
|
| 10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/devilutionx-1.1.0-no_bundled_font.patch | 62 ---------------------- |
| 13 |
1 file changed, 62 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
deleted file mode 100644 |
| 17 |
index 69131b562c8c..000000000000 |
| 18 |
--- a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,62 +0,0 @@ |
| 21 |
-https://bugs.gentoo.org/704508 |
| 22 |
- |
| 23 |
---- devilutionX-1.1.0/CMakeLists.txt |
| 24 |
-+++ devilutionX-1.1.0/CMakeLists.txt |
| 25 |
-@@ -298,7 +298,6 @@ |
| 26 |
- SourceX/main.cpp |
| 27 |
- SourceX/devilutionx.exe.manifest |
| 28 |
- Packaging/macOS/AppIcon.icns |
| 29 |
-- Packaging/resources/CharisSILB.ttf |
| 30 |
- Packaging/windows/devilutionx.rc) |
| 31 |
- |
| 32 |
- if(NOT NONET) |
| 33 |
-@@ -339,9 +338,6 @@ |
| 34 |
- |
| 35 |
- add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS}) |
| 36 |
- |
| 37 |
--# Copy the font to the build directory to it works from the build directory |
| 38 |
--file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") |
| 39 |
-- |
| 40 |
- # Use file GENERATE instead of configure_file because configure_file |
| 41 |
- # does not support generator expressions. |
| 42 |
- get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) |
| 43 |
-@@ -563,7 +559,6 @@ |
| 44 |
- |
| 45 |
- if(APPLE) |
| 46 |
- set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) |
| 47 |
-- set_source_files_properties("./Packaging/resources/CharisSILB.ttf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) |
| 48 |
- set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx) |
| 49 |
- set(MACOSX_BUNDLE_COPYRIGHT Unlicense) |
| 50 |
- set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx) |
| 51 |
-@@ -624,9 +619,6 @@ |
| 52 |
- DESTINATION "share/icons/hicolor/512x512/apps" |
| 53 |
- RENAME "${project_name}.png" |
| 54 |
- ) |
| 55 |
-- install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf" |
| 56 |
-- DESTINATION "share/fonts/truetype" |
| 57 |
-- ) |
| 58 |
- |
| 59 |
- # -G DEB |
| 60 |
- set(CPACK_PACKAGE_CONTACT "anders@×××××.dk") |
| 61 |
---- devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp |
| 62 |
-+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp |
| 63 |
-@@ -69,7 +69,7 @@ |
| 64 |
- #ifdef __linux__ |
| 65 |
- if (!FileExists(ttf_font_path)) |
| 66 |
- { |
| 67 |
-- ttf_font_path = "/usr/share/fonts/truetype/" TTF_FONT_NAME; |
| 68 |
-+ ttf_font_path = "/usr/share/fonts/" TTF_FONT_NAME; |
| 69 |
- } |
| 70 |
- #endif |
| 71 |
- font = TTF_OpenFont(ttf_font_path, 17); |
| 72 |
---- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h |
| 73 |
-+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h |
| 74 |
-@@ -11,7 +11,7 @@ |
| 75 |
- #endif |
| 76 |
- |
| 77 |
- #ifndef TTF_FONT_NAME |
| 78 |
--#define TTF_FONT_NAME "CharisSILB.ttf" |
| 79 |
-+#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf" |
| 80 |
- #endif |
| 81 |
- |
| 82 |
- namespace dvl { |
Archives