[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>

7 files changed, 62 insertions, 475 deletions

diff --git a/ports/pango/0001-fix-static-symbols-export.diff b/ports/pango/0001-fix-static-symbols-export.diff
deleted file mode 100644
index a7ab60901..000000000
--- a/ports/pango/0001-fix-static-symbols-export.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/config.h.win32 b/config.h.win32
-index 31b330f..e5ed86c 100644
---- a/config.h.win32
-+++ b/config.h.win32
-@@ -147,7 +147,11 @@
- 
- /* defines how to decorate public symbols while building */
- #ifdef _MSC_VER
-+#ifdef PANGO_EXPORTS
- #define _PANGO_EXTERN __declspec(dllexport) extern
- #else
-+#define _PANGO_EXTERN extern
-+#endif
-+#else
- #define _PANGO_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern
- #endif
diff --git a/ports/pango/0002-remove-hb-glib.diff b/ports/pango/0002-remove-hb-glib.diff
deleted file mode 100644
index 10234ae86..000000000
--- a/ports/pango/0002-remove-hb-glib.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/pango/pango-ot-buffer.c b/pango/pango-ot-buffer.c
-index 142b2f17..334df746 100644
---- a/pango/pango-ot-buffer.c
-+++ b/pango/pango-ot-buffer.c
-@@ -40,7 +40,6 @@ pango_ot_buffer_new (PangoFcFont *font)
-   PangoOTBuffer *buffer = g_slice_new (PangoOTBuffer);
- 
-   buffer->buffer = hb_buffer_create ();
--  hb_buffer_set_unicode_funcs (buffer->buffer, hb_glib_get_unicode_funcs ());
- 
-   return buffer;
- }
-diff --git a/pango/pango-ot-private.h b/pango/pango-ot-private.h
-index 0d803ec1..d9d86644 100644
---- a/pango/pango-ot-private.h
-+++ b/pango/pango-ot-private.h
-@@ -22,12 +22,12 @@
- #ifndef __PANGO_OT_PRIVATE_H__
- #define __PANGO_OT_PRIVATE_H__
- 
-+#include <glib.h>
- #include <glib-object.h>
- 
- #include <pango/pango-ot.h>
- #include <hb-ot.h>
- #include <hb-ft.h>
--#include <hb-glib.h>
- 
- #include "pangofc-private.h"
- 
-diff --git a/pango/pango-ot-tag.c b/pango/pango-ot-tag.c
-index 610b59d7..3bf4eccd 100644
---- a/pango/pango-ot-tag.c
-+++ b/pango/pango-ot-tag.c
-@@ -47,7 +47,8 @@ PangoOTTag
- pango_ot_tag_from_script (PangoScript script)
- {
-   hb_tag_t tag1, tag2;
--  hb_ot_tags_from_script (hb_glib_script_to_script (script), &tag1, &tag2);
-+  hb_ot_tags_from_script ((hb_script_t) g_unicode_script_to_iso15924 ((GUnicodeScript) script), 
-+                          &tag1, &tag2);
-   return (PangoOTTag) tag1;
- }
- 
-@@ -75,7 +76,7 @@ pango_ot_tag_from_script (PangoScript script)
- PangoScript
- pango_ot_tag_to_script (PangoOTTag script_tag)
- {
--  return (PangoScript) hb_glib_script_from_script (hb_ot_tag_to_script ((hb_tag_t) script_tag));
-+  return (PangoScript) g_unicode_script_from_iso15924 (hb_ot_tag_to_script ((hb_tag_t) script_tag));
- }
- 
- 
-diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
-index 60f829f3..4cb0ae04 100644
---- a/pango/pangofc-shape.c
-+++ b/pango/pangofc-shape.c
-@@ -28,7 +28,7 @@
- 
- #include "pangofc-private.h"
- #include <hb-ft.h>
--#include <hb-glib.h>
-+#include <glib.h>
- 
- /* cache a single hb_buffer_t */
- static hb_buffer_t *cached_buffer = NULL; /* MT-safe */
-@@ -362,7 +362,7 @@ _pango_fc_shape (PangoFont           *font,
-   /* setup buffer */
- 
-   hb_buffer_set_direction (hb_buffer, hb_direction);
--  hb_buffer_set_script (hb_buffer, hb_glib_script_to_script (analysis->script));
-+  hb_buffer_set_script (hb_buffer, (hb_script_t) g_unicode_script_to_iso15924 (analysis->script));
-   hb_buffer_set_language (hb_buffer, hb_language_from_string (pango_language_to_string (analysis->language), -1));
- #if HB_VERSION_ATLEAST(1,0,3)
-   hb_buffer_set_cluster_level (hb_buffer, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt
deleted file mode 100644
index 127b92319..000000000
--- a/ports/pango/CMakeLists.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(pango C)
-
-set(PANGO_LIB_SUFFIX 1.0)
-set(PANGO_DLL_SUFFIX 1)
-set(GLIB_LIB_VERSION 2.0)
-
-if(WIN32)
-  configure_file(./config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY)
-else()
-  configure_file(./config.h.unix ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY)
-endif()
-
-if (WIN32)
-  # Set utf-8 charset to avoid compile error C2001
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
-endif()
-
-add_definitions(-DHAVE_CONFIG_H)
-include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR})
-
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-# find libintl
-find_path(LIBINTL_INCLUDE_DIR libintl.h)
-find_library(LIBINTL_LIBRARY NAMES libintl intl)
-endif()
-
-# find glib
-find_path(GLIB_INCLUDE_DIR glib.h)
-find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_VERSION})
-find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_VERSION})
-find_library(GLIB_GMODULE_LIBRARY gmodule-${GLIB_LIB_VERSION})
-set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GOBJECT_LIBRARY} ${GLIB_GMODULE_LIBRARY})
-
-# find cairo
-find_path(CAIRO_INCLUDE_DIR cairo.h)
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    set(CAIRO_SUFFIX d)
-endif()
-find_library(CAIRO_LIBRARY 
-    NAMES
-        cairo${CAIRO_SUFFIX}
-        cairo-static${CAIRO_SUFFIX})
-find_library(CAIRO_GOBJECT_LIBRARY cairo-gobject${CAIRO_SUFFIX})
-set(CAIRO_LIBRARIES ${CAIRO_LIBRARY} ${CAIRO_GOBJECT_LIBRARY})
-
-# find fontconfig
-find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h)
-find_library(FONTCONFIG_LIBRARY fontconfig)
-
-# find freetype
-find_package(Freetype REQUIRED)
-
-# find harfbuzz
-find_path(HARFBUZZ_INCLUDE_DIR harfbuzz/hb.h)
-find_library(HARFBUZZ_LIBRARY harfbuzz)
-
-if (APPLE)
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-    link_libraries(${COREFOUNDATION_LIBRARY})
-endif()
-
-set(FONT_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR} ${FONTCONFIG_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR}/harfbuzz)
-set(FONT_LIBRARIES Freetype::Freetype ${FONTCONFIG_LIBRARY} ${HARFBUZZ_LIBRARY})
-
-macro(pango_add_module MODULE_NAME)
-    add_library(${MODULE_NAME} ${ARGN})
-    target_include_directories(${MODULE_NAME} PRIVATE ${GLIB_INCLUDE_DIR} ${LIBINTL_INCLUDE_DIR})
-    target_link_libraries(${MODULE_NAME} ${LIBINTL_LIBRARY} ${GLIB_LIBRARIES})
-    target_compile_definitions(${MODULE_NAME} PRIVATE
-        G_LOG_DOMAIN="Pango" PANGO_ENABLE_BACKEND PANGO_ENABLE_ENGINE 
-        G_DISABLE_SINGLE_INCLUDES SYSCONFDIR="/dummy/etc" LIBDIR="/dummy/lib")
-    target_compile_definitions(${MODULE_NAME} PRIVATE HAVE_CAIRO_FREETYPE=1)
-    set_target_properties(${MODULE_NAME} PROPERTIES
-        DEFINE_SYMBOL PANGO_EXPORTS
-        OUTPUT_NAME ${MODULE_NAME}-${PANGO_DLL_SUFFIX}
-        ARCHIVE_OUTPUT_NAME ${MODULE_NAME}-${PANGO_LIB_SUFFIX})
-    install(TARGETS ${MODULE_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
-endmacro()
-
-pango_add_module(pango
-    pango/break-arabic.c
-    pango/break-indic.c
-    pango/mini-fribidi/fribidi.c
-    pango/mini-fribidi/fribidi_char_type.c
-    pango/mini-fribidi/fribidi_types.c
-    pango/break.c
-    pango/ellipsize.c
-    pango/fonts.c
-    pango/glyphstring.c
-    pango/modules.c
-    pango/pango-attributes.c
-    pango/pango-bidi-type.c
-    pango/pango-color.c
-    pango/pango-context.c
-    pango/pango-coverage.c
-    pango/pango-emoji.c
-    pango/pango-engine.c
-    pango/pango-fontmap.c
-    pango/pango-fontset.c
-    pango/pango-glyph-item.c
-    pango/pango-gravity.c
-    pango/pango-item.c
-    pango/pango-language.c
-    pango/pango-layout.c
-    pango/pango-markup.c
-    pango/pango-matrix.c
-    pango/pango-renderer.c
-    pango/pango-script.c
-    pango/pango-tabs.c
-    pango/pango-utils.c
-    pango/reorder-items.c
-    pango/shape.c
-    pango/pango-enum-types.c)
-
-if(WIN32)
-pango_add_module(pangowin32
-    pango/pangowin32.c
-    pango/pangowin32-fontcache.c
-    pango/pangowin32-fontmap.c
-    pango/pangowin32-shape.c)
-target_link_libraries(pangowin32 usp10 pango gdi32)
-endif()
-
-pango_add_module(pangoft2
-    pango/pangofc-font.c
-    pango/pangofc-fontmap.c
-    pango/pangofc-decoder.c
-    pango/pangofc-shape.c
-    pango/pangoft2.c
-    pango/pangoft2-fontmap.c
-    pango/pangoft2-render.c
-    pango/pango-ot-buffer.c
-    pango/pango-ot-info.c
-    pango/pango-ot-ruleset.c
-    pango/pango-ot-tag.c)
-target_link_libraries(pangoft2 pango ${FONT_LIBRARIES})
-target_include_directories(pangoft2 PRIVATE ${FONT_INCLUDE_DIRS})
-
-list(APPEND PANGO_CAIRO_SOURCES 
-	pango/pangocairo-fcfont.c
-    pango/pangocairo-fcfontmap.c
-    pango/pangocairo-context.c
-    pango/pangocairo-font.c
-    pango/pangocairo-fontmap.c
-    pango/pangocairo-render.c)
-	
-if(WIN32)
-	list(APPEND PANGO_CAIRO_SOURCES 
-		pango/pangocairo-win32font.c
-		pango/pangocairo-win32fontmap.c)
-endif()
-
-pango_add_module(pangocairo ${PANGO_CAIRO_SOURCES})
-list(APPEND PANGO_CAIRO_LIBRARIES  ${CAIRO_LIBRARIES} pango pangoft2 ${FONT_LIBRARIES})
-if (WIN32)
-    list(APPEND PANGO_CAIRO_LIBRARIES pangowin32)
-endif()
-target_link_libraries(pangocairo ${PANGO_CAIRO_LIBRARIES}) 
-target_include_directories(pangocairo PRIVATE ${CAIRO_INCLUDE_DIR} ${FONT_INCLUDE_DIRS})
-
-
-if(NOT PANGO_SKIP_HEADERS)
-    install(FILES
-        pango/pango.h 
-        pango/pango-attributes.h 
-        pango/pango-bidi-type.h 
-        pango/pango-break.h 
-        pango/pango-context.h 
-        pango/pango-coverage.h 
-        pango/pango-engine.h 
-        pango/pango-font.h 
-        pango/pango-fontmap.h 
-        pango/pango-fontset.h 
-        pango/pango-glyph.h 
-        pango/pango-glyph-item.h 
-        pango/pango-gravity.h 
-        pango/pango-item.h 
-        pango/pango-language.h 
-        pango/pango-layout.h 
-        pango/pango-matrix.h 
-        pango/pango-modules.h 
-        pango/pango-renderer.h 
-        pango/pango-script.h 
-        pango/pango-tabs.h 
-        pango/pango-types.h 
-        pango/pango-utils.h 
-        pango/pango-version-macros.h 
-        pango/pangocairo.h 
-        pango/pangowin32.h 
-        pango/pango-features.h 
-        pango/pango-enum-types.h
-        pango/pangofc-decoder.h 
-        pango/pangofc-font.h 
-        pango/pangofc-fontmap.h 
-        pango/pango-ot.h 
-        pango/pangoft2.h 
-        DESTINATION include/pango)
-endif()
-
-message(STATUS "Link-time dependencies:")
-message(STATUS "  " ${LIBINTL_LIBRARY})
-foreach(GL ${GLIB_LIBRARIES})
-    message(STATUS "  " ${GL})
-endforeach()
-foreach(CL ${CAIRO_LIBRARIES})
-    message(STATUS "  " ${CL})
-endforeach()
-foreach(FL ${FONT_LIBRARIES})
-    message(STATUS "  " ${FL})
-endforeach()
diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL
deleted file mode 100644
index 8ab0abd62..000000000
--- a/ports/pango/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: pango
-Version: 1.40.11
-Port-Version: 9
-Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/
-Description: Text and font handling library.
-Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz (!(windows&static)&!osx)
diff --git a/ports/pango/config.h.unix b/ports/pango/config.h.unix
deleted file mode 100644
index 83b2f52fd..000000000
--- a/ports/pango/config.h.unix
+++ /dev/null
@@ -1,153 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Have usable Cairo library and font backend */
-#define HAVE_CAIRO 1 
-
-/* Whether Cairo can use FreeType for fonts */
-#define HAVE_CAIRO_FREETYPE 1 
-
-/* Whether Cairo has PDF support */
-/* #undef HAVE_CAIRO_PDF */
-
-/* Whether Cairo has PNG support */
-/* #undef HAVE_CAIRO_PNG */
-
-/* Whether Cairo has PS support */
-/* #undef HAVE_CAIRO_PS */
-
-/* Whether Cairo can use Quartz for fonts */
-/* #undef HAVE_CAIRO_QUARTZ */
-
-/* Whether Cairo can use the Win32 GDI for fonts */
-/* #undef HAVE_CAIRO_WIN32 */
-
-/* Whether Cairo has Xlib support */
-/* #undef HAVE_CAIRO_XLIB */
-
-/* Whether CoreText is available on the system */
-#ifdef __APPLE_CC__
-    #define HAVE_CORE_TEXT 1
-#else
-    #undef HAVE_CORE_TEXT
-#endif
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `FcWeightFromOpenType' function. */
-/* #undef HAVE_FCWEIGHTFROMOPENTYPE */
-
-/* Define to 1 if you have the `flockfile' function. */
-#define HAVE_FLOCKFILE 1
-
-/* Have FreeType 2 library */
-#define HAVE_FREETYPE 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Whether libthai is available */
-/* #undef HAVE_LIBTHAI */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtok_r' function. */
-#define HAVE_STRTOK_R 1
-
-/* Define to 1 if you have the `sysconf' function. */
-#define HAVE_SYSCONF 1
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Have Xft library */
-/* #undef HAVE_XFT */
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "pango"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=pango"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "pango"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pango 1.40.11"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "pango"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.40.11"
-
-/* PANGO binary age */
-#define PANGO_BINARY_AGE 4011
-
-/* PANGO interface age */
-#define PANGO_INTERFACE_AGE 11
-
-/* PANGO major version */
-#define PANGO_VERSION_MAJOR 1
-
-/* PANGO micro version */
-#define PANGO_VERSION_MICRO 11
-
-/* PANGO minor version */
-#define PANGO_VERSION_MINOR 40
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.40.11"
-
-/* defines how to decorate public symbols while building */
-#define _PANGO_EXTERN __attribute__((visibility("default"))) extern
diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake
index 2127e3c56..ba68c0541 100644
--- a/ports/pango/portfile.cmake
+++ b/ports/pango/portfile.cmake
@@ -1,28 +1,45 @@
-set(PANGO_VERSION 1.40.11)
+set(PANGO_VERSION 1.48.0)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-${PANGO_VERSION}.tar.xz"
+    URLS "http://ftp.gnome.org/pub/GNOME/sources/pango/1.48/pango-${PANGO_VERSION}.tar.xz"
     FILENAME "pango-${PANGO_VERSION}.tar.xz"
-    SHA512 e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a)
+    SHA512 4819575a583134083819c1548d86bba71af97fd927f7cac05e3903b6d1c84de0ab1b593eea1e17b974f194e2d81123aa46e3af942eef258ad1bd14c72322342e)
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${PANGO_VERSION}
-    PATCHES 
-        0001-fix-static-symbols-export.diff
-        0002-remove-hb-glib.diff
 )
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.unix DESTINATION ${SOURCE_PATH})
 
-vcpkg_configure_cmake(
+vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG
-        -DPANGO_SKIP_HEADERS=ON
+    OPTIONS
+        -Dintrospection=disabled # Build the GObject introspection data for Pango
+        -Dfontconfig=enabled # Build with FontConfig support.
+        -Dsysprof=disabled # include tracing support for sysprof
+        -Dlibtahi=disabled # Build with libthai support
+        -Dcairo=enabled # Build with cairo support
+        -Dxft=disabled # Build with xft support
+        -Dfreetype=enabled # Build with freetype support
+        -Dgtk_doc=false #Build API reference for Pango using GTK-Doc
+    ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
+                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
+    ADDITIONAL_CROSS_BINARIES  glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
+                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
 )
 
-vcpkg_install_cmake()
+vcpkg_install_meson()
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+vcpkg_copy_tools(TOOL_NAMES pango-view pango-list AUTO_CLEAN)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/pango.pc")
+if(EXISTS "${_file}")
+    vcpkg_replace_string("${_file}" [[-I"${includedir}/pango-1.0"]] [[-I"${includedir}/pango-1.0" -I"${includedir}/harfbuzz"]])
+endif()
+set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/pango.pc")
+if(EXISTS "${_file}")
+    vcpkg_replace_string("${_file}" [[-I"${includedir}/pango-1.0"]] [[-I"${includedir}/pango-1.0" -I"${includedir}/harfbuzz"]])
+endif()
diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json
new file mode 100644
index 000000000..a1c209d65
--- /dev/null
+++ b/ports/pango/vcpkg.json
@@ -0,0 +1,31 @@
+{
+  "name": "pango",
+  "version": "1.48.0",
+  "description": "Text and font handling library.",
+  "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/",
+  "dependencies": [
+    {
+      "name": "cairo",
+      "features": [
+        "gobject"
+      ]
+    },
+    "fontconfig",
+    "freetype",
+    "fribidi",
+    "gettext",
+    "glib",
+    {
+      "name": "glib",
+      "host": true
+    },
+    "harfbuzz",
+    {
+      "name": "harfbuzz",
+      "features": [
+        "coretext"
+      ],
+      "platform": "osx"
+    }
+  ]
+}