From 3f7655c70ae10ac1683d62dbc0fc9903b74a0a50 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Tue, 5 Apr 2022 18:03:16 +0000 Subject: [PATCH] [cairomm] update to 1.16.1 (#23904) * [cairomm] update to 1.16.1 (microsoft#23903) Cairo: * Surface::Type: Deprecate WIN32, add WIN32_SURFACE (Kjell Ahlstedt) Issue #26, merge request !14 Build: * cairommconfig.h.*: Don't dllimport on MinGW (Chun-wei Fan) Merge reqest !16 (Chun-wei Fan) Issue gtkmm#90 (Lukas K.) * Meson build: Make it possible to use cairomm as a subproject (Kjell Ahlstedt) * Meson build: No implicit_include_directories (Kjell Ahlstedt) * MSVC build: exception.h: Export Cairo::logic_error selectively (Chun-wei Fan) Merge request !17 * [cairomm] remove patch (microsoft#23903) The WIN32 constant has been renamed to WIN32_SURFACE , and the WIN32 -> WIN32_SURFACE alias is only provided for non-win32 sytems, therefore our previous patch is no longer needed. * [cairomm] Support MSVC2022 (microsoft#23903) Manually add ed1ce9a630b375b0f43435e34fbe690eb8276178 from upstream, which prevents MSVC 2022 toolchains from being overridden by the meson port file, resulting in corrupted binarycache metadata * [cairomm] update version registries (microsoft#23903) * [cairomm] add license (microsoft#23903) * [cairomm] regenerate license registry (microsoft#23903) Co-authored-by: Schaich --- ports/cairomm/build-support-msvc2022.diff | 41 +++++++++++++++++++++++ ports/cairomm/portfile.cmake | 6 ++-- ports/cairomm/undef.win32.patch | 12 ------- ports/cairomm/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/c-/cairomm.json | 5 +++ 6 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 ports/cairomm/build-support-msvc2022.diff delete mode 100644 ports/cairomm/undef.win32.patch diff --git a/ports/cairomm/build-support-msvc2022.diff b/ports/cairomm/build-support-msvc2022.diff new file mode 100644 index 00000000000000..b83bdd85f3f740 --- /dev/null +++ b/ports/cairomm/build-support-msvc2022.diff @@ -0,0 +1,41 @@ +commit ed1ce9a630b375b0f43435e34fbe690eb8276178 +Author: Chun-wei Fan +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' diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index c20887b0da9064..212310565f4445 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -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" @@ -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( diff --git a/ports/cairomm/undef.win32.patch b/ports/cairomm/undef.win32.patch deleted file mode 100644 index e91db0bfe42b06..00000000000000 --- a/ports/cairomm/undef.win32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cairomm/surface.h b/cairomm/surface.h -index c923e6086..8cfaa76a3 100644 ---- a/cairomm/surface.h -+++ b/cairomm/surface.h -@@ -49,6 +49,7 @@ - #include - #endif // CAIRO_HAS_GLITZ_SURFACE - -+#undef WIN32 - - namespace Cairo - { diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index b1f937ba6cb2b0..467d320c6ab062 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 648173a2d218f3..62c6e1ce891459 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1221,8 +1221,8 @@ "port-version": 0 }, "cairomm": { - "baseline": "1.16.0", - "port-version": 1 + "baseline": "1.16.1", + "port-version": 0 }, "calceph": { "baseline": "3.5.1", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 8b828b0c228e0b..7bfd0bf732e058 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce", + "version": "1.16.1", + "port-version": 0 + }, { "git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9", "version": "1.16.0",