From cdd1edc286b6599ca93faefe81dc50ed09838448 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:26:21 +0800 Subject: [PATCH] [wxwidgets] Add feature fonts (#26113) * add feature fonts * update * add dependedcies * update --- ports/wxwidgets/portfile.cmake | 1 + ports/wxwidgets/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 1e2b2d15d7..4d3aef825c 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES sound wxUSE_SOUND + fonts wxUSE_PRIVATE_FONTS ) set(OPTIONS_RELEASE "") diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 54eeafebf5..a44afe12e6 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wxwidgets", "version": "3.2.0", + "port-version": 1, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", @@ -42,6 +43,19 @@ "example": { "description": "Example source code and CMake project" }, + "fonts": { + "description": "Enable to use the font functionality of wxWidgets", + "dependencies": [ + { + "name": "fontconfig", + "platform": "!windows & !osx" + }, + { + "name": "pango", + "platform": "!windows & !osx" + } + ] + }, "sound": { "description": "Build wxSound support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f395039b60..f9580d9264 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7682,7 +7682,7 @@ }, "wxwidgets": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index de0d1ba036..b9ea32ebfa 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d78ddc0e26a382e0eeca82b767dfbed70dda82e", + "version": "3.2.0", + "port-version": 1 + }, { "git-tree": "204fda7008c12569ddf44a935b32bbe5df87cef4", "version": "3.2.0",