- Update to 3.24.33

- Use vcpkg_from_gitlab()
microsoft · Jun 24, 2022 · b408bec · b408bec
1 parent b50866e
commit b408bec
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 390 deletions.
diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch
@@ -1,23 +1,13 @@
 diff --git a/meson.build b/meson.build
-index a886081..1568783 100644
+index c599843..0cafd79 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -981,12 +981,12 @@ subdir('docs/reference')
- install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
+@@ -1008,7 +1008,7 @@ subdir('docs/reference')
 
- # Keep this in sync with post-install.py expected arguments
--meson.add_install_script('build-aux/meson/post-install.py',
--                         gtk_api_version,
--                         gtk_binary_version,
--                         join_paths(gtk_prefix, get_option('bindir')),
--                         gtk_libdir,
--                         gtk_datadir)
-+#meson.add_install_script('build-aux/meson/post-install.py',
-+#                         gtk_api_version,
-+#                         gtk_binary_version,
-+#                         join_paths(gtk_prefix, get_option('bindir')),
-+#                         gtk_libdir,
-+#                         gtk_datadir)
+ install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
 
- if host_machine.system() != 'windows'
-   # Install Valgrind suppression files (except on Windows,
+-if not meson.is_cross_build()
++if false
+   if meson.version().version_compare('>=0.57.0')
+     gnome.post_install(
+       glib_compile_schemas: true,
diff --git a/ports/gtk3/0002-windows-sdk11.patch b/ports/gtk3/0002-windows-sdk11.patch
diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake
@@ -6,18 +6,12 @@ if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32)
     )
 endif()
 
-set(GTK_MAJOR_MINOR 3.24)
-set(GTK_PATCH 30)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/${GTK_MAJOR_MINOR}/gtk+-${GTK_MAJOR_MINOR}.${GTK_PATCH}.tar.xz"
-    FILENAME "gtk+-${GTK_MAJOR_MINOR}.${GTK_PATCH}.tar.xz"
-    SHA512 4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
+    GITLAB_URL https://gitlab.gnome.org
+    REPO GNOME/gtk
+    REF 3.24.33
+    SHA512 634c3684e670e662340e780a0f561ddc191790625d6b7f28ec7fbb1fcaec86856091e94124565f138d3adaa08a9e063ead2ff441354763b21b4e887c2a54e8d0
     PATCHES
         0001-build.patch
 )

diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "gtk3",
-  "version": "3.24.30",
+  "version": "3.24.33",
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
+  "license": null,
   "dependencies": [
     "atk",
     {