[gtkmm/gtk] update to 4.14.0 (microsoft#39682)

gavinltomra · Jul 5, 2024 · dc5b3c9 · dc5b3c9
1 parent 35ebc92
commit dc5b3c9
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/gtk
     REF ${VERSION}
-    SHA512 f219ddc6f46061f516f99a3845f344269d51d7fc2554773f7d4cee7833c5be26ce809262466d18c2804559834eb595f0d802b6fc80d77b7e8bf046e4c1293d64
+    SHA512 ccb78098f202b2d099908a1b92087697cfa8f5969ba0221d4e8ed3decb6cf2ec7ea3b3d1ae450b4e12e7aff640333de06333c53930f15ba6cc201b37cebb1838
     HEAD_REF master # branch name
     PATCHES
         0001-build.patch
@@ -52,13 +52,12 @@ vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         ${OPTIONS}
-        -Ddemos=false
+        -Dbuild-demos=false
         -Dbuild-testsuite=false
         -Dbuild-examples=false
         -Dbuild-tests=false
-        -Dgtk_doc=false
+        -Ddocumentation=false
         -Dman-pages=false
-        -Dmedia-ffmpeg=disabled     # Build the ffmpeg media backend
         -Dmedia-gstreamer=disabled  # Build the gstreamer media backend
         -Dprint-cups=disabled       # Build the cups print backend
         -Dvulkan=disabled           # Enable support for the Vulkan graphics API
@@ -92,7 +91,9 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 
 set(TOOL_NAMES gtk4-builder-tool
                gtk4-encode-symbolic-svg
+               gtk4-path-tool
                gtk4-query-settings
+               gtk4-rendernode-tool
                gtk4-update-icon-cache)
 if(VCPKG_TARGET_IS_LINUX)
     list(APPEND TOOL_NAMES gtk4-launch)

diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gtk",
-  "version": "4.10.5",
-  "port-version": 2,
+  "version": "4.14.0",
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "license": "LGPL-2.0-only",

diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake
@@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GTKMM_MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/${GTKMM_MAJOR_MINOR}/gtkmm-${VERSION}.tar.xz"
     FILENAME "gtkmm-${VERSION}.tar.xz"
-    SHA512 ee40cce37c34814884ffc06e614013d23fa31cac51ea9d98ea5689a08acc2ff58bb2ca80ba822d6fe3c0f3bdcb9ce2596ede3c05c69a702b524c4e38afc3d9ab
+    SHA512 94cf1f764e539b8b1fdff101f6e134c5e2bc9379f1dae3b6daef66ab94e90f5e70a41d8eb94842fd54c0f8706c565e975fa2adf6e4c6913cecaeb3c8cf00a1cd
 )
 
 vcpkg_extract_source_archive(
@@ -26,4 +26,4 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gtkmm",
-  "version": "4.10.0",
-  "port-version": 1,
+  "version": "4.14.0",
   "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.",
   "homepage": "https://www.gtkmm.org/",
   "license": "LGPL-3.0-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3249,16 +3249,16 @@
       "port-version": 1
     },
     "gtk": {
-      "baseline": "4.10.5",
-      "port-version": 2
+      "baseline": "4.14.0",
+      "port-version": 0
     },
     "gtk3": {
       "baseline": "3.24.38",
       "port-version": 1
     },
     "gtkmm": {
-      "baseline": "4.10.0",
-      "port-version": 1
+      "baseline": "4.14.0",
+      "port-version": 0
     },
     "gtl": {
       "baseline": "1.1.8",

diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d5ba4a94cd8433f563ba1519395f202d29bd8790",
+      "version": "4.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "38a496538cd081a8d64d5b2733cb1f2b4fbae559",
       "version": "4.10.5",

diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "89805ce5526aad3b7b6b1f1242204959c61b4ddb",
+      "version": "4.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e9e63e49ac6c8ade89bf2df6bf73bb32f3b18f9b",
       "version": "4.10.0",