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

Jump to bottom

[cairomm] update to 1.16.1 #23904

Merged
merged 6 commits into from
Apr 5, 2022
Merged

[cairomm] update to 1.16.1 #23904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca2eb54
[cairomm] update to 1.16.1 (microsoft#23903)
Mar 30, 2022
c9c2f3b
[cairomm] remove patch (microsoft#23903)
Mar 30, 2022
a77ed5f
[cairomm] Support MSVC2022 (microsoft#23903)
SchaichAlonso Mar 31, 2022
00b5f70
[cairomm] update version registries (microsoft#23903)
SchaichAlonso Mar 31, 2022
e94d843
[cairomm] add license (microsoft#23903)
SchaichAlonso Mar 31, 2022
ae54a41
[cairomm] regenerate license registry (microsoft#23903)
SchaichAlonso Mar 31, 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: 41 additions & 0 deletions ports/cairomm/build-support-msvc2022.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
commit ed1ce9a630b375b0f43435e34fbe690eb8276178
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed Nov 10 16:11:04 2021 +0800

build: Support Visual Studio 2022

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 bf2e906..58b7092 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 8b18fc2..1fa2da0 100644
--- a/meson.build
+++ b/meson.build
@@ -238,7 +238,9 @@ if is_msvc
add_project_arguments(disabled_warning, language: 'cpp')
endforeach
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'
6 changes: 3 additions & 3 deletions ports/cairomm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(CAIROMM_VERSION 1.16.0)
set(CAIROMM_HASH 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3)
set(CAIROMM_VERSION 1.16.1)
set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757)

vcpkg_download_distfile(ARCHIVE
URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz"
Expand All @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
undef.win32.patch # because WIN32 is used as an ENUM identifier.
build-support-msvc2022.diff
)

vcpkg_configure_meson(
Expand Down
12 changes: 0 additions & 12 deletions ports/cairomm/undef.win32.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ports/cairomm/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "cairomm",
"version": "1.16.0",
"port-version": 1,
"version": "1.16.1",
"description": "A C++ wrapper for the cairo graphics library",
"homepage": "https://www.cairographics.org",
"license": "LGPL-2.0-only",
"dependencies": [
"cairo",
"libsigcpp",
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 @@ -1221,8 +1221,8 @@
"port-version": 4
},
"cairomm": {
"baseline": "1.16.0",
"port-version": 1
"baseline": "1.16.1",
"port-version": 0
},
"calceph": {
"baseline": "3.5.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cairomm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce",
"version": "1.16.1",
"port-version": 0
},
{
"git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9",
"version": "1.16.0",
Expand Down