[cairomm] Fix config include path (#29518)

* [cairomm] Fix config include path

* update version

---------

Co-authored-by: Jonliu1993 <13720414433@163.com>

ports/cairomm/fix_include_path.patch

@@ -0,0 +1,45 @@
+diff --git a/meson.build b/meson.build
+index 4522a94..c387148 100644
+--- a/meson.build
++++ b/meson.build
+@@ -271,7 +271,7 @@ mm_conf_data.set('CAIROMM_MINOR_VERSION', cairomm_minor_version)
+ mm_conf_data.set('CAIROMM_MICRO_VERSION', cairomm_micro_version)
+ mm_conf_data.set('VERSION', meson.project_version()) # for MSVC_NMake/cairomm/cairomm.rc
+ 
+-install_includeconfigdir = install_libdir / cairomm_pcname / 'include'
++install_includeconfigdir = install_includedir
+ cairommconfig_h = configure_file(
+   input: 'cairommconfig.h.meson',
+   output: 'cairommconfig.h',
+@@ -361,7 +361,7 @@ summary = [
+   'Directories:',
+   '                  prefix: @0@'.format(install_prefix),
+   '              includedir: @0@'.format(install_prefix / install_includedir),
+-  '       includecairommdir: @0@'.format(install_prefix / install_includedir / cairomm_pcname),
++  '       includecairommdir: @0@'.format(install_prefix / install_includedir),
+   '                  libdir: @0@'.format(install_prefix / install_libdir),
+   '        includeconfigdir: @0@'.format(install_prefix / install_includeconfigdir),
+   '            pkgconfigdir: @0@'.format(install_prefix / install_pkgconfigdir),
+diff --git a/cairomm/meson.build b/cairomm/meson.build
+index f940268..23b955e 100644
+--- a/cairomm/meson.build
++++ b/cairomm/meson.build
+@@ -64,7 +64,7 @@ cairomm_private_h = [
+ # docs/reference/meson.build needs this.
+ source_h_files = cairomm_public_h
+ 
+-install_headers(cairomm_public_h, subdir: cairomm_pcname / 'cairomm')
++install_headers(cairomm_public_h, subdir: 'cairomm')
+ 
+ # Make sure we are exporting the symbols from the DLL
+ cairomm_cpp_args = ['-DCAIROMM_BUILD=1']
+diff --git a/data/cairomm.pc.in b/data/cairomm.pc.in
+index b6d19a2..59a03f0 100644
+--- a/data/cairomm.pc.in
++++ b/data/cairomm.pc.in
+@@ -16,4 +16,4 @@ Version: @PACKAGE_VERSION@
+ URL: http://www.cairographics.org/cairomm/
+ Requires: @CAIROMM_MODULES@
+ Libs: -L${libdir} -lcairomm@MSVC_TOOLSET_VER@-@CAIROMM_API_VERSION@ @CAIROMM_EXTRA_LIBS@
+-Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include
++Cflags: -I${includedir}

ports/cairomm/portfile.cmake

@@ -5,9 +5,11 @@ vcpkg_download_distfile(ARCHIVE
     SHA512 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62
 )
 
-vcpkg_extract_source_archive_ex(
+vcpkg_extract_source_archive(
-    OUT_SOURCE_PATH SOURCE_PATH
+    SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
+    PATCHES
+        fix_include_path.patch
 )
 
 vcpkg_configure_meson(
@@ -26,8 +28,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cairommconfig.h" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
-    if (NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
-    endif()
 endif()

ports/cairomm/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "cairomm",
   "version": "1.16.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C++ wrapper for the cairo graphics library",
   "homepage": "https://www.cairographics.org",
   "license": "LGPL-2.0-only",

versions/baseline.json

@@ -1314,7 +1314,7 @@
     },
     "cairomm": {
       "baseline": "1.16.2",
-      "port-version": 1
+      "port-version": 2
     },
     "calceph": {
       "baseline": "3.5.1",

versions/c-/cairomm.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9e3f77f8b4d02d2a5bd898b0ca96031da57aae12",
+      "version": "1.16.2",
+      "port-version": 2
+    },
     {
       "git-tree": "09ffff4bc160350ef161188b000610cbe9cfff8e",
       "version": "1.16.2",