diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/wxwidgets | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/wxwidgets')
| -rw-r--r-- | ports/wxwidgets/CONTROL | 2 | ||||
| -rw-r--r-- | ports/wxwidgets/fix-expat.patch | 24 | ||||
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 1 |
3 files changed, 1 insertions, 26 deletions
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index 7c3479f33..35d3b461e 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,6 +1,6 @@ Source: wxwidgets Version: 3.1.4 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/wxWidgets/wxWidgets Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/fix-expat.patch b/ports/wxwidgets/fix-expat.patch deleted file mode 100644 index 2eebc42c9..000000000 --- a/ports/wxwidgets/fix-expat.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/build/cmake/lib/expat.cmake b/build/cmake/lib/expat.cmake
-index 1d2b79b..04bef93 100644
---- a/build/cmake/lib/expat.cmake
-+++ b/build/cmake/lib/expat.cmake
-@@ -7,14 +7,9 @@
- # Licence: wxWindows licence
- #############################################################################
-
--if(wxUSE_EXPAT STREQUAL "builtin")
-- wx_add_builtin_library(wxexpat
-- src/expat/expat/lib/xmlparse.c
-- src/expat/expat/lib/xmlrole.c
-- src/expat/expat/lib/xmltok.c
-- )
-- set(EXPAT_LIBRARIES wxexpat)
-- set(EXPAT_INCLUDE_DIRS ${wxSOURCE_DIR}/src/expat/expat/lib)
--elseif(wxUSE_EXPAT)
-- find_package(EXPAT REQUIRED)
-+find_package(expat CONFIG REQUIRED)
-+if(WIN32 AND NOT MINGW)
-+ set(EXPAT_LIBRARIES expat::libexpat)
-+else()
-+ set(EXPAT_LIBRARIES expat::expat)
- endif()
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 3ae94b56d..13bbc9c40 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -9,7 +9,6 @@ vcpkg_from_github( PATCHES disable-platform-lib-dir.patch fix-stl-build-vs2019-16.6.patch - fix-expat.patch ) set(OPTIONS) |