diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-05 13:28:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-05 13:28:10 -0800 |
| commit | 8fde45999026e8291304747796cf945b248b63de (patch) | |
| tree | 34c23385629d2a31f5794a682214ca35afeac923 | |
| parent | 0ef1bbb38cf187064e55bcab50de5012e502b3af (diff) | |
| download | vcpkg-8fde45999026e8291304747796cf945b248b63de.tar.gz vcpkg-8fde45999026e8291304747796cf945b248b63de.zip | |
[qt5-base] Use system freetype.
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/fix-system-freetype.patch | 13 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 9 |
3 files changed, 20 insertions, 4 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 619b9f577..1a1aec15d 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -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 diff --git a/ports/qt5-base/fix-system-freetype.patch b/ports/qt5-base/fix-system-freetype.patch new file mode 100644 index 000000000..88211bc68 --- /dev/null +++ b/ports/qt5-base/fix-system-freetype.patch @@ -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": { diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 62c1396c2..9e9d7779a 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -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" |