[glib up to gtk] update and make it work with meson (#13100)

* update glib to meson

* update ci baseline

* update glib to 2.66.3
remove cmakelists

* fix some minor meson issue but meson is still a mess

* add_bin_to_path to vcpkg_install_meson

* regen docs

* try fixing/touching all glib dependent ports

* fix libsigcpp-3 version

* fix glibmm

* fix gmime

* fix libcroco

* update libnice

* fix atk build

* update harfbuzz

* fix few builds

* update libxmlpp

* fix gdk-pixbuf

* fix gts

* gts add patch

* remove old libsigcpp

* add missing comma

* fix supports logic

* fix name mismatch

* restore original ci baseline.

* fix a lot of small details.
increment controls.

* fix harfbuzz & glib

* bump port version

* update port_versions

* fix version field

* update versions

* fix glib in harfbuzz

* update port versions

* silly uppercase type

* update port-versions

* fix cairo build

* update version

* fix atk

* update atk port-verisons

* fix gts public includes

* update versions

* fix cairomm

* fix pango

* fix ignition

* update versions.

* fix gtk

* fix librsvg

* update versions

* fix atk linux

* fix libgpod

* update versions

* fix lcm

* fix librsvg

* update pango and pangomm

* update pango to meson

* more updates

* update pixman

* fix cairo

* fix cairo

* some fixes

* reorder meson a bit

* add none.txt for meson

* fix x86_x64 to x86 "cross" builds

* add tiff pkgconfig

* update gdk-pixbuf

* fix tiff and jpeg

* add graphene

* fix gdk-pixbuf

* add sassc

* update gtk

* fix cairo complete build

* add harfbuzz inlcude in pango since meson does not add it into pkgconfig.

* fix gtk build. Remaining issue fix install script.

* fix gtk build

* fix io2d

* add supports field

* fix cartographer?

* fix librsvg build

* fix gtk build

* fix cartographer

* fix sassc on linux

* fix tiff and libjpeg pc files

* fix pixman x86

* _isnanf is undefined on arm-

* merge fix for make on arm64

* fix gdk-pixbuf on arm64-windows

* pixman remove test/demos.
should fix it on osx.

* [vcpkg_install_meson] add bin to path to run code generators

* [vcpkg_configure_meson]
deactivate native compiler in cross builds
make x86 on x86_x64 a native instead of a cross build
(as long as we are not building for UWP)

* pixman reenable UWP support.

* pixman reenable arm support

* add pixman:arm-uwp=fail to baseline

* update gtkmm

* remove double whitespaces

* gtk baseline
gtk dependency on cairo x11
remove double spaces in flags

* fix linux build

* native none again

* cairo fix cairo-script.pc

* comment out patch since the cairo changes should have fixed it.

* disable wayland backend in GTK since CI is missing system packages

* silly typo in cairo pc file correction
install lzo pc on windows

* remove double spaces in _FLAGS
remove unnecessary comments

* actually disabling wayland backend

* fix glib codegen issue having the wrong path

* try to fix paths in glib codegen

* integrate changes form #12860

* add the uwp patch back in

* deactivate extra harfbuzz shapers.

* vcpkg x-add-version --all --overwrite-version

* remove patches in tesseract.

* fix version

* rerun add-version

* add libgpod:x64-linux=fail to baseline due to missing system tools/libraries

* change regex to take double - into account.

* run x-add-version

* run format-manifest

* add missing removal of multiple spaces back into the regex

* remove ws diff change

* fix gtkmm the upstream way

* remove ws to reduce diff

* make glib build on osx

* format manifest

* run x-add-version

* add pthread dependency

* update baseline due to glib compiling on osx now.

* add meson as a dep to glib

* - add glib host dependencies
- switch to manifest of touched ports

* switch to manifest.

* [libxml2] add gnuinstalldirs

* [libxml2] add missing include of GNUInstallDirs

* add version info

* add include dir to pc files ....

* update version

* add UWP as crosscompiling target

* Apply suggestions from code review

* trying to fix cairo pthread detection on osx.

* fix libmicrohttpd by adding the required system frameworks on osx

* fix poppler by not removing the CXX standard

* fix missing coretext header from harfbuzz in pano

* fix formating issues

* fix librsvg on osx

* revert version changes

* bump version

* version stuff.

* fix graphene version stuff

* fix version stuff

* removing ports from ci baseline to cause me pain

* move cairomm:x64-linux=fail
to gtkmm:x64-linx=fail
remove pangomm:x64-osx=fail

* fix typo

* revert ws changes to vcpkg_install_meson

* update port version after merge

* version stuff

* fix fluidsynth by adding vcpkg_check_features

* move cairo to ci baseline on osx

* version stuff

* fluidsynth corrections

* more version stuff

* apply code review changes

* clean version stuff.

* update version stuff

* code review cleanup

* version stuff

* formating

* update version stuff again

* remove gdi again

* version stuff

* version stuff

* version baseline

* Apply strega-nil suggestions from code review

* run x-add-version

* reset versions to upstream/master

* v8 CONTROL -> json

* reset fluidsynth to upstream/master

* first batch of version-string -> version conversion

* second and last batch of version-string -> version conversions

* update version stuff

* disable gdi feature in harfbuzz (missing user32 linkage in qt5-base)

* version stuff

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* more CR stuff

* update versions

* back out provision changes so that pr can be merged.

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

6 files changed, 24 insertions, 487 deletions

diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL
deleted file mode 100644
index 6d7674c44..000000000
--- a/ports/atkmm/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: atkmm

-Version: 2.24.2

-Port-Version: 5

-Homepage: https://www.gtkmm.org

-Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.

-Build-Depends: glib, gettext, atk, glibmm

-Supports: !(osx)

diff --git a/ports/atkmm/fix_charset.patch b/ports/atkmm/fix_charset.patch
deleted file mode 100644
index 60cd8fbcd..000000000
--- a/ports/atkmm/fix_charset.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj
-index 40f21cb..e9f5c5e 100644
---- a/MSVC_Net2013/atkmm.vcxproj
-+++ b/MSVC_Net2013/atkmm.vcxproj
-@@ -22,21 +22,22 @@
-     <ProjectName>atkmm</ProjectName>
-     <ProjectGuid>{9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
-index d6f2798..aab7023 100644
---- a/MSVC_Net2013/gendef.vcxproj
-+++ b/MSVC_Net2013/gendef.vcxproj
-@@ -21,21 +21,22 @@
-   <PropertyGroup Label="Globals">
-     <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj
-index 6225a66..7f61dc5 100644
---- a/MSVC_Net2013/install.vcxproj
-+++ b/MSVC_Net2013/install.vcxproj
-@@ -22,28 +22,29 @@
-     <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-     <RootNamespace>install</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Utility</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/ports/atkmm/fix_properties.patch b/ports/atkmm/fix_properties.patch
deleted file mode 100644
index a03924386..000000000
--- a/ports/atkmm/fix_properties.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-diff --git a/MSVC_Net2013/atkmm-build-defines.props b/MSVC_Net2013/atkmm-build-defines.props
-index 421f5c3..0275e6e 100644
---- a/MSVC_Net2013/atkmm-build-defines.props
-+++ b/MSVC_Net2013/atkmm-build-defines.props
-@@ -5,8 +5,6 @@
-   </ImportGroup>
-   <PropertyGroup Label="UserMacros">
-     <AtkMMBuildDefs>ATKMM_BUILD</AtkMMBuildDefs>
--    <CPPDepLibsRelease>glibmm-vc$(VSVer)0-2_4.lib;sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
--    <CPPDepLibsDebug>glibmm-vc$(VSVer)0-d-2_4.lib;sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
-   </PropertyGroup>
-   <PropertyGroup>
-     <_PropertySheetDisplayName>panogmmbuilddefinesprops</_PropertySheetDisplayName>
-@@ -15,25 +13,19 @@
-   </PropertyGroup>
-   <ItemDefinitionGroup>
-     <ClCompile>
--      <AdditionalIncludeDirectories>.\atkmm;..\atk;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>.\atkmm;..\atk;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-     </ClCompile>
-     <Link>
--      <AdditionalDependencies>atk-1.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemGroup>
-     <BuildMacro Include="AtkMMBuildDefs">
-       <Value>$(AtkMMBuildDefs)</Value>
-     </BuildMacro>
--    <BuildMacro Include="CPPDepLibsRelease">
--      <Value>$(CPPDepLibsRelease)</Value>
--    </BuildMacro>
--    <BuildMacro Include="CPPDepLibsDebug">
--      <Value>$(CPPDepLibsDebug)</Value>
--    </BuildMacro>
-   </ItemGroup>
- </Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/atkmm-version-paths.props b/MSVC_Net2013/atkmm-version-paths.props
-index affd50f..675aa3e 100644
---- a/MSVC_Net2013/atkmm-version-paths.props
-+++ b/MSVC_Net2013/atkmm-version-paths.props
-@@ -2,13 +2,9 @@
- <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   <PropertyGroup Label="UserMacros">
-     <VSVer>12</VSVer>
--    <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
--    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
-     <ApiMajorVersion>1</ApiMajorVersion>
-     <ApiMinorVersion>6</ApiMinorVersion>
--    <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
--    <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
-   </PropertyGroup>
-   <PropertyGroup>
-     <_PropertySheetDisplayName>atkmmversionpathsprops</_PropertySheetDisplayName>
-@@ -17,12 +13,6 @@
-     <BuildMacro Include="VSVer">
-       <Value>$(VSVer)</Value>
-     </BuildMacro>
--    <BuildMacro Include="GlibEtcInstallRoot">
--      <Value>$(GlibEtcInstallRoot)</Value>
--    </BuildMacro>
--    <BuildMacro Include="CopyDir">
--      <Value>$(CopyDir)</Value>
--    </BuildMacro>
-     <BuildMacro Include="DefDir">
-       <Value>$(DefDir)</Value>
-     </BuildMacro>
-@@ -32,11 +22,5 @@
-     <BuildMacro Include="ApiMinorVersion">
-       <Value>$(ApiMinorVersion)</Value>
-     </BuildMacro>
--    <BuildMacro Include="ReleaseDllSuffix">
--      <Value>$(ReleaseDllSuffix)</Value>
--    </BuildMacro>
--    <BuildMacro Include="DebugDllSuffix">
--      <Value>$(DebugDllSuffix)</Value>
--    </BuildMacro>
-   </ItemGroup>
- </Project>
-\ No newline at end of file
-diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj
-index c3db50a..40f21cb 100644
---- a/MSVC_Net2013/atkmm.vcxproj
-+++ b/MSVC_Net2013/atkmm.vcxproj
-@@ -41,7 +41,7 @@
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-diff --git a/MSVC_Net2013/atkmm.vcxproj.filters b/MSVC_Net2013/atkmm.vcxproj.filters
-index f0fca22..6598996 100644
---- a/MSVC_Net2013/atkmm.vcxproj.filters
-+++ b/MSVC_Net2013/atkmm.vcxproj.filters
-@@ -15,55 +15,143 @@
-     </Filter>
-   </ItemGroup>
-   <ItemGroup>
--    <ClCompile Include="..\atk\atkmm\action.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\component.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\document.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\editabletext.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\hyperlink.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\hypertext.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\image.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\implementor.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\init.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\noopobject.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\object.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\objectaccessible.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\range.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\relation.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\relationset.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\selection.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\stateset.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\streamablecontent.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\table.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\text.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\value.cc"><Filter>Source Files</Filter></ClCompile>
--    <ClCompile Include="..\atk\atkmm\wrap_init.cc"><Filter>Source Files</Filter></ClCompile>
-+    <ClCompile Include="..\atk\atkmm\action.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\component.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\document.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\editabletext.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\hyperlink.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\hypertext.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\image.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\implementor.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\init.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\noopobject.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\object.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\objectaccessible.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\range.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\relation.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\relationset.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\selection.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\stateset.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\streamablecontent.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\table.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\text.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\value.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-+    <ClCompile Include="..\atk\atkmm\wrap_init.cc">
-+      <Filter>Source Files</Filter>
-+    </ClCompile>
-   </ItemGroup>
-   <ItemGroup>
--    <ClInclude Include="..\atk\atkmm\action.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\component.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\document.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\editabletext.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\hyperlink.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\hypertext.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\image.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\implementor.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\init.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\noopobject.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\object.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\objectaccessible.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\range.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\relation.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\relationset.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\selection.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\stateset.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\streamablecontent.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\table.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\text.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\value.h"><Filter>Header Files</Filter></ClInclude>
--    <ClInclude Include="..\atk\atkmm\wrap_init.h"><Filter>Header Files</Filter></ClInclude>
-+    <ClInclude Include="..\atk\atkmm\action.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\component.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\document.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\editabletext.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\hyperlink.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\hypertext.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\image.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\implementor.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\init.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\noopobject.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\object.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\objectaccessible.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\range.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\relation.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\relationset.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\selection.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\stateset.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\streamablecontent.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\table.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\text.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\value.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-+    <ClInclude Include="..\atk\atkmm\wrap_init.h">
-+      <Filter>Header Files</Filter>
-+    </ClInclude>
-   </ItemGroup>
-   <ItemGroup>
--    <ResourceCompile Include="atkmm.rc">
-+    <ResourceCompile Include=".\atkmm\atkmm.rc">
-       <Filter>Resource Files</Filter>
-     </ResourceCompile>
-   </ItemGroup>
-diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
-index 554054c..d6f2798 100644
---- a/MSVC_Net2013/gendef.vcxproj
-+++ b/MSVC_Net2013/gendef.vcxproj
-@@ -40,7 +40,7 @@
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-     <ConfigurationType>Application</ConfigurationType>
--    <CharacterSet>MultiByte</CharacterSet>
-+    <CharacterSet>Unicode</CharacterSet>
-     <PlatformToolset>v120</PlatformToolset>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/ports/atkmm/msvc_recommended_pragmas.h b/ports/atkmm/msvc_recommended_pragmas.h
deleted file mode 100644
index c0eb1d5ed..000000000
--- a/ports/atkmm/msvc_recommended_pragmas.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _MSC_VER
-#pragma error "This header is for Microsoft VC only."
-#endif /* _MSC_VER */
-
-/* Make MSVC more pedantic, this is a recommended pragma list
- * from _Win32_Programming_ by Rector and Newcomer.
- */
-#pragma warning(error:4002) /* too many actual parameters for macro */
-#pragma warning(error:4003) /* not enough actual parameters for macro */
-#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
-#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
-#pragma warning(1:4016)     /* no function return type; using int as default */
-#pragma warning(error:4020) /* too many actual parameters */
-#pragma warning(error:4021) /* too few actual parameters */
-#pragma warning(error:4027) /* function declared without formal parameter list */
-#pragma warning(error:4029) /* declared formal parameter list different from definition */
-#pragma warning(error:4033) /* 'function' must return a value */
-#pragma warning(error:4035) /* 'function' : no return value */
-#pragma warning(error:4045) /* array bounds overflow */
-#pragma warning(error:4047) /* different levels of indirection */
-#pragma warning(error:4049) /* terminating line number emission */
-#pragma warning(error:4053) /* An expression of type void was used as an operand */
-#pragma warning(error:4071) /* no function prototype given */
-#pragma warning(disable:4101) /* unreferenced local variable */
-#pragma warning(error:4150)
-
-#pragma warning(disable:4244)	/* No possible loss of data warnings */
-#pragma warning(disable:4305)   /* No truncation from int to char warnings */
-
-#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
-
-/* work around Microsoft's premature attempt to deprecate the C-Library */
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS
diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake
index 279ba7e25..9f7a72560 100644
--- a/ports/atkmm/portfile.cmake
+++ b/ports/atkmm/portfile.cmake
@@ -3,57 +3,26 @@ if (VCPKG_TARGET_IS_WINDOWS)
 endif()
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
-    FILENAME "atkmm-2.24.2.tar.xz"
-    SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.36/atkmm-2.36.0.tar.xz"
+    FILENAME "atkmm-2.36.0.tar.xz"
+    SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
-        fix_properties.patch
-        fix_charset.patch
 )
 
-if (VCPKG_TARGET_IS_WINDOWS)
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
-
-    set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE})
-    if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
-        set(VS_PLATFORM "Win32")
-    endif(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
-    vcpkg_build_msbuild(
-        PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/atkmm.sln
-        TARGET atkmm
-        PLATFORM ${VS_PLATFORM}
-        USE_VCPKG_INTEGRATION
-    )
-
-    # Handle headers
-    file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-    file(COPY ${SOURCE_PATH}/atk/atkmm
-        DESTINATION ${CURRENT_PACKAGES_DIR}/include
-        FILES_MATCHING PATTERN *.h)
+vcpkg_configure_meson(
+    SOURCE_PATH ${SOURCE_PATH} 
+    OPTIONS 
+        -Dbuild-documentation=false
+        -Dbuild-deprecated-api=true # Build deprecated API and include it in the library
+        -Dmsvc14x-parallel-installable=false) # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019
+vcpkg_install_meson()
 
-    # Handle libraries
-    file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll
-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
-    vcpkg_copy_pdbs()
-else()
-    set(ENV{CONFIG_SHELL} bash)
-    vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} OPTIONS ${ATKMM_OPTIONS})
-
-    vcpkg_install_make()
-endif()
+vcpkg_fixup_pkgconfig()
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json
new file mode 100644
index 000000000..832fa3b98
--- /dev/null
+++ b/ports/atkmm/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "atkmm",
+  "version": "2.36.0",
+  "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.",
+  "homepage": "https://www.gtkmm.org",
+  "supports": "!osx",
+  "dependencies": [
+    "atk",
+    "gettext",
+    "glib",
+    "glibmm"
+  ]
+}