[gtk3] Update (#31047)

microsoft · Apr 25, 2023 · a27cee0 · a27cee0
1 parent 2c4c5c7
commit a27cee0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch
@@ -8,6 +8,6 @@ index c599843..0cafd79 100644
 
 -if not meson.is_cross_build()
 +if false
-   if meson.version().version_compare('>=0.57.0')
-     gnome.post_install(
-       glib_compile_schemas: true,
+   gnome.post_install(
+     glib_compile_schemas: true,
+     gio_querymodules: gio_module_dirs,
diff --git a/ports/gtk3/cairo-cpp-linkage.patch b/ports/gtk3/cairo-cpp-linkage.patch
@@ -55,8 +55,8 @@ index 287f0cb..d35106f 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1,4 +1,4 @@
--project('gtk+-3.0', 'c',
-+project('gtk+-3.0', 'c', 'cpp',
-         version: '3.24.34',
-         default_options: [
-           'buildtype=debugoptimized',
+-project('gtk+', 'c',
++project('gtk+', 'c', 'cpp',
+   version: '3.24.36',
+   default_options: [
+     'buildtype=debugoptimized',
diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake
@@ -6,13 +6,12 @@ if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32)
     )
 endif()
 
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     GITLAB_URL https://gitlab.gnome.org
     REPO GNOME/gtk
     REF "${VERSION}"
-    SHA512 20a91e30a89070461af06b33829bc723b348806b4a785d0743af8bd4789b55dade24686e08bf1b2f0335240463aacc040134babb0605b809186b15de9cf261e4
+    SHA512 ae7036d8c9416a95740b20aa0cfe7f73391aefef56f02f27fa36e1231ba1f0d69bd446b9cebc47e0cfd09c0dcdc228156211cd140ad4618e6882ea52745ee4a8
     PATCHES
         0001-build.patch
         cairo-cpp-linkage.patch
@@ -25,22 +24,24 @@ vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/")
 vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf")
 vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
 
+
+vcpkg_list(SET ADDITIONAL_BINARIES)
 if("introspection" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature introspection currently only supports dynamic build.")
-    endif()
     list(APPEND OPTIONS_DEBUG -Dintrospection=false)
     list(APPEND OPTIONS_RELEASE -Dintrospection=true)
+    if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        set(GIR_TOOL_DIR "${CURRENT_INSTALLED_DIR}")
+    else()
+        set(GIR_TOOL_DIR "${CURRENT_HOST_INSTALLED_DIR}")
+    endif()
+    vcpkg_list(APPEND ADDITIONAL_BINARIES
+        "g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
+        "g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'"
+    )
 else()
     list(APPEND OPTIONS -Dintrospection=false)
 endif()
 
-if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(GIR_TOOL_DIR ${CURRENT_INSTALLED_DIR})
-else()
-    set(GIR_TOOL_DIR ${CURRENT_HOST_INSTALLED_DIR})
-endif()
-
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -66,8 +67,7 @@ vcpkg_configure_meson(
         "glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
         "gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'"
         "glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
-        "g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}'"
-        "g-ir-scanner='${GIR_TOOL_DIR}/tools/gobject-introspection/g-ir-scanner'"
+        ${ADDITIONAL_BINARIES}
 )
 
 # Reduce command line lengths, in particular for static windows builds.

diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gtk3",
-  "version": "3.24.34",
-  "port-version": 2,
+  "version": "3.24.36",
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": null,
@@ -55,6 +54,7 @@
   "features": {
     "introspection": {
       "description": "build with introspection",
+      "supports": "!windows | !static",
       "dependencies": [
         {
           "name": "atk",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2969,8 +2969,8 @@
       "port-version": 0
     },
     "gtk3": {
-      "baseline": "3.24.34",
-      "port-version": 2
+      "baseline": "3.24.36",
+      "port-version": 0
     },
     "gtkmm": {
       "baseline": "4.6.0",

diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "93a006967f4d1c6e3ce8409cd1a134f81c2b1288",
+      "version": "3.24.36",
+      "port-version": 0
+    },
     {
       "git-tree": "0c25a1f1fc2d3f166ea007a97b845fb85769588e",
       "version": "3.24.34",