mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
8b1b192359
* gnu/packages/emulators.scm (pcsxr): Update to 1.9.94-1.6666043. [configure-flags]: Prevent compile errors. [phases]: Remove 'ch-subdir. [source]<origin>: Change upstream and commit. <patches>: Add patches. [home-page]: Change from dead link to active GitHub page. * gnu/packages/patches/pcsxr-find-harfbuzz.patch: Add it. * gnu/packages/patches/pcsxr-fix-definitions.patch: Add it. * gnu/local.mk: Register them. Change-Id: I5ebc91b3fa44152057cf197c0ab018fa064241a4
21 lines
815 B
Diff
21 lines
815 B
Diff
The .cmake files this project includes don't play well with harfbuzz's internal .cmake file.
|
|
This patch works around the issues present in the project's CMake configuration.
|
|
|
|
diff --git a/cmake/FindPango.cmake b/cmake/FindPango.cmake
|
|
index 2a7da99d..c08fbaab 100644
|
|
--- a/cmake/FindPango.cmake
|
|
+++ b/cmake/FindPango.cmake
|
|
@@ -74,6 +74,13 @@ foreach(pango_dep ${Pango_DEPS})
|
|
set_property (TARGET "${Pango}" APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${${pango_dep}}")
|
|
endforeach(pango_dep)
|
|
|
|
+if(NOT HARFBUZZ_INCLUDE_DIR)
|
|
+find_package(harfbuzz)
|
|
+endif()
|
|
+
|
|
+list(APPEND Pango_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
|
|
+set_property (TARGET "${Pango}" APPEND PROPERTY INTERFACE_LINK_LIBRARIES "harfbuzz::harfbuzz")
|
|
+
|
|
include(FindPackageHandleStandardArgs)
|
|
find_package_handle_standard_args(Pango
|
|
REQUIRED_VARS
|