Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Oct 21, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8994117
[glibmm] Update to 2.74.0 (microsoft#27351)
SchaichAlonso Oct 20, 2022
9c0fc67
[glibmm] remove obsolete patch (microsoft#27351)
SchaichAlonso Oct 21, 2022
8a06351
[glibmm] regenerate versions registry (microsoft#27351)
SchaichAlonso Oct 21, 2022
cfddc9f
Add quotes :)
BillyONeal Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions ports/glibmm/build-support-vs2022-builds.patch
View file
Open in desktop

This file was deleted.

27 changes: 14 additions & 13 deletions ports/glibmm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}")
3 changes: 1 addition & 2 deletions ports/glibmm/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glibmm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d633ca7a15a77e20cdf515ba74448d59f4e49021",
"version": "2.74.0",
"port-version": 0
},
{
"git-tree": "75f0e8e579c069e71bdb773c9e741fc7182e0379",
"version": "2.70.0",
Expand Down