Skip to content

Commit

Permalink
[gtk] Only dynamic library (#38623)
Browse files Browse the repository at this point in the history
This port only installs shared libs. Making this explicit with
`vcpkg_check_linkage` fixes the x64-windows-static-md blocker.
The build is required to pass for the desktop triplets now,
https://github.com/microsoft/vcpkg/pull/38369/files#r1579710705.
  • Loading branch information
dg0yt authored May 10, 2024
1 parent f3560df commit 16f9382
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
3 changes: 3 additions & 0 deletions ports/gtk/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# It installs only shared libs, regardless build type.
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.gnome.org/
OUT_SOURCE_PATH SOURCE_PATH
Expand Down
4 changes: 2 additions & 2 deletions ports/gtk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gtk",
"version": "4.10.5",
"port-version": 1,
"port-version": 2,
"description": "Portable library for creating graphical user interfaces.",
"homepage": "https://www.gtk.org/",
"license": "LGPL-2.0-only",
Expand All @@ -24,7 +24,6 @@
"platform": "linux"
},
"gdk-pixbuf",
"gettext",
{
"name": "gettext",
"host": true,
Expand All @@ -33,6 +32,7 @@
"tools"
]
},
"gettext-libintl",
"glib",
{
"name": "glib",
Expand Down
7 changes: 6 additions & 1 deletion scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@ gstreamer:x64-android=fail
# upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629.
gstreamer:x64-windows-static = skip
gstreamer:x64-windows-static-md = skip
gtk:x64-windows-static-md=fail
gul14:arm-neon-android=fail
gul14:arm64-android=fail
gul14:x64-android=fail
Expand Down Expand Up @@ -1234,6 +1233,12 @@ cmake-user:x64-windows-static-md=pass
cmake-user:x64-windows-static=pass
cmake-user:x64-windows=pass
cmake-user:x86-windows=pass
gtk:arm64-osx=pass
gtk:x64-linux=pass
gtk:x64-osx=pass
gtk:x64-windows-static-md=pass
gtk:x64-windows=pass
gtk:x86-windows=pass
qt:x64-windows=pass
# qt:x64-windows-static=pass
# qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass.
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3234,7 +3234,7 @@
},
"gtk": {
"baseline": "4.10.5",
"port-version": 1
"port-version": 2
},
"gtk3": {
"baseline": "3.24.38",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gtk.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "38a496538cd081a8d64d5b2733cb1f2b4fbae559",
"version": "4.10.5",
"port-version": 2
},
{
"git-tree": "814624705f6cc11a3468d9c3418bc20521b6b207",
"version": "4.10.5",
Expand Down

0 comments on commit 16f9382

Please sign in to comment.