[vlc-commits] harfbuzz: Fix framework confusion in pkgconfig patch
David Fuhrmann
git at videolan.org
Sun Apr 5 19:25:57 CEST 2020
vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Apr 5 18:58:11 2020 +0200| [cd630bbd3c9fda6f1fd8874370d8ca57e4eac550] | committer: David Fuhrmann
harfbuzz: Fix framework confusion in pkgconfig patch
Add the framework which is actually searched for, respectively.
(cherry picked from commit 4600fb6474a5640785fbdf434223e271daa042e4)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=cd630bbd3c9fda6f1fd8874370d8ca57e4eac550
---
contrib/src/harfbuzz/harfbuzz-create-pkgconfig-file.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/harfbuzz/harfbuzz-create-pkgconfig-file.patch b/contrib/src/harfbuzz/harfbuzz-create-pkgconfig-file.patch
index 166a9e67ee..ac6e8d0146 100644
--- a/contrib/src/harfbuzz/harfbuzz-create-pkgconfig-file.patch
+++ b/contrib/src/harfbuzz/harfbuzz-create-pkgconfig-file.patch
@@ -20,7 +20,7 @@ diff -urN harfbuzz.bak/CMakeLists.txt harfbuzz/CMakeLists.txt
+ find_library(COREFOUNDATION CoreFoundation)
+ if (COREFOUNDATION)
+ list(APPEND THIRD_PARTY_LIBS ${COREFOUNDATION})
-+ set(FRAMEWORK_FLAGS "${FRAMEWORK_FLAGS} -framework CoreText")
++ set(FRAMEWORK_FLAGS "${FRAMEWORK_FLAGS} -framework CoreFoundation")
+ endif ()
+ mark_as_advanced(COREFOUNDATION)
@@ -37,7 +37,7 @@ diff -urN harfbuzz.bak/CMakeLists.txt harfbuzz/CMakeLists.txt
+ find_library(CORETEXT CoreText)
+ if (CORETEXT)
+ list(APPEND THIRD_PARTY_LIBS ${CORETEXT})
-+ set(FRAMEWORK_FLAGS "${FRAMEWORK_FLAGS} -framework CoreFoundation")
++ set(FRAMEWORK_FLAGS "${FRAMEWORK_FLAGS} -framework CoreText")
+ endif ()
+ mark_as_advanced(CORETEXT)
More information about the vlc-commits
mailing list