diff options
| author | Martchus | 2023-04-05 10:45:27 +0200 |
|---|---|---|
| committer | Martchus | 2023-04-05 10:45:27 +0200 |
| commit | d4c9db44b573ba749db27c3df838bf8541618f2d (patch) | |
| tree | 8dce96dda53d6a0e83086f8684f749fc084ca35b /0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch | |
| parent | 5bedde0debfc22c4b036889787aa6ba1065fd6da (diff) | |
| download | aur-d4c9db44b573ba749db27c3df838bf8541618f2d.tar.gz | |
Update to 6.5.0
Diffstat (limited to '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch')
| -rw-r--r-- | 0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch index c53f74ab1bbb..fab30efe9552 100644 --- a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch +++ b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch @@ -1,4 +1,4 @@ -From e01c8d18eb0d74822cbacb7b8582af53d52b707b Mon Sep 17 00:00:00 2001 +From 0f4e793f81feda03ecf1b3cd21c635a0343c6841 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:00:27 +0200 Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of @@ -33,10 +33,10 @@ index 0000000000..1a52327ae6 + set(Fontconfig_FOUND 1) +endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 0aa24cca77..d144d000fb 100644 +index e3e2ca1829..8999bf76e6 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt -@@ -750,7 +750,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre +@@ -699,7 +699,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h LIBRARIES @@ -46,10 +46,10 @@ index 0aa24cca77..d144d000fb 100644 qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake -index 9844d778e6..c55d2ef2ab 100644 +index d8319c120b..afb3cf96bb 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake -@@ -39,7 +39,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr +@@ -42,7 +42,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr if(QT_FEATURE_system_zlib) qt_add_qmake_lib_dependency(freetype zlib) endif() @@ -59,5 +59,5 @@ index 9844d778e6..c55d2ef2ab 100644 qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm) qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz) -- -2.39.2 +2.40.0 |