[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, 47 insertions, 210 deletions

diff --git a/ports/libgpod/CMakeLists.txt b/ports/libgpod/CMakeLists.txt
deleted file mode 100644
index f74038d71..000000000
--- a/ports/libgpod/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-cmake_minimum_required (VERSION 3.12)

-

-project (libgpod C)

-

-option(WITH_INTERNAL_GCHECKSUM OFF)

-

-find_package(unofficial-sqlite3 CONFIG REQUIRED)

-

-include(SelectLibraryConfigurations)

-find_path(glib_PATH glib.h PATHS include)

-find_library(glib_LIBRARY_RELEASE NAMES glib-2.0 PATHS lib)

-find_library(glib_LIBRARY_DEBUG NAMES glib-2.0 PATHS debug/lib)

-select_library_configurations(glib)

-if (NOT glib_FOUND)

-	message(FATAL_ERROR "glib not found.")

-endif()

-

-find_path(plist_PATH plist++.h PATH_SUFFIXES plist)

-find_library(plist_LIBRARY_RELEASE NAMES plist plist-2.0 libplist libplist-2.0 PATHS lib)

-find_library(plist_LIBRARY_DEBUG NAMES plist plist-2.0 libplist libplist-2.0 PATHS debug/lib)

-select_library_configurations(plist)

-if (NOT plist_FOUND)

-	message(FATAL_ERROR "plist not found.")

-endif()

-message("plist_PATH: ${plist_PATH}")

-

-list(APPEND libgpod_Sources

-	${CMAKE_CURRENT_SOURCE_DIR}/src/db-artwork-debug.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/db-artwork-parser.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/db-artwork-writer.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/db-image-parser.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/db-parse-context.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/gchecksum.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_artwork.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_chapterdata.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_device.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_hash58.c 

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_hash72.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_hashAB.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_iphone.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_itunesdb.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_photoalbum.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_playlist.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_plist.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_sqlite.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_sysinfo_extended_parser.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_thumb.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_track.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_tzinfo.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/itdb_zlib.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/ithumb-writer.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/pixmaps.c

-	${CMAKE_CURRENT_SOURCE_DIR}/src/rijndael.c

-)

-

-if (NOT WITH_INTERNAL_GCHECKSUM)

-	list(REMOVE_ITEM libgpod_Sources ${CMAKE_CURRENT_SOURCE_DIR}/src/gchecksum.c)

-endif()

-

-add_library(libgpod ${libgpod_Sources})

-

-target_include_directories(libgpod PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${glib_PATH} ${plist_PATH})

-

-if (WITH_INTERNAL_GCHECKSUM)

-	target_compile_definitions(libgpod PRIVATE -DWITH_INTERNAL_GCHECKSUM)

-endif()

-target_compile_definitions(libgpod PRIVATE -DLIBGPOD_BLOB_DIR=\"${LIBGPOD_BLOB_DIR}\" -DGETTEXT_PACKAGE="libgpod")

-

-target_link_libraries(libgpod PRIVATE ${glib_LIBRARY} ${plist_LIBRARY} unofficial::sqlite3::sqlite3)

-

-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/itdb.h DESTINATION include/libgpod/gpod)

-

-install(

-  TARGETS libgpod

-  RUNTIME DESTINATION bin

-  LIBRARY DESTINATION lib

-  ARCHIVE DESTINATION lib

-)
\ No newline at end of file
diff --git a/ports/libgpod/CONTROL b/ports/libgpod/CONTROL
deleted file mode 100644
index f681cdf35..000000000
--- a/ports/libgpod/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: libgpod

-Version: 2019-08-29

-Port-Version: 2

-Homepage: https://github.com/fadingred/libgpod

-Description: libgpod is a library meant to abstract access to an iPod content.

-Build-Depends: glib, libplist, sqlite3
\ No newline at end of file
diff --git a/ports/libgpod/configure.ac.patch b/ports/libgpod/configure.ac.patch
new file mode 100644
index 000000000..53ca42c2d
--- /dev/null
+++ b/ports/libgpod/configure.ac.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index a52ac3a78..ac5cf03f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,7 @@ AC_CHECK_FUNCS([localtime_r])
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
+ dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed 
+ dnl by libgpod sqlite code
+-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gobject-2.0 sqlite3 libplist >= 1.0)
++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gmodule-2.0 gobject-2.0 sqlite3 libplist >= 1.0)
+ 
+ dnl **************************************************
+ dnl we've copied gchecksum from glib 2.16. Only use the
diff --git a/ports/libgpod/fix-glibconfigpath.patch b/ports/libgpod/fix-glibconfigpath.patch
deleted file mode 100644
index 1a60eb1aa..000000000
--- a/ports/libgpod/fix-glibconfigpath.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/src/db-artwork-writer.c b/src/db-artwork-writer.c
-index c19f481..cca786f 100644
---- a/src/db-artwork-writer.c
-+++ b/src/db-artwork-writer.c
-@@ -22,7 +22,7 @@
-  *
-  */
- 
--#include <config.h>
-+#include <glib/config.h>
- #include "itdb.h"
- #include "itdb_device.h"
- #include "itdb_private.h"
-diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c
-index 2328840..a7cdec4 100644
---- a/src/itdb_artwork.c
-+++ b/src/itdb_artwork.c
-@@ -26,7 +26,7 @@
- |  $Id$
- */
- 
--#include <config.h>
-+#include <glib/config.h>
- 
- #include "itdb_device.h"
- #include "itdb_private.h"
-diff --git a/src/itdb_chapterdata.c b/src/itdb_chapterdata.c
-index 469e8b5..cb53077 100644
---- a/src/itdb_chapterdata.c
-+++ b/src/itdb_chapterdata.c
-@@ -27,7 +27,7 @@
- |  $Id: itdb_chapterdata.c 1612 2007-06-29 16:02:00Z jcsjcs $
- */
- 
--#include <config.h>
-+#include <glib/config.h>
- 
- #include "itdb_device.h"
- #include <stdio.h>
-diff --git a/src/itdb_device.c b/src/itdb_device.c
-index 34b89fe..d776a64 100644
---- a/src/itdb_device.c
-+++ b/src/itdb_device.c
-@@ -29,7 +29,7 @@
- |
- |  $Id$
- */
--#include <config.h>
-+#include <glib/config.h>
- 
- #include "db-itunes-parser.h"
- #include "itdb_device.h"
-diff --git a/src/itdb_photoalbum.c b/src/itdb_photoalbum.c
-index a2c8c29..562cbb7 100644
---- a/src/itdb_photoalbum.c
-+++ b/src/itdb_photoalbum.c
-@@ -26,7 +26,7 @@
- |
- |  $Id$
- */
--#include <config.h>
-+#include <glib/config.h>
- 
- #include "itdb_private.h"
- #include "itdb_device.h"
-diff --git a/src/itdb_track.c b/src/itdb_track.c
-index 52a9fd4..d8a2ff3 100644
---- a/src/itdb_track.c
-+++ b/src/itdb_track.c
-@@ -26,7 +26,7 @@
- |  $Id$
- */
- 
--#include <config.h>
-+#include <glib/config.h>
- 
- #include "itdb_private.h"
- #include "itdb_device.h"
-diff --git a/src/itdb_tzinfo.c b/src/itdb_tzinfo.c
-index ded4dd2..594e312 100644
---- a/src/itdb_tzinfo.c
-+++ b/src/itdb_tzinfo.c
-@@ -27,7 +27,7 @@
- |
- |  $Id$
- */
--#include <config.h>
-+#include <glib/config.h>
- 
- #include "itdb.h"
- #include "itdb_device.h"
-diff --git a/src/itdb_zlib.c b/src/itdb_zlib.c
-index f6fa29b..43ec5e3 100644
---- a/src/itdb_zlib.c
-+++ b/src/itdb_zlib.c
-@@ -25,7 +25,7 @@
- |
- |  $Id$
- */
--#include <config.h>
-+#include <glib/config.h>
- #include <string.h>
- #include <zlib.h>
- 
-diff --git a/src/ithumb-writer.c b/src/ithumb-writer.c
-index 6b47aa6..e1c26e7 100644
---- a/src/ithumb-writer.c
-+++ b/src/ithumb-writer.c
-@@ -25,7 +25,7 @@
-  *  $Id$
-  */
- 
--#include <config.h>
-+#include <glib/config.h>
- #include "itdb.h"
- #include "db-image-parser.h"
- 
diff --git a/ports/libgpod/portfile.cmake b/ports/libgpod/portfile.cmake
index 2bcf7fc37..397f0e5d1 100644
--- a/ports/libgpod/portfile.cmake
+++ b/ports/libgpod/portfile.cmake
@@ -6,19 +6,32 @@ vcpkg_from_github(
     REF 4a8a33ef4bc58eee1baca6793618365f75a5c3fa

     SHA512 b7a120c1106c1205e8de2808de5ac4ff1cf189943017939a5ea4eded4e1ceef44557587e69a8591cc5249f8c8dbf0cbdcce1dd309d33a0e9207b0560abe3ae39

     HEAD_REF master

-    PATCHES fix-glibconfigpath.patch

+    PATCHES configure.ac.patch

 )

 

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

-

-vcpkg_configure_cmake(

+vcpkg_execute_required_process(

+    COMMAND intltoolize --force --copy --automake

+    WORKING_DIRECTORY "${SOURCE_PATH}"

+    LOGNAME intltoolize-${TARGET_TRIPLET}

+)

+vcpkg_execute_required_process(

+    COMMAND gtkdocize --copy

+    WORKING_DIRECTORY "${SOURCE_PATH}"

+    LOGNAME gtkdocize-${TARGET_TRIPLET}

+)

+vcpkg_configure_make(

     SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-	OPTIONS ${FEATURE_OPTIONS}

-		-DLIBGPOD_BLOB_DIR=${CURRENT_PACKAGES_DIR}/tools

+    AUTOCONFIG

+    OPTIONS

+        --without-hal

+        --disable-gdk-pixbuf

+        --disable-pygobject

+        --disable-more-warnings

+        --disable-libxml

+        --disable-gtk-doc-html

 )

-

-vcpkg_install_cmake()

+vcpkg_install_make()

+vcpkg_fixup_pkgconfig()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 

diff --git a/ports/libgpod/vcpkg.json b/ports/libgpod/vcpkg.json
new file mode 100644
index 000000000..3915e50b1
--- /dev/null
+++ b/ports/libgpod/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "libgpod",
+  "version-date": "2019-08-29",
+  "port-version": 3,
+  "description": "libgpod is a library meant to abstract access to an iPod content.",
+  "homepage": "https://github.com/fadingred/libgpod",
+  "dependencies": [
+    "glib",
+    "libplist",
+    "sqlite3"
+  ]
+}