Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wt] update to 4.6.1 #22772

Merged
merged 3 commits into from
Jan 28, 2022
Merged

[wt] update to 4.6.1 #22772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc7869f
[wt] update to 4.6.1
RockinRoel Jan 24, 2022
633a77a
Fix conflicting
JonLiu1993 Jan 28, 2022
71b746e
update version
JonLiu1993 Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ports/wt/0007-boost_1_77_0.patch
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions ports/wt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO emweb/wt
REF d3ee790da1826529e3d025d919f5c3608d029562 # 4.5.0
SHA512 2fe66269bb59db81d3611f2857ac3ba0ae7448a54d216bd7aa72701f1e6e291a738421f460f4614198785bbd084ab1e19e84a3f67cbc15556015e2f259941f11
REF bc76cbea5bb845c4d0fb642968eb1b278ddbb047 # 4.6.1
SHA512 416baaaf89cdbe2e9cf234df44dc0b90493c995b52ca9840cb5a5acf2904fe7d81da178ac4e0bf06dcd44fbac74fa75fe570901dd8fd4987a1bec4aeb54baad6
HEAD_REF master
PATCHES
0002-link-glew.patch
0005-XML_file_path.patch
0006-GraphicsMagick.patch
0007-boost_1_77_0.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS)
Expand Down Expand Up @@ -55,6 +54,9 @@ vcpkg_cmake_configure(
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF

-DWTHTTP_CONFIGURATION=
-DCONFIGURATION=

-DCONNECTOR_HTTP=ON
-DENABLE_HARU=ON
-DHARU_DYNAMIC=${SHARED_LIBS}
Expand Down
3 changes: 1 addition & 2 deletions ports/wt/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "wt",
"version": "4.5.0",
"port-version": 3,
"version": "4.6.1",
"description": "Wt is a C++ library for developing web applications",
"homepage": "https://github.com/emweb/wt",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7341,8 +7341,8 @@
"port-version": 1
},
"wt": {
"baseline": "4.5.0",
"port-version": 3
"baseline": "4.6.1",
"port-version": 0
},
"wtl": {
"baseline": "10.0.10320",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0d5d5d96583b44370437e567f086173a2c0ad51e",
"version": "4.6.1",
"port-version": 0
},
{
"git-tree": "62d1e8353f693697e3c7346c09afd96e1e6a1031",
"version": "4.5.0",
Expand Down