mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

Fix games/easyrpg-player in advance of CMake 3.18 landing

Browse Source 
- This (still) builds with CMake 3.17
- Circular dependency between harfbuzz and freetype causes
  build (configure) failures with CMake 3.18, although I don't
  see why CMake 3.17 doesn't fall over (it might be due to
  recent CMake module additions)
- Reported upstream with alternate fix at
	https://github.com/EasyRPG/Player/pull/2274

PR:		248003
This commit is contained in:
Adriaan de Groot 2020-08-13 10:05:49 +00:00
parent 5dfc6dc368
commit be60128ad3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=544796
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
games/easyrpg-player/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= easyrpg-player PORTNAME= easyrpg-player
PORTVERSION= 0.6.2.1 PORTVERSION= 0.6.2.1
PORTREVISION= 1
CATEGORIES= games CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org MAINTAINER= amdmi3@FreeBSD.org

17
games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake Normal file
View File

@ -0,0 +1,17 @@
--- builds/cmake/Modules/FindHarfbuzz.cmake.orig 2020-08-13 08:40:25 UTC
+++ builds/cmake/Modules/FindHarfbuzz.cmake
@@ -55,7 +55,13 @@ if(HARFBUZZ_FOUND)
if(NOT TARGET Harfbuzz::Harfbuzz)
add_library(Harfbuzz::Harfbuzz UNKNOWN IMPORTED)
- find_library(Freetype REQUIRED)
+ # Handle circular dependency: FindFreetype.cmake asks
+ # for a QUIET lookup.
+ if (Harfbuzz_FIND_QUIETLY)
+ find_library(Freetype QUIET)
+ else()
+ find_library(Freetype REQUIRED)
+ endif()
set_target_properties(Harfbuzz::Harfbuzz PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES Freetype::Freetype