[glibmm] Update to 2.74.0 (#27351) (#27352)

* [glibmm] Update to 2.74.0 (#27351) * [glibmm] remove obsolete patch (#27351) * [glibmm] regenerate versions registry (#27351) * Add quotes :) Co-authored-by: Billy Robert O'Neal III <[email protected]>
microsoft · Oct 21, 2022 · 934a99d · 934a99d
1 parent fabec58
commit 934a99d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 58 deletions.
diff --git a/ports/glibmm/build-support-vs2022-builds.patch b/ports/glibmm/build-support-vs2022-builds.patch
diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake
@@ -1,35 +1,36 @@
 # Glib uses winapi functions not available in WindowsStore
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.70/glibmm-2.70.0.tar.xz"
-    FILENAME "glibmm-2.70.0.tar.xz"
-    SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518
+vcpkg_download_distfile(GLIBMM_ARCHIVE
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.74/glibmm-2.74.0.tar.xz"
+    FILENAME "glibmm-2.74.0.tar.xz"
+    SHA512 29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    PATCHES
-        build-support-vs2022-builds.patch
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${GLIBMM_ARCHIVE}"
 )
 
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -Dbuild-examples=false
         -Dmsvc14x-parallel-installable=false
 )
+
 vcpkg_install_meson()
 vcpkg_copy_pdbs()
 
-# intentionally 2.68 - glib does not install glibmm-2.70 files
+# intentionally 2.68 - glib does not install glibmm-2.7x files
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc"
     "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc"
 )
 
 vcpkg_fixup_pkgconfig()
 
-# Handle copyright and readme
+# Handle copyright and readmes
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme.txt)
+file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme.txt)
+file(INSTALL "${SOURCE_PATH}/README.SUN" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/README.win32" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "glibmm",
-  "version": "2.70.0",
-  "port-version": 1,
+  "version": "2.74.0",
   "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
   "homepage": "https://www.gtkmm.org.",
   "license": "LGPL-2.1-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2653,8 +2653,8 @@
       "port-version": 0
     },
     "glibmm": {
-      "baseline": "2.70.0",
-      "port-version": 1
+      "baseline": "2.74.0",
+      "port-version": 0
     },
     "glm": {
       "baseline": "0.9.9.8",

diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d633ca7a15a77e20cdf515ba74448d59f4e49021",
+      "version": "2.74.0",
+      "port-version": 0
+    },
     {
       "git-tree": "75f0e8e579c069e71bdb773c9e741fc7182e0379",
       "version": "2.70.0",