[qt5-base] Use system freetype.

This commit is contained in:
Robert Schumacher 2018-02-05 13:28:10 -08:00
parent 0ef1bbb38c
commit 8fde459990
3 changed files with 20 additions and 4 deletions

View File

@ -1,4 +1,4 @@
Source: qt5-base
Version: 5.9.2-3
Version: 5.9.2-4
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl

View File

@ -0,0 +1,13 @@
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 28c8034..4c7c0a7 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -157,7 +157,7 @@
},
"sources": [
{ "type": "pkgConfig", "args": "freetype2" },
- { "type": "freetype", "libs": "-lfreetype" }
+ { "libs": "-lfreetype" }
]
},
"fontconfig": {

View File

@ -31,8 +31,10 @@ if (EXISTS ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME})
endif()
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-system-pcre2.patch"
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-system-pcre2.patch"
"${CMAKE_CURRENT_LIST_DIR}/fix-system-freetype.patch"
)
# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
@ -51,9 +53,9 @@ configure_qt(
-system-harfbuzz
-system-doubleconversion
-system-sqlite
-no-fontconfig
-sql-sqlite
-sql-psql
-feature-freetype
-nomake examples -nomake tests
-opengl desktop # other options are "-no-opengl" and "-opengl angle"
-mp
@ -61,6 +63,7 @@ configure_qt(
OPTIONS_RELEASE
ZLIB_LIBS="-lzlib"
LIBPNG_LIBS="-llibpng16"
FREETYPE_LIBS="-lfreetype"
OPTIONS_DEBUG
ZLIB_LIBS="-lzlibd"
LIBPNG_LIBS="-llibpng16d"