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

* [glibmm] Update to 2.74.0 (microsoft#27351)

* [glibmm] remove obsolete patch (microsoft#27351)

* [glibmm] regenerate versions registry (microsoft#27351)

* Add quotes :)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Alonso Schaich 2022-10-21 22:49:14 +00:00 committed by GitHub
parent fabec58e57
commit 934a99dc13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 58 deletions

View File

@ -1,41 +0,0 @@
commit b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 9 14:28:14 2021 +0800
Build: Support VS2022 builds
Make these builds distinct from the Visual Studio 2019 builds.
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 6933505d..16d57810 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -98,9 +98,12 @@ PDBVER = 14
!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920
VSVER_SUFFIX = 1
VSVER = 15
-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930
VSVER_SUFFIX = 2
VSVER = 16
+!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000
+VSVER_SUFFIX = 3
+VSVER = 17
!else
VSVER = $(PDBVER)
!endif
diff --git a/meson.build b/meson.build
index b7c7f77e..a2ee5ef3 100644
--- a/meson.build
+++ b/meson.build
@@ -231,7 +231,9 @@ if is_msvc
add_project_arguments(disabled_warnings, language: 'cpp')
if use_msvc14x_toolset_ver
- if cpp_compiler.version().version_compare('>=19.20')
+ if cpp_compiler.version().version_compare('>=19.30')
+ msvc14x_toolset_ver = '-vc143'
+ elif cpp_compiler.version().version_compare('>=19.20')
msvc14x_toolset_ver = '-vc142'
elif cpp_compiler.version().version_compare('>=19.10')
msvc14x_toolset_ver = '-vc141'

View File

@ -1,28 +1,27 @@
# 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"
@ -30,6 +29,8 @@ file(REMOVE_RECURSE
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}")

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d633ca7a15a77e20cdf515ba74448d59f4e49021",
"version": "2.74.0",
"port-version": 0
},
{
"git-tree": "75f0e8e579c069e71bdb773c9e741fc7182e0379",
"version": "2.70.0",