From 2041718d8942de33c7d10e9e2fbf22b5e24d352e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 10 Dec 2025 15:04:25 -0800 Subject: [PATCH] Use download.gnome.org rather than gitlab. Also update gtk3. (#48711) --- ports/at-spi2-atk/portfile.cmake | 15 +++--- ports/at-spi2-atk/vcpkg.json | 2 +- ports/at-spi2-core/portfile.cmake | 15 +++--- ports/at-spi2-core/vcpkg.json | 2 +- ports/atk/portfile.cmake | 16 ++++--- ports/atk/vcpkg.json | 2 +- ports/gdk-pixbuf/portfile.cmake | 6 ++- ports/gdk-pixbuf/vcpkg.json | 2 +- ports/gexiv2/portfile.cmake | 6 ++- ports/gexiv2/vcpkg.json | 2 +- ports/glib-networking/portfile.cmake | 17 ++++--- ports/glib-networking/vcpkg.json | 1 + ports/glib/portfile.cmake | 15 +++--- ports/glib/vcpkg.json | 1 + ports/gobject-introspection/portfile.cmake | 9 ++-- ports/gobject-introspection/vcpkg.json | 1 + ports/graphene/portfile.cmake | 7 ++- ports/graphene/vcpkg.json | 2 +- ports/gtk/portfile.cmake | 18 ++++--- ports/gtk/vcpkg.json | 2 +- ports/gtk3/0001-build.patch | 4 +- ports/gtk3/cairo-cpp-linkage.patch | 22 ++++----- ports/gtk3/egl-conditional.diff | 56 ++++++++++++++++++++++ ports/gtk3/portfile.cmake | 18 ++++--- ports/gtk3/vcpkg.json | 3 +- ports/json-glib/portfile.cmake | 6 ++- ports/json-glib/vcpkg.json | 1 + ports/libadwaita/portfile.cmake | 17 +++---- ports/libadwaita/vcpkg.json | 2 +- ports/libcroco/portfile.cmake | 8 ++-- ports/libcroco/vcpkg.json | 2 +- ports/libgxps/portfile.cmake | 18 ++++--- ports/libgxps/vcpkg.json | 2 +- ports/libnotify/portfile.cmake | 18 ++++--- ports/libnotify/vcpkg.json | 1 + ports/librsvg/portfile.cmake | 5 +- ports/librsvg/vcpkg.json | 2 +- ports/libsecret/portfile.cmake | 16 ++++--- ports/libsecret/vcpkg.json | 2 +- ports/libsoup/portfile.cmake | 16 ++++--- ports/libsoup/vcpkg.json | 1 + ports/pango/portfile.cmake | 4 +- ports/pango/vcpkg.json | 1 + scripts/ci.baseline.txt | 10 ---- scripts/ci.feature.baseline.txt | 7 +-- versions/a-/at-spi2-atk.json | 5 ++ versions/a-/at-spi2-core.json | 5 ++ versions/a-/atk.json | 5 ++ versions/baseline.json | 42 ++++++++-------- versions/g-/gdk-pixbuf.json | 5 ++ versions/g-/gexiv2.json | 5 ++ versions/g-/glib-networking.json | 5 ++ versions/g-/glib.json | 5 ++ versions/g-/gobject-introspection.json | 5 ++ versions/g-/graphene.json | 5 ++ versions/g-/gtk.json | 5 ++ versions/g-/gtk3.json | 5 ++ versions/j-/json-glib.json | 5 ++ versions/l-/libadwaita.json | 5 ++ versions/l-/libcroco.json | 5 ++ versions/l-/libgxps.json | 5 ++ versions/l-/libnotify.json | 5 ++ versions/l-/librsvg.json | 5 ++ versions/l-/libsecret.json | 5 ++ versions/l-/libsoup.json | 5 ++ versions/p-/pango.json | 5 ++ 66 files changed, 359 insertions(+), 166 deletions(-) create mode 100644 ports/gtk3/egl-conditional.diff diff --git a/ports/at-spi2-atk/portfile.cmake b/ports/at-spi2-atk/portfile.cmake index a0972148cb..e7204ea0cd 100644 --- a/ports/at-spi2-atk/portfile.cmake +++ b/ports/at-spi2-atk/portfile.cmake @@ -1,11 +1,14 @@ -vcpkg_from_gitlab( - OUT_SOURCE_PATH SOURCE_PATH - GITLAB_URL https://gitlab.gnome.org - REPO GNOME/at-spi2-atk - REF AT_SPI2_ATK_2_38_0 - SHA512 d065a22e46f5d9459e14bc81050795e8b60ba8d6650ec9edf90ec6c205e68eb4ea3cc01f096cf636b066439b85892f203bc7a1c9d41f8ca899f29777556aa6cd +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528 ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/at-spi2-atk/vcpkg.json b/ports/at-spi2-atk/vcpkg.json index 232abaf70b..cd7e7c1072 100644 --- a/ports/at-spi2-atk/vcpkg.json +++ b/ports/at-spi2-atk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "at-spi2-atk", "version": "2.38.0", - "port-version": 1, + "port-version": 2, "description": "Implementation of the ATK interfaces in terms of the libatspi2 API.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/ports/at-spi2-core/portfile.cmake b/ports/at-spi2-core/portfile.cmake index 3084f71f36..4697f2eedd 100644 --- a/ports/at-spi2-core/portfile.cmake +++ b/ports/at-spi2-core/portfile.cmake @@ -2,14 +2,17 @@ if(VCPKG_TARGET_IS_LINUX) message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libxi-dev\n libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libxtst-dev") endif() -vcpkg_from_gitlab( - OUT_SOURCE_PATH SOURCE_PATH - GITLAB_URL https://gitlab.gnome.org - REPO GNOME/at-spi2-core - REF AT_SPI2_CORE_2_44_1 - SHA512 4e98b76e019f33af698a5e2b7ae7ce17ce0ff57784b4d505fe4bad58b097080899c1ca82b443502068c5504b60886e2d4a341bba833e0279ebef352211bf3813 +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index bd862d5a0b..885b50d1b6 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -1,7 +1,7 @@ { "name": "at-spi2-core", "version": "2.44.1", - "port-version": 4, + "port-version": 5, "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 807f5674ce..f74c5af24d 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -1,12 +1,14 @@ -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.gnome.org/ - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/atk - REF "${VERSION}" - HEAD_REF master - SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 dffd0a0814a9183027c38a985d86cb6544858e9e7d655843e153440467957d6bc1abd9c9479a57078aea018053410438a30a9befb7414dc79020b223cd2c774b ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + if("introspection" IN_LIST FEATURES) list(APPEND OPTIONS_RELEASE -Dintrospection=true) vcpkg_get_gobject_introspection_programs(PYTHON3 GIR_COMPILER GIR_SCANNER) diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index eeb8f0fb2b..f9f0f01fe2 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "atk", "version": "2.38.0", - "port-version": 10, + "port-version": 11, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "license": "LGPL-2.0-or-later", diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 63e03298da..ac81d5b9e2 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,7 +1,9 @@ string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/gdk-pixbuf/${VERSION_MAJOR_MINOR}/gdk-pixbuf-${VERSION}.tar.xz" - FILENAME "GNOME-gdk-pixbuf-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" SHA512 ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8 ) diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 309739ed1b..6958bf82a8 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.12", - "port-version": 5, + "port-version": 6, "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-or-later", diff --git a/ports/gexiv2/portfile.cmake b/ports/gexiv2/portfile.cmake index 649002399f..04fa1ad3d8 100644 --- a/ports/gexiv2/portfile.cmake +++ b/ports/gexiv2/portfile.cmake @@ -1,8 +1,10 @@ string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/gexiv2/${VERSION_MAJOR_MINOR}/gexiv2-${VERSION}.tar.xz" - FILENAME "gexiv2-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "${PORT}-${VERSION}.tar.xz" SHA512 24c97fa09b9ee32cb98da4637ea78eb72ae7e2d1792f9ebb31d63e305b3e0e1f6935b8647589c76c39ba631a15c1d8d2f3879c7dff81433786e9533b6348b6a0 ) diff --git a/ports/gexiv2/vcpkg.json b/ports/gexiv2/vcpkg.json index 324c9b79c4..394063455d 100644 --- a/ports/gexiv2/vcpkg.json +++ b/ports/gexiv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gexiv2", "version": "0.14.3", - "port-version": 1, + "port-version": 2, "description": "A GObject-based Exiv2 wrapper.", "homepage": "https://gitlab.gnome.org/GNOME/gexiv2/", "license": "GPL-2.0-or-later", diff --git a/ports/glib-networking/portfile.cmake b/ports/glib-networking/portfile.cmake index b8b16d69ff..dc02fa1bed 100644 --- a/ports/glib-networking/portfile.cmake +++ b/ports/glib-networking/portfile.cmake @@ -1,13 +1,16 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.gnome.org - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/glib-networking - REF "${VERSION}" - SHA512 "35b6b05afab29da4f4d54f559ded3cc6a16376f188afdb72689b7d9bcba71b9963317bcbd1101327137ae31ee51e25438f9bfa267e23d6076706a64c3594cbb5" - HEAD_REF main + +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 7574e82aa018332edf99dd284c7fd74b5935bca4a6a70e950ae4b22bbe7be188433fea69e35c742cae120e7ff7d1a6b4f5bf3957fc31f220f50189d3958a3f58 ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + vcpkg_list(SET FEATURE_OPTIONS) if (gnutls IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -Dgnutls=enabled) diff --git a/ports/glib-networking/vcpkg.json b/ports/glib-networking/vcpkg.json index b443f32518..e1cf3be3c0 100644 --- a/ports/glib-networking/vcpkg.json +++ b/ports/glib-networking/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib-networking", "version": "2.78.0", + "port-version": 1, "description": "Network extensions for GLib", "homepage": "https://gitlab.gnome.org/GNOME/glib-networking", "license": "LGPL-2.1-only", diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 94f3be3ed2..5bffaefb0c 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -1,12 +1,15 @@ -string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") +string(REGEX MATCH "^([0-9]*[.][0-9]*)" VERSION_MAJOR_MINOR "${VERSION}") # https://github.com/GNOME/glib/blob/main/SECURITY.md#supported-versions -if(NOT GLIB_MAJOR_MINOR MATCHES "[02468]\$") - message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "glib ${GLIB_MAJOR_MINOR} is a not a \"stable release series\".") +if(NOT VERSION_MAJOR_MINOR MATCHES "[02468]\$") + message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "glib ${VERSION_MAJOR_MINOR} is a not a \"stable release series\".") endif() -# vcpkg_from_* is not used because the project uses submodules. +# vcpkg_from_* is not used because the project uses submodules and Anubis deployed to GNOME's gitlab +# causes vcpkg_from_gitlab to fail for several users vcpkg_download_distfile(GLIB_ARCHIVE - URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" - FILENAME "glib-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "${PORT}-${VERSION}.tar.xz" SHA512 b9ef7ea7e1eeff142a8ab76fb0552331fd642133a31505e2939f57d7d9c5ec86dcefddc725c715925a42c348d71e2a8bf2eb399150108199b6daeca2761e08d6 ) diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 68a094a4a2..5aa8fd138d 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.86.2", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index 7843b1858c..e32f455bd6 100644 --- a/ports/gobject-introspection/portfile.cmake +++ b/ports/gobject-introspection/portfile.cmake @@ -1,8 +1,9 @@ -string(REGEX REPLACE "^([0-9]+[.][0-9]+).*\$" "\\1" GI_MAJOR_MINOR "${VERSION}") - +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${VERSION}.tar.xz" - FILENAME "gobject-introspection-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "${PORT}-${VERSION}.tar.xz" SHA512 a9d2edbe1cea710e10ef1ea8059a45cf5689bace43b5d2a6861809e863a6de7114b4763db8df3916ad6202c9967f48f7997acd0810a86e5e88dea7e0be88b585 ) diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index f13160032d..de336a0cb4 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gobject-introspection", "version": "1.86.0", + "port-version": 1, "description": [ "A middleware layer between C libraries (using GObject) and language bindings.", "Building (with) gobject-introspection is based on dynamic library linkage. Static builds of the core feature set are supported only for CI purposes.", diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake index 8c026ed616..356669471d 100644 --- a/ports/graphene/portfile.cmake +++ b/ports/graphene/portfile.cmake @@ -1,6 +1,9 @@ +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/graphene/1.10/graphene-${VERSION}.tar.xz" - FILENAME "graphene-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" SHA512 c56dab6712cf58387d0512a213cd0cd456679e46a495ee5cfd9bc25440cda2d72d56974af4e462f3c863869a1e2e506b702f468933045609d35fdf006212c67d ) diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index 6b29809690..528ddbd85b 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphene", "version": "1.10.8", - "port-version": 5, + "port-version": 6, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "license": "MIT", diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 58de5f0afb..74dc6e3362 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -1,13 +1,17 @@ # 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 - REPO GNOME/gtk - REF ${VERSION} - SHA512 2e2d3135ebf8cb176a4e5e6f1faa26ae9ea5c3e2441e2c820372a76b78e641f207257600d6a207aa05883e04f29fac1452673bffa0395789b8e482cc6b204673 - HEAD_REF master # branch name +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 7a6f4c48ea57c7cd1946bd33c9fdacfbb4a5ed9c02034f3cd483099539d6bcd5448144fe13f66815cdd51a693ccb317872accf1b150730404fb2d618222a78ca +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES 0001-build.patch fix_vulkan_enabled.patch diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index bdd85ce6ae..309cb710df 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtk", "version": "4.16.3", - "port-version": 3, + "port-version": 4, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch index a688118268..d71898ecf5 100644 --- a/ports/gtk3/0001-build.patch +++ b/ports/gtk3/0001-build.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index c599843..0cafd79 100644 +index 397ea07..dd6b888 100644 --- a/meson.build +++ b/meson.build -@@ -1008,7 +1008,7 @@ subdir('docs/reference') +@@ -997,7 +997,7 @@ subdir('docs/reference') install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) diff --git a/ports/gtk3/cairo-cpp-linkage.patch b/ports/gtk3/cairo-cpp-linkage.patch index dce7739b62..e95bac7aee 100644 --- a/ports/gtk3/cairo-cpp-linkage.patch +++ b/ports/gtk3/cairo-cpp-linkage.patch @@ -1,8 +1,8 @@ diff --git a/gtk/meson.build b/gtk/meson.build -index 79f4f0d..33a7723 100644 +index ea866d8..0d312f3 100644 --- a/gtk/meson.build +++ b/gtk/meson.build -@@ -1074,6 +1074,7 @@ gtk_query_settings = executable( +@@ -1102,6 +1102,7 @@ gtk_query_settings = executable( 'gtk-query-settings.c', c_args: gtk_cargs, dependencies: libgtk_dep, @@ -10,7 +10,7 @@ index 79f4f0d..33a7723 100644 install: true ) gtk_tools += gtk_query_settings -@@ -1083,6 +1084,7 @@ gtk_builder_tool = executable( +@@ -1111,6 +1112,7 @@ gtk_builder_tool = executable( 'gtk-builder-tool.c', c_args: gtk_cargs, dependencies: libgtk_dep, @@ -18,7 +18,7 @@ index 79f4f0d..33a7723 100644 install: true ) gtk_tools += gtk_builder_tool -@@ -1115,6 +1117,7 @@ gtk_update_icon_cache = executable( +@@ -1143,6 +1145,7 @@ gtk_update_icon_cache = executable( extra_update_icon_cache_objs, c_args: gtk_cargs, dependencies: libgtk_dep, @@ -26,7 +26,7 @@ index 79f4f0d..33a7723 100644 install: true ) gtk_tools += gtk_update_icon_cache -@@ -1125,6 +1128,7 @@ gtk_query_immodules = executable( +@@ -1153,6 +1156,7 @@ gtk_query_immodules = executable( 'gtkutils.c', c_args: gtk_cargs, dependencies: libgtk_dep, @@ -34,7 +34,7 @@ index 79f4f0d..33a7723 100644 install: true ) gtk_tools += gtk_query_immodules -@@ -1134,6 +1138,7 @@ gtk_encode_symbolic_svg = executable( +@@ -1162,6 +1166,7 @@ gtk_encode_symbolic_svg = executable( 'encodesymbolic.c', c_args: gtk_cargs, dependencies: libgtk_dep, @@ -42,7 +42,7 @@ index 79f4f0d..33a7723 100644 install: true ) gtk_tools += gtk_encode_symbolic_svg -@@ -1143,6 +1148,7 @@ gtk_launch = executable( +@@ -1171,6 +1176,7 @@ gtk_launch = executable( 'gtk-launch.c', c_args: gtk_cargs, dependencies: libgtk_dep, @@ -51,12 +51,12 @@ index 79f4f0d..33a7723 100644 ) gtk_tools += gtk_launch diff --git a/meson.build b/meson.build -index 287f0cb..d35106f 100644 +index dd6b888..e60ad30 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ --project('gtk+', 'c', -+project('gtk+', 'c', 'cpp', - version: '3.24.43', +-project('gtk', 'c', ++project('gtk', 'c', 'cpp', + version: '3.24.51', default_options: [ 'buildtype=debugoptimized', diff --git a/ports/gtk3/egl-conditional.diff b/ports/gtk3/egl-conditional.diff new file mode 100644 index 0000000000..304089e413 --- /dev/null +++ b/ports/gtk3/egl-conditional.diff @@ -0,0 +1,56 @@ +diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c +index b1cbfa2c047dac8a73002120ffe4130f557cf82f..0021f8cdb5000d2ae0b70a22f6539c47e79a5e9d 100644 +--- a/gdk/win32/gdkglcontext-win32.c ++++ b/gdk/win32/gdkglcontext-win32.c +@@ -833,7 +833,7 @@ gdk_win32_gl_context_realize_wgl (GdkGLContext *context, + return TRUE; + } + +-static gboolean ++gboolean + gdk_win32_display_is_wgl_context_current (GdkDisplay *display, + GdkGLContext *context) + { +@@ -1313,7 +1313,8 @@ gdk_win32_window_invalidate_egl_framebuffer (GdkWindow *window) + } + } + +-static gboolean ++#ifdef GDK_WIN32_ENABLE_EGL ++gboolean + gdk_win32_display_is_egl_context_current (GdkDisplay *display, + GdkGLContext *context) + { +@@ -1321,6 +1322,9 @@ gdk_win32_display_is_egl_context_current (GdkDisplay *display, + + return context_egl->egl_context == eglGetCurrentContext (); + } ++#else ++#define gdk_win32_display_is_egl_context_current(disp,ctx) FALSE ++#endif + + static gboolean + gdk_win32_display_make_egl_context_current (GdkDisplay *display, +diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h +index 793a3ef4ffaa1fa2ba3d46b5a0ecfdf2ccb576fa..69d5d63166287360115aeec5cafbce264653f04c 100644 +--- a/gdk/win32/gdkglcontext-win32.h ++++ b/gdk/win32/gdkglcontext-win32.h +@@ -61,6 +61,18 @@ gboolean + gdk_win32_display_is_gl_context_current (GdkDisplay *display, + GdkGLContext *context); + ++gboolean ++gdk_win32_display_is_wgl_context_current (GdkDisplay *display, ++ GdkGLContext *context); ++ ++#ifdef GDK_WIN32_ENABLE_EGL ++gboolean ++gdk_win32_display_is_egl_context_current (GdkDisplay *display, ++ GdkGLContext *context); ++#else ++#define gdk_win32_display_is_egl_context_current(disp,ctx) FALSE ++#endif ++ + gboolean + gdk_win32_display_make_gl_context_current (GdkDisplay *display, + GdkGLContext *context); diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index 13f2f08889..0f3d1d779f 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -6,15 +6,21 @@ if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) ) endif() -vcpkg_from_gitlab( - OUT_SOURCE_PATH SOURCE_PATH - GITLAB_URL https://gitlab.gnome.org - REPO GNOME/gtk - REF "${VERSION}" - SHA512 19e5482e4e843aa946ab79c8ce283a7b44aaac43ad99b6913cbc3c91492bf722ebe0238457b75b82be6d6c65a394d32ebc8732832f3f800145e3cf69d5c1e77c +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/gtk/${VERSION_MAJOR_MINOR}/gtk-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/gtk/${VERSION_MAJOR_MINOR}/gtk-${VERSION}.tar.xz" + FILENAME "GNOME-gtk-${VERSION}.tar.xz" + SHA512 f96ee1c586284af315709ec38e841bd1b2558d09e2162834a132ffc4bbcddca272a92a828550a3accaa3e4da1964ad32b3b48291e929a108a913bd18c61cd73b +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES 0001-build.patch cairo-cpp-linkage.patch + egl-conditional.diff # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9067 ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index c931b6be9b..41b32c227d 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtk3", - "version": "3.24.43", - "port-version": 2, + "version": "3.24.51", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/ports/json-glib/portfile.cmake b/ports/json-glib/portfile.cmake index 45a3112e13..b39fb746ae 100644 --- a/ports/json-glib/portfile.cmake +++ b/ports/json-glib/portfile.cmake @@ -1,8 +1,10 @@ string(REGEX MATCH [[^[1-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS https://download.gnome.org/sources/json-glib/${VERSION_MAJOR_MINOR}/json-glib-${VERSION}.tar.xz - FILENAME "json-glib-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" SHA512 e1c0e33b17333cf94beb381f505c1819090a11b616dcc23a883f231029dff277c2482823278cbf7b8a07e237d45cbfc7b05f132e1234beff609a739fd5704c6e ) diff --git a/ports/json-glib/vcpkg.json b/ports/json-glib/vcpkg.json index d152de3d06..4397f30f89 100644 --- a/ports/json-glib/vcpkg.json +++ b/ports/json-glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "json-glib", "version": "1.10.6", + "port-version": 1, "description": "Implements a full JSON parser and generator using GLib and GObject, and integrates JSON with GLib data types.", "homepage": "https://wiki.gnome.org/Projects/JsonGlib", "license": "LGPL-2.1-or-later AND CC0-1.0 AND MIT", diff --git a/ports/libadwaita/portfile.cmake b/ports/libadwaita/portfile.cmake index 95bff51614..1504efce2c 100644 --- a/ports/libadwaita/portfile.cmake +++ b/ports/libadwaita/portfile.cmake @@ -1,13 +1,14 @@ -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.gnome.org/ - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/libadwaita - REF "${VERSION}" - SHA512 5cea6396bab3439fb3ddef95fe86bc84955ce1eb426fc5dd323329eeab8a51e10de5f4d9c45380f905ceea43e094362a577a67386a3ddcefff362af030c8c7e3 - HEAD_REF main - PATCHES +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 86591af2a699931518e211a41844a23d5aaaccb6196d39b28f4768129852c33267e9a66a91dc274711a31df38b84f39feb7c7d22ae54b946a16cea4865ac83e8 ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + set(GLIB_TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/glib") set(SASSC_TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/sassc") diff --git a/ports/libadwaita/vcpkg.json b/ports/libadwaita/vcpkg.json index 473d97fd85..6ed3bf44ab 100644 --- a/ports/libadwaita/vcpkg.json +++ b/ports/libadwaita/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libadwaita", "version": "1.3.2", - "port-version": 2, + "port-version": 3, "description": "Building blocks for modern GNOME applications", "homepage": "https://gnome.pages.gitlab.gnome.org/libadwaita", "license": "LGPL-2.1-or-later", diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index a43d73d38e..9eb77ab6b0 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -1,7 +1,9 @@ +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/libcroco/0.6/libcroco-${VERSION}.tar.xz" - "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/libcroco/0.6/libcroco-${VERSION}.tar.xz" - FILENAME "libcroco-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 ) diff --git a/ports/libcroco/vcpkg.json b/ports/libcroco/vcpkg.json index f37e299e28..0c827cc996 100644 --- a/ports/libcroco/vcpkg.json +++ b/ports/libcroco/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcroco", "version": "0.6.13", - "port-version": 8, + "port-version": 9, "description": "A standalone css2 parsing and manipulation library", "license": "LGPL-2.0-only", "dependencies": [ diff --git a/ports/libgxps/portfile.cmake b/ports/libgxps/portfile.cmake index a485f487c6..d36985bb61 100644 --- a/ports/libgxps/portfile.cmake +++ b/ports/libgxps/portfile.cmake @@ -1,20 +1,18 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(LIBGXPS_VERSION 0.3.2) -string(SUBSTRING ${LIBGXPS_VERSION} 0 3 MAJOR_MINOR) # e.g. 0.3 - +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/${PORT}/${MAJOR_MINOR}/${PORT}-${LIBGXPS_VERSION}.tar.xz" - FILENAME "${PORT}-${LIBGXPS_VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9 ) -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE ${ARCHIVE} - SOURCE_BASE ${LIBGXPS_VERSION} +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES - "${CMAKE_CURRENT_LIST_DIR}/libgxps-0.3.2_fix_meson_warnings.patch" # https://gitlab.gnome.org/GNOME/libgxps/-/commit/a18e1260 + libgxps-0.3.2_fix_meson_warnings.patch # https://gitlab.gnome.org/GNOME/libgxps/-/commit/a18e1260 ) vcpkg_configure_meson( diff --git a/ports/libgxps/vcpkg.json b/ports/libgxps/vcpkg.json index a32fde1e6c..e17b0310f7 100644 --- a/ports/libgxps/vcpkg.json +++ b/ports/libgxps/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgxps", "version": "0.3.2", - "port-version": 4, + "port-version": 5, "description": "libgxps is a GObject based library for handling and rendering XPS documents.", "homepage": "https://wiki.gnome.org/Projects/libgxps", "dependencies": [ diff --git a/ports/libnotify/portfile.cmake b/ports/libnotify/portfile.cmake index cc1602d547..a56cfdc525 100644 --- a/ports/libnotify/portfile.cmake +++ b/ports/libnotify/portfile.cmake @@ -1,10 +1,14 @@ -vcpkg_from_gitlab( - GITLAB_URL "https://gitlab.gnome.org" - OUT_SOURCE_PATH SOURCE_PATH - REPO "GNOME/libnotify" - REF "${VERSION}" - HEAD_REF "master" - SHA512 731f874676347e18b45eb63ae6a968bce8b34d57aadef444733b73a51b3b29297751699f3aeae9dfd2779afffc7e9c15d3a4141504cfe6cd46f51f79d3ee85d5 +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 75f8e605cd5331c91f502da61eec5bf5dfed6f1cf8c966e5c4356be48e24c32fe4be481dc16d0ccd4e25b2e9e207898124b349a0dc4575211e0044c9d81fc7ce +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES 0001-fix-parameter-name-omitted-error.patch ) diff --git a/ports/libnotify/vcpkg.json b/ports/libnotify/vcpkg.json index 59543220e5..7aba4d7fd3 100644 --- a/ports/libnotify/vcpkg.json +++ b/ports/libnotify/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libnotify", "version": "0.8.7", + "port-version": 1, "description": "A library for sending desktop notifications", "homepage": "https://gitlab.gnome.org/GNOME/libnotify", "license": "LGPL-2.1-or-later", diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index c913d13ad1..0788708373 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -2,8 +2,9 @@ string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://download.gnome.org/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz" - "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/librsvg/${MAJOR_MINOR}/librsvg-${VERSION}.tar.xz" FILENAME "librsvg-${VERSION}.tar.xz" SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280 ) diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index 2f0a097521..0645837e04 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librsvg", "version": "2.40.21", - "port-version": 1, + "port-version": 2, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "license": "LGPL-2.0-or-later", diff --git a/ports/libsecret/portfile.cmake b/ports/libsecret/portfile.cmake index 5265db578f..7d50657f92 100644 --- a/ports/libsecret/portfile.cmake +++ b/ports/libsecret/portfile.cmake @@ -1,12 +1,14 @@ -vcpkg_from_gitlab( - OUT_SOURCE_PATH SOURCE_PATH - GITLAB_URL https://gitlab.gnome.org - REPO GNOME/libsecret - REF "${VERSION}" - SHA512 25faf5e72b6f0486cc1cb20535f685edbf264c97bb35434328587743dba0c5b52c2875e02479556e249b84320f755693744a2f37c710ec59135bd2f26d329228 - HEAD_REF master +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 4731d9b2809a867f59e0702a55d1577ee0a968826c3df40717b1a6f6ea3f9d94ed95457dd82070d2914f5b1911d49fd6ae340bec6f4bcf88b6c804782ae7a24e ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json index 482e3df467..6e7a49703c 100644 --- a/ports/libsecret/vcpkg.json +++ b/ports/libsecret/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsecret", "version": "0.21.4", - "port-version": 1, + "port-version": 2, "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", "license": "LGPL-2.1-or-later", diff --git a/ports/libsoup/portfile.cmake b/ports/libsoup/portfile.cmake index 9fd726dfe0..e77744e643 100644 --- a/ports/libsoup/portfile.cmake +++ b/ports/libsoup/portfile.cmake @@ -1,12 +1,14 @@ -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.gnome.org - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/libsoup - REF "${VERSION}" - SHA512 8edab1f6ccf9d17befd80b238b9d435cca3743316341336b2b92e4caf5d0d5f35a05269f5ddfcbbb1839f26cd011bf13ed66ee3f620b9b0c566894cdc1600f19 - HEAD_REF main +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 cb44d93b16048d31ae04a8c2416bbe233e0e9bdaf2d9bfe2879260fd3da27e90a0bb05cddbd82cdf81a4a778bd451ad172a14dd31e2fd113c3bbbe13c0029b03 ) +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/libsoup/vcpkg.json b/ports/libsoup/vcpkg.json index e95a130b65..f75254384d 100644 --- a/ports/libsoup/vcpkg.json +++ b/ports/libsoup/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsoup", "version": "3.6.5", + "port-version": 1, "description": "HTTP Library for GLib", "homepage": "https://libsoup.gnome.org/", "license": "LGPL-2.0-or-later", diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 4e17fb5e8d..9c2c8c18c2 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -1,6 +1,8 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" VERSION_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(SOURCE_ARCHIVE - URLS "https://download.gnome.org/sources/pango/${VERSION_MAJOR_MINOR}/pango-${VERSION}.tar.xz" + URLS + "https://download.gnome.org/sources/pango/${VERSION_MAJOR_MINOR}/pango-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" FILENAME "pango-${VERSION}.tar.xz" SHA512 19471618a66b68e19786c458387f2bc8027ecbda5aaf29efcc025a99b3a74402765c6c4c6ea2997d8f1219ef7f1bea817e6ca55e494dff24780f5d3f2a6242a2 ) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index f89e50857b..804f44fcce 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pango", "version": "1.56.4", + "port-version": 1, "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-or-later", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index af56f52767..861ec402fd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -318,16 +318,6 @@ gsoap:x64-windows-static-md=skip gsoap:x64-windows-static=skip gsoap:x64-windows=skip gsoap:x86-windows=skip -# gtk3 randomly hangs during build on Windows -gtk3:arm64-uwp=skip -gtk3:arm64-windows-static-md=skip -gtk3:arm64-windows=skip -gtk3:x64-uwp=skip -gtk3:x64-windows-release=skip -gtk3:x64-windows-static-md=skip -gtk3:x64-windows-static=skip -gtk3:x64-windows=skip -gtk3:x86-windows=skip gz-tools:arm-neon-android=fail gz-tools:arm64-android=fail gz-tools:x64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 818b395b3e..c1ca65113b 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -101,7 +101,6 @@ glibmm:x64-windows-static=fail gobject-introspection(android)=fail google-cloud-cpp(uwp)=fail graphicsmagick(uwp)=fail -gtk:x64-windows-static=fail hunspell:x64-windows-static-md=fail ideviceinstaller:x64-windows-static-md=fail idevicerestore:x64-linux=fail @@ -118,7 +117,6 @@ libcerf:x64-windows-static-md=fail libcopp:arm64-windows=fail libfreenect2:arm64-windows=fail libgo:x64-android=fail -libgxps:x64-windows-static-md=fail libgxps:x64-windows-static=fail libigl[opengl](android)=feature-fails libirecovery:x64-windows-static-md=fail @@ -539,9 +537,8 @@ gst-rtsp-server:x64-uwp = cascade gstreamer[asio](arm | !windows) = cascade gstreamer[dc1394](android) = cascade gstreamer[wayland](osx | windows) = cascade -gtk:arm64-uwp = cascade gtk:arm64-windows = cascade -gtk:x64-uwp = cascade +gtk(uwp | (windows & staticcrt)) = cascade gtkmm:arm64-windows = cascade gtkmm:x64-windows-static = cascade gtkmm:x64-windows-static-md = cascade @@ -808,7 +805,6 @@ libadwaita:arm64-uwp = cascade libadwaita:arm64-windows = cascade libadwaita:x64-uwp = cascade libadwaita:x64-windows-static = cascade -libadwaita:x64-windows-static-md = cascade libalkimia:arm64-uwp = cascade libalkimia:arm64-windows = cascade libalkimia:x64-uwp = cascade @@ -1806,7 +1802,6 @@ glad[glx](osx) = skip # No x11 on osx gobject-introspection(arm64 & windows) = skip # needs arm64 host graphene[introspection]:arm64-windows = skip # needs arm64 host gsoap = skip # gsoap does not offer stable public source downloads -gtk3(windows) = skip # regularly hangs harfbuzz[introspection]:arm64-windows = skip # needs arm64 host hello-imgui[freetype-lunasvg] = skip # see https://github.com/microsoft/vcpkg/issues/44212 hello-imgui[sdl2-binding] = skip # see https://github.com/microsoft/vcpkg/issues/44212 diff --git a/versions/a-/at-spi2-atk.json b/versions/a-/at-spi2-atk.json index 69e2bf28d1..732fed6e2e 100644 --- a/versions/a-/at-spi2-atk.json +++ b/versions/a-/at-spi2-atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3aaf26facd1bac85c7f789fcb3cea4a2b2f623a9", + "version": "2.38.0", + "port-version": 2 + }, { "git-tree": "97535464d9f15ce3bcadaf78ad8031fa3df5eda5", "version": "2.38.0", diff --git a/versions/a-/at-spi2-core.json b/versions/a-/at-spi2-core.json index 3d18ec73b4..4bc0aca351 100644 --- a/versions/a-/at-spi2-core.json +++ b/versions/a-/at-spi2-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06c6d76c43fffcbc98dc24430c71e11c70d5cf7f", + "version": "2.44.1", + "port-version": 5 + }, { "git-tree": "66a8d4aed115594b848ea104cd8bb8a4a7899e64", "version": "2.44.1", diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 17baf35057..3ecbe921e1 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "756182a4640340b46a1470472ccca37ebf75ac45", + "version": "2.38.0", + "port-version": 11 + }, { "git-tree": "13fcc8a6fb7b937d315ad06c223fa85860a3ca5a", "version": "2.38.0", diff --git a/versions/baseline.json b/versions/baseline.json index 96beba3c0f..19616c2527 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -350,15 +350,15 @@ }, "at-spi2-atk": { "baseline": "2.38.0", - "port-version": 1 + "port-version": 2 }, "at-spi2-core": { "baseline": "2.44.1", - "port-version": 4 + "port-version": 5 }, "atk": { "baseline": "2.38.0", - "port-version": 10 + "port-version": 11 }, "atkmm": { "baseline": "2.36.3", @@ -3242,7 +3242,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.12", - "port-version": 5 + "port-version": 6 }, "gegl": { "baseline": "0.4.62", @@ -3298,7 +3298,7 @@ }, "gexiv2": { "baseline": "0.14.3", - "port-version": 1 + "port-version": 2 }, "gflags": { "baseline": "2.3.0", @@ -3362,11 +3362,11 @@ }, "glib": { "baseline": "2.86.2", - "port-version": 0 + "port-version": 1 }, "glib-networking": { "baseline": "2.78.0", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.80.1", @@ -3418,7 +3418,7 @@ }, "gobject-introspection": { "baseline": "1.86.0", - "port-version": 0 + "port-version": 1 }, "godot-cpp": { "baseline": "4.4", @@ -3474,7 +3474,7 @@ }, "graphene": { "baseline": "1.10.8", - "port-version": 5 + "port-version": 6 }, "graphicsmagick": { "baseline": "1.3.45", @@ -3530,11 +3530,11 @@ }, "gtk": { "baseline": "4.16.3", - "port-version": 3 + "port-version": 4 }, "gtk3": { - "baseline": "3.24.43", - "port-version": 2 + "baseline": "3.24.51", + "port-version": 0 }, "gtkmm": { "baseline": "4.14.0", @@ -4122,7 +4122,7 @@ }, "json-glib": { "baseline": "1.10.6", - "port-version": 0 + "port-version": 1 }, "json-rpc-cxx": { "baseline": "0.3.2", @@ -4578,7 +4578,7 @@ }, "libadwaita": { "baseline": "1.3.2", - "port-version": 2 + "port-version": 3 }, "libaec": { "baseline": "1.1.3", @@ -4718,7 +4718,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 8 + "port-version": 9 }, "libcsv": { "baseline": "3.0.3", @@ -4962,7 +4962,7 @@ }, "libgxps": { "baseline": "0.3.2", - "port-version": 4 + "port-version": 5 }, "libharu": { "baseline": "2.4.4", @@ -5242,7 +5242,7 @@ }, "libnotify": { "baseline": "0.8.7", - "port-version": 0 + "port-version": 1 }, "libobfuscate": { "baseline": "2024-07-10", @@ -5422,7 +5422,7 @@ }, "librsvg": { "baseline": "2.40.21", - "port-version": 1 + "port-version": 2 }, "librsync": { "baseline": "2.3.4", @@ -5462,7 +5462,7 @@ }, "libsecret": { "baseline": "0.21.4", - "port-version": 1 + "port-version": 2 }, "libsercomm": { "baseline": "1.3.2", @@ -5522,7 +5522,7 @@ }, "libsoup": { "baseline": "3.6.5", - "port-version": 0 + "port-version": 1 }, "libspatialindex": { "baseline": "2.1.0", @@ -7430,7 +7430,7 @@ }, "pango": { "baseline": "1.56.4", - "port-version": 0 + "port-version": 1 }, "pangolin": { "baseline": "0.9.4", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 5c98f5ec6a..843a5186ce 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ff806ba2aeec0ceeb387de3743b20ea3bbb06ce", + "version": "2.42.12", + "port-version": 6 + }, { "git-tree": "673e8c302ea38a1e3f1607806204bfad2c7fa03f", "version": "2.42.12", diff --git a/versions/g-/gexiv2.json b/versions/g-/gexiv2.json index f79eeca435..9199d81b33 100644 --- a/versions/g-/gexiv2.json +++ b/versions/g-/gexiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fef5255b3edb46d8fd8b574720127964141d52f2", + "version": "0.14.3", + "port-version": 2 + }, { "git-tree": "ad0c22ab714e86df77521a8cbd4f31600ebce08d", "version": "0.14.3", diff --git a/versions/g-/glib-networking.json b/versions/g-/glib-networking.json index 2cfc78078d..778273064f 100644 --- a/versions/g-/glib-networking.json +++ b/versions/g-/glib-networking.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf7bbe3e51215869aa69942f90c1a96b1c6e1318", + "version": "2.78.0", + "port-version": 1 + }, { "git-tree": "e302a8e03221f3ee0c3b1da60be13327bd1e6ed9", "version": "2.78.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 733d8a0511..2cdc2295c1 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3cc61e7ce2364986a55ce57aefe1e2069368c8e", + "version": "2.86.2", + "port-version": 1 + }, { "git-tree": "02461ea73953c9dac6b43b89d20daf4e8280e1c7", "version": "2.86.2", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 6a5b88e4e2..e3a685f972 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fc1dbba428c95f5b53e5839d05c681035ceb1e5", + "version": "1.86.0", + "port-version": 1 + }, { "git-tree": "955ccf39bab4317cbcdd48b404e153a5d4087b94", "version": "1.86.0", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 522ffdfd19..b766ccdf2a 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed056e592bd535add9b9da866afc1763e406ac44", + "version": "1.10.8", + "port-version": 6 + }, { "git-tree": "acbd24db3e1526191ff7136667deb6967a7a446b", "version": "1.10.8", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 0ad7f149df..f83272fcc8 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c9c787bf4bf79bce87f1aaaa434a66b12ebc430", + "version": "4.16.3", + "port-version": 4 + }, { "git-tree": "cdf2d21aa39a6737a3faf10d56636009dadde619", "version": "4.16.3", diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index f31c63d6c4..ea5aba5b3b 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e402c71794edbc5b68ad7926350bb8a068306d78", + "version": "3.24.51", + "port-version": 0 + }, { "git-tree": "694065b241970f49ea673268b3a6dd4bf9f6d949", "version": "3.24.43", diff --git a/versions/j-/json-glib.json b/versions/j-/json-glib.json index 293143e610..91242e69d5 100644 --- a/versions/j-/json-glib.json +++ b/versions/j-/json-glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "007e095217ff2924f7081863d423b98d2e84fe27", + "version": "1.10.6", + "port-version": 1 + }, { "git-tree": "feafbefb98655ce290b96a78b08da2107e1b3034", "version": "1.10.6", diff --git a/versions/l-/libadwaita.json b/versions/l-/libadwaita.json index e84bf7e5dc..d33f401a8d 100644 --- a/versions/l-/libadwaita.json +++ b/versions/l-/libadwaita.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65b49e4fa18bd8467db73e2587f2bd562f288517", + "version": "1.3.2", + "port-version": 3 + }, { "git-tree": "96910a2e41ab111c5bc26611f533a44dd760be35", "version": "1.3.2", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 31ffabd365..00d23fdbfd 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa3c001c498ba754c3ce42296f48bbadd2f8ec79", + "version": "0.6.13", + "port-version": 9 + }, { "git-tree": "f2acdc7ad6e5b8130ea8f86afb20221e636a104d", "version": "0.6.13", diff --git a/versions/l-/libgxps.json b/versions/l-/libgxps.json index e960ea8177..765eb8d686 100644 --- a/versions/l-/libgxps.json +++ b/versions/l-/libgxps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a86cbfab9861ddbfc7fb70daf30817ae5e970793", + "version": "0.3.2", + "port-version": 5 + }, { "git-tree": "0d7868dcc67d11cb79d70af08389d9e14506caa9", "version": "0.3.2", diff --git a/versions/l-/libnotify.json b/versions/l-/libnotify.json index b320764854..789b932f48 100644 --- a/versions/l-/libnotify.json +++ b/versions/l-/libnotify.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4237249b168bf1818db58d5633170f0e458c5247", + "version": "0.8.7", + "port-version": 1 + }, { "git-tree": "069bf1b7252408efbbccc72304e4d9d4c1d9e6ef", "version": "0.8.7", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index e06501270a..536d16982b 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c78df28102e2543c8c4346f6267bfd139de6896", + "version": "2.40.21", + "port-version": 2 + }, { "git-tree": "4d44f8793a7574cfbb0c401c944de5c79028f240", "version": "2.40.21", diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json index b105fc600d..e3ed9eb16d 100644 --- a/versions/l-/libsecret.json +++ b/versions/l-/libsecret.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6efcb754fb74193ef5d230c9433c0e8c40eb5065", + "version": "0.21.4", + "port-version": 2 + }, { "git-tree": "bf507b0397b2917c2c12e615f94e577a3f35564d", "version": "0.21.4", diff --git a/versions/l-/libsoup.json b/versions/l-/libsoup.json index c1c4052873..6e0bf9245b 100644 --- a/versions/l-/libsoup.json +++ b/versions/l-/libsoup.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0ee0b625fd0b8f416dff42a480a5537862788e4", + "version": "3.6.5", + "port-version": 1 + }, { "git-tree": "73b1fe19cb8b8876afa9f155bfbf98e9df22026a", "version": "3.6.5", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index ceda2913f3..899377208f 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c27bbe339409b04085e455bf49a9a54a46ceb545", + "version": "1.56.4", + "port-version": 1 + }, { "git-tree": "89909ae6fb8f9a1a7c4ee8cc2fe80d5651e0e638", "version": "1.56.4",