[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, 165 deletions

diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL
deleted file mode 100644
index 9fe1d1b2c..000000000
--- a/ports/glibmm/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: glibmm
-Version: 2.52.1
-Port-Version: 14
-Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
-Homepage: https://www.gtkmm.org.
-Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
-Supports: !uwp
diff --git a/ports/glibmm/fix-define-glibmmconfig.patch b/ports/glibmm/fix-define-glibmmconfig.patch
deleted file mode 100644
index 90b97d907..000000000
--- a/ports/glibmm/fix-define-glibmmconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/MSVC_Net2013/glibmm/glibmmconfig.h b/MSVC_Net2013/glibmm/glibmmconfig.h
-index 61bb83e..7dbe809 100644
---- a/MSVC_Net2013/glibmm/glibmmconfig.h
-+++ b/MSVC_Net2013/glibmm/glibmmconfig.h
-@@ -7,12 +7,17 @@
- # if defined(_MSC_VER)
- #  define GLIBMM_MSC 1
- #  define GLIBMM_WIN32 1
--#  define GLIBMM_DLL 1
-+#  if !defined(GLIBMM_STATIC_LIB)
-+#    define GLIBMM_DLL 1
-+#  endif
- # elif defined(__CYGWIN__)
- #  define GLIBMM_CONFIGURE 1
- # elif defined(__MINGW32__)
- #  define GLIBMM_WIN32 1
- #  define GLIBMM_CONFIGURE 1
-+#  if !defined(GLIBMM_STATIC_LIB)
-+#    define GLIBMM_DLL 1
-+#  endif
- # else
-    /* AIX clR compiler complains about this even though it doesn't get this far */
- #  error "Unknown architecture (send me gcc --dumpspecs or equiv)"
-@@ -108,6 +113,7 @@
- # define GLIBMM_HAVE_WIDE_STREAM 1
- # define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
- # define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1
-+# define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS 1
- # define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
- # define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1
- # define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1
-@@ -140,11 +146,6 @@
-  * it to be defined.  Remove after grace period. */
- #define GLIBMM_USING_STD(Symbol)
- 
--/* Enable DLL-specific stuff only when not building a static library */
--#if !defined(__CYGWIN__) && defined(__MINGW32__) && !defined(GLIBMM_STATIC_LIB)
--# define GLIBMM_DLL 1
--#endif
--
- #ifdef GLIBMM_DLL
- # if defined(GLIBMM_BUILD) && defined(_WINDLL)
-    /* Do not dllexport as it is handled by gendef on MSVC */
diff --git a/ports/glibmm/fix-thread.h.patch b/ports/glibmm/fix-thread.h.patch
deleted file mode 100644
index 8e7c01b6b..000000000
--- a/ports/glibmm/fix-thread.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h

-index 5350a99..cc48c01 100644

---- a/glib/glibmm/threads.h

-+++ b/glib/glibmm/threads.h

-@@ -657,7 +657,7 @@ public:

-    */

-   inline void replace(T* data);

- 

--  GPrivate* gobj() { return gobject_; }

-+  GPrivate* gobj() { return &gobject_; }

- 

- private:

-   GPrivate gobject_;

diff --git a/ports/glibmm/glibmm-api-variant.patch b/ports/glibmm/glibmm-api-variant.patch
deleted file mode 100644
index bb00ac3f5..000000000
--- a/ports/glibmm/glibmm-api-variant.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/glib/glibmm/varianttype.h b/glib/glibmm/varianttype.h

-index a232e70..64eb4a1 100644

---- a/glib/glibmm/varianttype.h

-+++ b/glib/glibmm/varianttype.h

-@@ -500,54 +500,79 @@ public:

- 

- };

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_BOOL;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_BYTE;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_INT16;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_UINT16;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_INT32;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_UINT32;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_INT64;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_UINT64;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_DOUBLE;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_STRING;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_OBJECT_PATH;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_SIGNATURE;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_VARIANT;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_HANDLE;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_UNIT;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_ANY;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_BASIC;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_MAYBE;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_ARRAY;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_TUPLE;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_DICT_ENTRY;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_DICTIONARY;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_STRING_ARRAY;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_BYTESTRING;

- 

-+GLIBMM_API

- extern const VariantType VARIANT_TYPE_BYTESTRING_ARRAY;

- 

- 

diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake
index c3bf9c9db..5e0dd3543 100644
--- a/ports/glibmm/portfile.cmake
+++ b/ports/glibmm/portfile.cmake
@@ -2,33 +2,23 @@
 vcpkg_fail_port_install(ON_TARGET "UWP")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
-    FILENAME "glibmm-2.52.1.tar.xz"
-    SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.0.tar.xz"
+    FILENAME "glibmm-2.68.0.tar.xz"
+    SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    PATCHES
-        glibmm-api-variant.patch
-        fix-define-glibmmconfig.patch
-        fix-thread.h.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
+vcpkg_configure_meson(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DWARNINGS_HEADER=${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h
-    OPTIONS_DEBUG
-        -DDISABLE_INSTALL_HEADERS=ON
+    OPTIONS 
+        -Dbuild-examples=false
+        -Dmsvc14x-parallel-installable=false
 )
-
-vcpkg_install_cmake()
-
+vcpkg_install_meson()
 vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json
new file mode 100644
index 000000000..ddd4b7ef6
--- /dev/null
+++ b/ports/glibmm/vcpkg.json
@@ -0,0 +1,16 @@
+{
+  "name": "glibmm",
+  "version": "2.68.0",
+  "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
+  "homepage": "https://www.gtkmm.org.",
+  "supports": "!uwp",
+  "dependencies": [
+    "gettext",
+    "glib",
+    "libffi",
+    "libiconv",
+    "libsigcpp-3",
+    "pcre",
+    "zlib"
+  ]
+}