From 3c68c5c0cd8ff932a60759fb597445e01fb8e37c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 18 Nov 2020 22:48:50 +0100 Subject: [PATCH 001/182] update glib to meson --- ports/glib/CONTROL | 4 +- ports/glib/portfile.cmake | 215 ++++++++++++++++++++++++++++++---- ports/glib/remove_tests.patch | 34 ++++++ 3 files changed, 225 insertions(+), 28 deletions(-) create mode 100644 ports/glib/remove_tests.patch diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 8d74d5613b3244..f1fe4061080377 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -3,8 +3,8 @@ Version: 2.52.3 Port-Version: 23 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. -Build-Depends: zlib, pcre, libffi, gettext, libiconv -Supports: !uwp +Build-Depends: zlib, pcre, libffi, gettext, libiconv, dirent +Supports: !uwp|!(windows&static) Feature: selinux Description: Build with selinux support. \ No newline at end of file diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index dac83ab904c4f5..9747344a2aad8c 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -6,54 +6,217 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() -set(GLIB_VERSION 2.52.3) +set(GLIB_VERSION 2.65.2) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.65/glib-${GLIB_VERSION}.tar.xz" FILENAME "glib-${GLIB_VERSION}.tar.xz" - SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017) + SHA512 9a2ebd226b2d0bcd7fbfeeff7a0dd48f7a604636a19672dae5c0547dd8abe5f2bf3bd505e48797095f740775bac5e8eeb1230e754b9d03171d7d04c2363432fc) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${GLIB_VERSION} PATCHES - use-libiconv-on-windows.patch - arm64-defines.patch - fix-arm-builds.patch + remove_tests.patch + #use-libiconv-on-windows.patch + #arm64-defines.patch + #fix-arm-builds.patch ) -configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}) -file(REMOVE_RECURSE ${SOURCE_PATH}/glib/pcre) -file(WRITE ${SOURCE_PATH}/glib/pcre/Makefile.in) -file(REMOVE ${SOURCE_PATH}/glib/win_iconv.c) if (selinux IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") + list(APPEND OPTIONS -Dselinux=enabled) +else() + list(APPEND OPTIONS -Dselinux=disabled) endif() -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - selinux HAVE_SELINUX -) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -Diconv=external) +else() + #list(APPEND OPTIONS -Diconv=libc) ? +endif() -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - -DGLIB_VERSION=${GLIB_VERSION} - OPTIONS_DEBUG - -DGLIB_SKIP_HEADERS=ON - -DGLIB_SKIP_TOOLS=ON + OPTIONS + -Dbuild_tests=false + ${OPTIONS} + ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-glib TARGET_PATH share/unofficial-glib) +vcpkg_install_meson() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +set(GLIB_TOOLS gdbus + gio + gio-querymodules + glib-compile-resources + glib-compile-schemas + gobject-query + gresource + gsettings + ) +if(NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND GLIB_TOOLS gapplication glib-gettextize gtester) +endif() +set(GLIB_SCRIPTS gdbus-codegen glib-genmarshal glib-mkenums gtester-report) -vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64|arm64") + list(APPEND GLIB_TOOLS gspawn-win64-helper${VCPKG_EXECUTABLE_SUFFIX} + gspawn-win64-helper-console${VCPKG_EXECUTABLE_SUFFIX}) +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND GLIB_TOOLS gspawn-win32-helper${VCPKG_EXECUTABLE_SUFFIX} + gspawn-win32-helper-console${VCPKG_EXECUTABLE_SUFFIX}) +endif() +vcpkg_copy_tools(TOOL_NAMES ${GLIB_TOOLS} AUTO_CLEAN) +foreach(script IN LISTS GLIB_SCRIPTS) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${script}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + +IF(VCPKG_TARGET_IS_WINDOWS) + set(SYSTEM_LIBRARIES dnsapi iphlpapi winmm lshlwapi) +else() + set(SYSTEM_LIBRARIES resolv mount blkid selinux) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") +endif() +vcpkg_fixup_pkgconfig(NOT_STATIC_PKGCONFIG SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES} IGNORE_FLAGS "-Wl,--export-dynamic") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + + + +# option('runtime_libdir', + # type : 'string', + # value : '', + # description : 'install runtime libraries relative to libdir') + +# option('iconv', + # type : 'combo', + # choices : ['auto', 'libc', 'external'], + # value : 'auto', + # description : 'iconv implementation to use (\'libc\' = \'Part of the C library\'; \'external\' = \'External libiconv\'; \'auto\' = \'Auto-detect which iconv is available\')') + +# option('charsetalias_dir', + # type : 'string', + # value : '', + # description : 'directory for charset.alias dir (default to \'libdir\' if unset)') + +# option('gio_module_dir', + # type : 'string', + # value : '', + # description : 'load gio modules from this directory (default to \'libdir/gio/modules\' if unset)') + +# option('selinux', + # type : 'feature', + # value : 'auto', + # description : 'build with selinux support') + +# option('xattr', + # type : 'boolean', + # value : true, + # description : 'build with xattr support') + +# option('libmount', + # type : 'feature', + # value : 'auto', + # description : 'build with libmount support') + +# option('internal_pcre', + # type : 'boolean', + # value : false, + # description : 'whether to use internal PCRE') + +# option('man', + # type : 'boolean', + # value : false, + # description : 'generate man pages (requires xsltproc)') + +# option('dtrace', + # type : 'boolean', + # value : false, + # description : 'include tracing support for dtrace') + +# option('systemtap', + # type : 'boolean', + # value : false, + # description : 'include tracing support for systemtap') + +# option('tapset_install_dir', + # type : 'string', + # value : '', + # description : 'path where systemtap tapsets are installed') + +# option('sysprof', + # type : 'feature', + # value : 'disabled', + # description : 'include tracing support for sysprof') + +# option('gtk_doc', + # type : 'boolean', + # value : false, + # description : 'use gtk-doc to build documentation') + +# option('bsymbolic_functions', + # type : 'boolean', + # value : true, + # description : 'link with -Bsymbolic-functions if supported') + +# option('force_posix_threads', + # type : 'boolean', + # value : false, + # description : 'Also use posix threads in case the platform defaults to another implementation (on Windows for example)') + +# option('fam', + # type : 'boolean', + # value : false, + # description : 'Use fam for file system monitoring') + +# option('installed_tests', + # type : 'boolean', + # value : false, + # description : 'enable installed tests') + +# option('nls', + # type : 'feature', + # value : 'auto', + # yield: true, + # description : 'Enable native language support (translations)') + +# option('oss_fuzz', + # type : 'feature', + # value : 'disabled', + # description : 'Indicate oss-fuzz build environment') + +# option('glib_assert', + # type : 'boolean', + # value : true, + # yield : true, + # description : 'Enable GLib assertion (see docs/macros.txt)') + +# option('glib_checks', + # type : 'boolean', + # value : true, + # yield : true, + # description : 'Enable GLib checks such as API guards (see docs/macros.txt)') + diff --git a/ports/glib/remove_tests.patch b/ports/glib/remove_tests.patch new file mode 100644 index 00000000000000..a0a66532dcf862 --- /dev/null +++ b/ports/glib/remove_tests.patch @@ -0,0 +1,34 @@ +diff --git a/gio/meson.build b/gio/meson.build +index 40a9ca6d0..538652e61 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -1002,9 +1002,9 @@ if enable_systemtap + endif + + subdir('fam') +-if build_tests +- subdir('tests') +-endif ++#if build_tests ++# subdir('tests') ++#endif + + # The following is an example for building internal marshallers that are used + # by GIO. We cannot guarantee glib-genmarshal availability while building GLib +diff --git a/meson.build b/meson.build +index 947a4058c..ad4f5793e 100644 +--- a/meson.build ++++ b/meson.build +@@ -2295,9 +2295,9 @@ subdir('gthread') + subdir('gmodule') + subdir('gio') + subdir('fuzzing') +-if build_tests +- subdir('tests') +-endif ++#if build_tests ++# subdir('tests') ++#endif + + # xgettext is optional (on Windows for instance) + if find_program('xgettext', required : get_option('nls')).found() From a197123d29b76511f9dd55e1a99e85ef792d84dc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 18 Nov 2020 22:49:34 +0100 Subject: [PATCH 002/182] update ci baseline --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9e2161c49a352c..4de9bf33acfdfb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -395,9 +395,6 @@ glew:arm64-windows=fail glew:arm-uwp=fail glfw3:arm-uwp=fail glfw3:x64-uwp=fail -glib:x64-uwp=fail -glib:x64-windows-static=fail -glib:x64-osx=fail gmmlib:arm64-windows=fail gmmlib:arm-uwp=fail gmmlib:x64-osx=fail From a0de825dc2a035d3dd63870f52e46761799cc170 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Nov 2020 15:52:31 +0100 Subject: [PATCH 003/182] update glib to 2.66.3 remove cmakelists --- ports/glib/CMakeLists.txt | 390 -------------------------------------- ports/glib/CONTROL | 4 +- ports/glib/portfile.cmake | 11 +- 3 files changed, 8 insertions(+), 397 deletions(-) delete mode 100644 ports/glib/CMakeLists.txt diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt deleted file mode 100644 index cc24a2f63ae00b..00000000000000 --- a/ports/glib/CMakeLists.txt +++ /dev/null @@ -1,390 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(glib C) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_C_STANDARD 11) - -if(MSVC) - add_compile_options(/utf-8) -endif() -set(GLIB_DLL_SUFFIX 2) -set(GLIB_LIB_SUFFIX 2.0) - -if(CMAKE_BUILD_TYPE STREQUAL Debug) - add_definitions(-DG_ENABLE_DEBUG) -endif() - -if(BUILD_SHARED_LIBS) - add_definitions(-DDLL_EXPORT) -endif() - -set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - -# find dependencies - -# zlib -find_package(ZLIB REQUIRED) -# pcre -find_path(PCRE_INCLUDE_DIR pcre.h) -if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(PCRE_SUFFIX d) -endif() -find_library(PCRE_LIBRARY NAMES pcre${PCRE_SUFFIX} pcre) -# libiconv -find_package(Iconv REQUIRED) -# libffi -find_path(FFI_INCLUDE_DIR ffi.h) -find_library(FFI_LIBRARY NAMES ffi libffi) -get_filename_component(LIB_DIR "${FFI_LIBRARY}" DIRECTORY) -if(APPLE) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - find_library(FOUNDATION_LIBRARY Foundation) - find_library(CORESERVICES_LIBRARY CoreServices) - link_libraries(${CORESERVICES_LIBRARY} ${COREFOUNDATION_LIBRARY} ${FOUNDATION_LIBRARY}) -endif() - -if(WIN32 OR APPLE) - # libintl(gettext) - find_package(Intl REQUIRED) -endif() - -if(WIN32) - set(LIBRESOLV_LIBRARY) -else() - find_library(LIBRESOLV_LIBRARY NAMES resolv libresolv) -endif() - -#prepare config files -if(WIN32) - configure_file(config.h.win32 ${CMAKE_BINARY_DIR}/config/config.h COPYONLY) - configure_file(glib/glibconfig.h.win32 ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h COPYONLY) - configure_file(gmodule/gmoduleconf.h.win32 ${CMAKE_BINARY_DIR}/config/gmodule/gmoduleconf.h COPYONLY) - configure_file(gio/gnetworking.h.win32 ${CMAKE_BINARY_DIR}/config/gio/gnetworking.h COPYONLY) - add_definitions(-DHAVE_CONFIG_H) -else() - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/config) - set(ENV{LIBFFI_LIBS} "${FFI_LIBRARY}") - set(ENV{PCRE_LIBS} "${PCRE_LIBRARY}") - set(ENV{LIBFFI_CFLAGS} "-I${FFI_INCLUDE_DIR}") - set(ENV{PCRE_CFLAGS} "-I${PCRE_INCLUDE_DIR}") - set(ENV{MSGFMT} "/bin/echo") - set(ENV{GMSGFMT} "/bin/echo") - string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_CONFIG) - set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CONFIG}} -I${PCRE_INCLUDE_DIR}") - set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${UPPER_CONFIG}} -I${PCRE_INCLUDE_DIR}") - if(BUILD_SHARED_LIBS) - set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${UPPER_CONFIG}} -L${LIB_DIR}") - else() - set(LDFLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_${UPPER_CONFIG}} -L${LIB_DIR}") - endif() - - string(STRIP "${CXXFLAGS}" CXXFLAGS) - string(STRIP "${CFLAGS}" CFLAGS) - string(STRIP "${LDFLAGS}" LDFLAGS) - execute_process( - COMMAND "${CMAKE_SOURCE_DIR}/configure" - --disable-libelf - --disable-libmount - "CPPFLAGS=${CXXFLAGS}" - "CFLAGS=${CFLAGS}" - "LDFLAGS=${LDFLAGS}" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/config - RESULT_VARIABLE res - ) - if(NOT res EQUAL 0) - message(FATAL_ERROR "Configure failed.") - endif() - - if (NOT HAVE_SELINUX) - file(READ "${CMAKE_BINARY_DIR}/config/config.h" CONFIG_H) - string(REPLACE "#define HAVE_SELINUX 1" - "#undef HAVE_SELINUX" CONFIG_H "${CONFIG_H}") - file(WRITE "${CMAKE_BINARY_DIR}/config/config.h" "${CONFIG_H}") - endif() - - add_definitions("-DGIO_MODULE_DIR=\"gio/modules\"") -endif() -install(FILES ${CMAKE_BINARY_DIR}/config/config.h DESTINATION include/glib) -install(FILES ${CMAKE_SOURCE_DIR}/msvc_recommended_pragmas.h DESTINATION include) - -include_directories(${CMAKE_BINARY_DIR}/config ${CMAKE_BINARY_DIR}/config/glib ${CMAKE_BINARY_DIR}/config/gio ${CMAKE_BINARY_DIR}/config/gmodule) -include_directories(. glib) - -# This macro purposely doesn't find nodes with sources that have additional properties set -# Most of such files in glib are PCRE sources which we don't use anyway -macro(extract_vcproj_sources VC_PROJECT OUT_VAR) - file(READ ${VC_PROJECT} ${VC_PROJECT}-CONTENTS) - STRING(REPLACE "\n" ";" ${VC_PROJECT}-CONTENTS "${${VC_PROJECT}-CONTENTS}") # split by lines - foreach(LINE ${${VC_PROJECT}-CONTENTS}) - if(LINE MATCHES "") - string(REPLACE "" "" LINE ${LINE}) - string(STRIP ${LINE} LINE) - file(TO_CMAKE_PATH ${LINE} LINE) - list(APPEND ${OUT_VAR} ${LINE}) - endif() - endforeach() -endmacro() - -# main module -extract_vcproj_sources(win32/vs14/glib.vcxproj GLIB_SOURCES) -list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols -if(NOT WIN32) - list(FILTER GLIB_SOURCES EXCLUDE REGEX "win32.c\$|win32-helper.c\$") - list(APPEND GLIB_SOURCES "glib/gthread-posix.c" "glib/giounix.c" "glib/gspawn.c" "glib/glib-unix.c") -endif() -add_library(glib ${GLIB_SOURCES}) -target_compile_definitions(glib PRIVATE GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR="") -target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} Iconv::Iconv ${Intl_LIBRARIES}) -if(WIN32) - target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE) - target_link_libraries(glib PRIVATE ws2_32 winmm advapi32 ole32 shell32) -else() - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - target_link_libraries(glib PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) -endif() -target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR}) -target_include_directories(glib PUBLIC $ $) -list(APPEND GLIB_TARGETS glib) -if(NOT GLIB_SKIP_HEADERS) - install(FILES glib/glib.h glib/glib-object.h ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include) - - file(GLOB GLIB_HEADERS glib/*.h) - list(FILTER GLIB_HEADERS EXCLUDE REGEX "/glib.h\$|/glib-object.h\$|private.h\$") - install(FILES ${GLIB_HEADERS} DESTINATION include/glib) - - file(GLOB GLIB_DEP_HEADERS glib/deprecated/*.h) - install(FILES ${GLIB_DEP_HEADERS} DESTINATION include/glib/deprecated) -endif() - -# gthread -add_library(gthread gthread/gthread-impl.c) -target_compile_definitions(gthread PRIVATE G_LOG_DOMAIN="GThread") -target_link_libraries(gthread PRIVATE glib ${Intl_LIBRARIES}) -target_include_directories(gthread PRIVATE ${Intl_INCLUDE_DIRS}) -list(APPEND GLIB_TARGETS gthread) - -# gobject -extract_vcproj_sources(win32/vs14/gobject.vcxproj GOBJECT_SOURCES) -add_library(gobject ${GOBJECT_SOURCES}) -target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION G_LOG_DOMAIN="GLib-GObject") -target_link_libraries(gobject PRIVATE gthread glib ${FFI_LIBRARY}) -target_include_directories(gobject PRIVATE ${FFI_INCLUDE_DIR} PUBLIC $) -list(APPEND GLIB_TARGETS gobject) -if(NOT GLIB_SKIP_HEADERS) - file(GLOB GOBJECT_HEADERS gobject/*.h gobject/gobjectnotifyqueue.c) - list(FILTER GOBJECT_HEADERS EXCLUDE REGEX "private.h\$") - install(FILES ${GOBJECT_HEADERS} DESTINATION include/gobject) -endif() - -# gmodule -add_library(gmodule gmodule/gmodule.c) -target_compile_definitions(gmodule PRIVATE G_LOG_DOMAIN="GModule") -target_link_libraries(gmodule PRIVATE glib ${Intl_LIBRARIES}) -target_include_directories(gmodule PUBLIC $) -target_include_directories(gmodule PRIVATE ${Intl_INCLUDE_DIRS} PUBLIC $) -list(APPEND GLIB_TARGETS gmodule) -if(NOT GLIB_SKIP_HEADERS) - install(FILES gmodule/gmodule.h DESTINATION include) -endif() - -# gio subdirs -if(NOT WIN32) - file(GLOB XDGMIME_SOURCES gio/xdgmime/*.c) - add_library(xdgmime ${XDGMIME_SOURCES}) - target_compile_definitions(xdgmime PRIVATE -DXDG_PREFIX=_gio_xdg) - list(APPEND GLIB_TARGETS xdgmime) -endif() - -if(NOT WIN32 AND NOT APPLE) - file(GLOB INOTIFY_SOURCES gio/inotify/*.c) - add_library(inotify ${INOTIFY_SOURCES}) - target_link_libraries(inotify PRIVATE gmodule) - target_compile_definitions(inotify PRIVATE -DG_LOG_DOMAIN=\"GLib-GIO\" -DGIO_COMPILATION -DG_DISABLE_DEPRECATED) - list(APPEND GLIB_TARGETS inotify) -endif() - -if(APPLE) - file(GLOB KQUEUE_SOURCES gio/kqueue/*.c) - add_library(kqueue ${KQUEUE_SOURCES}) - target_link_libraries(kqueue PRIVATE gmodule) - target_compile_definitions(kqueue PRIVATE -DG_LOG_DOMAIN=\"GLib-GIO\" -DGIO_COMPILATION -DG_DISABLE_DEPRECATED) - list(APPEND GLIB_TARGETS kqueue) -endif() - -# gio -extract_vcproj_sources(win32/vs14/gio.vcxproj GIO_SOURCES) -if(NOT WIN32) - file(GLOB GIO_UNIX_SOURCES "gio/gunix*.c" "gio/g*notificationbackend.c" "gio/g*portal*.c") - list(APPEND GIO_SOURCES ${GIO_UNIX_SOURCES}) - list(APPEND GIO_SOURCES - "gio/gcontenttype.c" - "gio/gfiledescriptorbased.c" - "gio/gnetworkmonitornm.c" - "gio/xdp-dbus.c" - ) - list(FILTER GIO_SOURCES EXCLUDE REGEX "/gwin32[^/]+\$|win32/[^/]+\$|win32.c\$|gregistrysettingsbackend.c\$") - if(APPLE) - set_property(SOURCE - gio/gcocoanotificationbackend.c - gio/gosxappinfo.c - gio/gnextstepsettingsbackend.c - PROPERTY COMPILE_FLAGS "-x objective-c") - list(APPEND GIO_SOURCES - "gio/gnextstepsettingsbackend.c" - "gio/gosxappinfo.c" - ) - else() - list(APPEND GIO_SOURCES - "gio/gnetworkmonitornetlink.c" - "gio/gdesktopappinfo.c" - ) - list(FILTER GIO_SOURCES EXCLUDE REGEX "gcocoanotificationbackend.c\$") - endif() -endif() -if(NOT GLIB_SKIP_HEADERS) - file(GLOB GIO_HEADERS gio/*.h) - list(FILTER GIO_HEADERS EXCLUDE REGEX "private.h\$") - install(FILES ${GIO_HEADERS} ${CMAKE_BINARY_DIR}/config/gio/gnetworking.h DESTINATION include/gio) -endif() -add_library(gio ${GIO_SOURCES}) -target_compile_definitions(gio PRIVATE GIO_COMPILATION G_LOG_DOMAIN="GLib-GIO") -target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${Intl_LIBRARIES}) -target_include_directories(gio PUBLIC $ $) -if(WIN32) - target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi advapi32 shell32) -elseif(APPLE) - target_link_libraries(gio PRIVATE xdgmime kqueue) - if (HAVE_SELINUX) - target_link_libraries(gio PRIVATE selinux) - endif() -else() - target_link_libraries(gio PRIVATE xdgmime inotify) - if (HAVE_SELINUX) - target_link_libraries(gio PRIVATE selinux) - endif() -endif() -list(APPEND GLIB_TARGETS gio) - -foreach(GTARGET ${GLIB_TARGETS}) - set_target_properties(${GTARGET} PROPERTIES - OUTPUT_NAME ${GTARGET}-${GLIB_DLL_SUFFIX} - ARCHIVE_OUTPUT_NAME ${GTARGET}-${GLIB_LIB_SUFFIX}) -endforeach() - -macro(add_glib_tool TOOL_NAME) - add_executable(${TOOL_NAME} ${ARGN}) - if(WIN32) - target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES} shell32) - else() - target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES}) - endif() - target_compile_definitions(${TOOL_NAME} PRIVATE GLIB_COMPILATION) - list(APPEND GLIB_TOOLS ${TOOL_NAME}) -endmacro() - -macro(add_gio_tool TOOL_NAME) - add_executable(${TOOL_NAME} ${ARGN}) - target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${Intl_LIBRARIES}) - target_include_directories(${TOOL_NAME} PRIVATE gmodule gio) - target_compile_definitions(${TOOL_NAME} PRIVATE GIO_COMPILATION) - list(APPEND GLIB_TOOLS ${TOOL_NAME}) -endmacro() - -if(NOT GLIB_SKIP_TOOLS) - configure_file(gobject/glib-mkenums.in ${CMAKE_SOURCE_DIR}/gobject/glib-mkenums @ONLY) # uses GLIB_VERSION - install(FILES gobject/glib-mkenums DESTINATION tools/glib) - - configure_file(gio/gdbus-2.0/codegen/gdbus-codegen.in ${CMAKE_SOURCE_DIR}/gio/gdbus-2.0/codegen/gdbus-codegen COPYONLY) - install(FILES gio/gdbus-2.0/codegen/gdbus-codegen DESTINATION tools/glib) - file(GLOB CODEGEN_SOURCES gio/gdbus-2.0/codegen/*.py) - install(FILES ${CODEGEN_SOURCES} DESTINATION tools/glib/codegen) - - add_gio_tool(gdbus gio/gdbus-tool.c) - add_gio_tool(gio-querymodules gio/gio-querymodules.c) - file(GLOB GIO_TOOL_SOURCES gio/gio-tool*.c) - add_gio_tool(gio-tool ${GIO_TOOL_SOURCES}) - set_target_properties(gio-tool PROPERTIES OUTPUT_NAME gio) - add_gio_tool(glib-compile-resources gio/glib-compile-resources.c gio/gvdb/gvdb-builder.c) - add_gio_tool(glib-compile-schemas gio/glib-compile-schemas.c gio/gvdb/gvdb-builder.c) - add_gio_tool(gresource gio/gresource-tool.c) - add_gio_tool(gsettings gio/gsettings-tool.c) - - if(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(WIN win32) - else() - set(WIN win64) - endif() - - add_glib_tool(glib-genmarshal gobject/glib-genmarshal.c) - if(WIN32) - add_glib_tool(gspawn-${WIN}-helper WIN32 glib/gspawn-win32-helper.c) - add_glib_tool(gspawn-${WIN}-helper-console glib/gspawn-win32-helper-console.c) - endif() - - install(TARGETS ${GLIB_TOOLS} RUNTIME DESTINATION tools/glib) -endif() - -install( - TARGETS ${GLIB_TARGETS} - EXPORT glib - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) -install( - EXPORT glib - NAMESPACE unofficial::glib:: - FILE unofficial-glib-targets.cmake - DESTINATION share/unofficial-glib -) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/unofficial-glib-config.in.cmake - ${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-glib-config.cmake - @ONLY -) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-glib-config.cmake - DESTINATION share/unofficial-glib -) - -message(STATUS "Link-time dependencies:") -message(STATUS " " ${ZLIB_LIBRARIES}) -message(STATUS " " ${PCRE_LIBRARY}) -message(STATUS " " ${ICONV_LIBRARY}) -message(STATUS " " ${CHARSET_LIBRARY}) -message(STATUS " " ${FFI_LIBRARY}) -message(STATUS " " ${Intl_LIBRARIES}) - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) - -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glib-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/glib-2.0.pc" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gobject-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gobject-2.0.pc" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gmodule-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gmodule-2.0.pc" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gmodule-export-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gmodule-export-2.0.pc" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gmodule-no-export-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gmodule-no-export-2.0.pc" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gthread-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gthread-2.0.pc" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gio-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gio-2.0.pc" @ONLY) - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glib-2.0.pc" - "${CMAKE_CURRENT_BINARY_DIR}/gobject-2.0.pc" - "${CMAKE_CURRENT_BINARY_DIR}/gmodule-2.0.pc" - "${CMAKE_CURRENT_BINARY_DIR}/gmodule-export-2.0.pc" - "${CMAKE_CURRENT_BINARY_DIR}/gmodule-no-export-2.0.pc" - "${CMAKE_CURRENT_BINARY_DIR}/gthread-2.0.pc" - "${CMAKE_CURRENT_BINARY_DIR}/gio-2.0.pc" - DESTINATION lib/pkgconfig) - -if(WIN32) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gio-windows-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gio-windows-2.0.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gio-windows-2.0.pc" DESTINATION lib/pkgconfig) -endif() - -if(UNIX) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gio-unix-2.0.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gio-unix-2.0.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gio-unix-2.0.pc" DESTINATION lib/pkgconfig) -endif() diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index f1fe4061080377..57c64fa4858c8f 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,6 +1,6 @@ Source: glib -Version: 2.52.3 -Port-Version: 23 +Version: 2.66.3 +Port-Version: 0 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv, dirent diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 9747344a2aad8c..b4016740213bae 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -6,11 +6,12 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() -set(GLIB_VERSION 2.65.2) +set(GLIB_MAJOR_MINOR 2.66) +set(GLIB_PATCH 3) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.65/glib-${GLIB_VERSION}.tar.xz" - FILENAME "glib-${GLIB_VERSION}.tar.xz" - SHA512 9a2ebd226b2d0bcd7fbfeeff7a0dd48f7a604636a19672dae5c0547dd8abe5f2bf3bd505e48797095f740775bac5e8eeb1230e754b9d03171d7d04c2363432fc) + URLS "https://ftp.gnome.org/pub/gnome/sources/glib/${GLIB_MAJOR_MINOR}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" + FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" + SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -42,7 +43,7 @@ vcpkg_configure_meson( OPTIONS -Dbuild_tests=false ${OPTIONS} - + -Dinternal_pcre=false ) vcpkg_install_meson() From 1d263f5aacb19aee2ea5613e662c6a4f435c5fce Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 19 Nov 2020 15:52:47 +0100 Subject: [PATCH 004/182] fix some minor meson issue but meson is still a mess --- scripts/cmake/vcpkg_configure_meson.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 982e3a5e1f1b09..267526cb69ca5c 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -150,6 +150,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso string(APPEND NATIVE_${_config} "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") string(APPEND NATIVE_${_config} "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") + string(APPEND NATIVE_${_config} "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") string(APPEND NATIVE_${_config} "[built-in options]\n") if(VCPKG_TARGET_IS_WINDOWS) @@ -404,7 +405,7 @@ function(vcpkg_configure_meson) vcpkg_find_acquire_program(NINJA) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) - vcpkg_add_to_path("${NINJA_PATH}") + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) From c46c7b1459568290eaac372cf08ce3c35b263846 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 14:49:10 +0100 Subject: [PATCH 005/182] add_bin_to_path to vcpkg_install_meson --- scripts/cmake/vcpkg_install_meson.cmake | 48 ++++++++++++++++++------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 2162029180222c..ad2933595788e7 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -5,9 +5,13 @@ Builds a meson project previously configured with `vcpkg_configure_meson()`. ## Usage ```cmake -vcpkg_install_meson() +vcpkg_install_meson([ADD_BIN_TO_PATH]) ``` +## Parameters: +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + ## Examples * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) @@ -17,6 +21,7 @@ vcpkg_install_meson() function(vcpkg_install_meson) vcpkg_find_acquire_program(NINJA) unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option + cmake_parse_arguments(PARSE_ARGV 0 _im "ADD_BIN_TO_PATH" "" "") if(VCPKG_TARGET_IS_OSX) if(DEFINED ENV{SDKROOT}) @@ -30,19 +35,35 @@ function(vcpkg_install_meson) set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") endif() - message(STATUS "Package ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME package-${TARGET_TRIPLET}-rel - ) + foreach(BUILDTYPE "debug" "release") + if(DEFINED VCPKG_BUILD_TYPE AND NOT VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) + continue() + endif() + + if(BUILDTYPE STREQUAL "debug") + set(SHORT_BUILDTYPE "dbg") + else() + set(SHORT_BUILDTYPE "rel") + endif() - message(STATUS "Package ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME package-${TARGET_TRIPLET}-dbg - ) + message(STATUS "Package ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") + if(_im_ADD_BIN_TO_PATH) + set(_BACKUP_ENV_PATH "$ENV{PATH}") + if(BUILDTYPE STREQUAL "debug") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() + vcpkg_execute_required_process( + COMMAND ${NINJA} install -v + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + LOGNAME package-${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + ) + if(_im_ADD_BIN_TO_PATH) + set(ENV{PATH} "${_BACKUP_ENV_PATH}") + endif() + endforeach() set(RENAMED_LIBS) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -81,4 +102,5 @@ function(vcpkg_install_meson) unset(ENV{MACOSX_DEPLOYMENT_TARGET}) endif() endif() + endfunction() From 0ca265c245f8774b62698c9508de5b043174f204 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 14:59:07 +0100 Subject: [PATCH 006/182] regen docs --- docs/maintainers/vcpkg_install_meson.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/maintainers/vcpkg_install_meson.md b/docs/maintainers/vcpkg_install_meson.md index 5d1ffb398c2658..f4bd04990446f2 100644 --- a/docs/maintainers/vcpkg_install_meson.md +++ b/docs/maintainers/vcpkg_install_meson.md @@ -4,9 +4,13 @@ Builds a meson project previously configured with `vcpkg_configure_meson()`. ## Usage ```cmake -vcpkg_install_meson() +vcpkg_install_meson([ADD_BIN_TO_PATH]) ``` +## Parameters: +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + ## Examples * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) From 3c5b91526377d1560887959685071eac40e44dfb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 15:12:59 +0100 Subject: [PATCH 007/182] try fixing/touching all glib dependent ports --- ports/atk/CMakeLists.txt.in | 2 +- ports/cairo/CMakeLists.txt | 6 ++++-- ports/gdk-pixbuf/CMakeLists.txt | 7 +++++-- ports/harfbuzz/portfile.cmake | 20 ++++++++++---------- ports/lcm/portfile.cmake | 2 +- ports/libcroco/CMakeLists.txt | 8 +++----- ports/librsvg/CMakeLists.txt | 13 ++++--------- ports/tesseract/portfile.cmake | 4 ++-- ports/v8/V8Config-static.cmake | 2 +- 9 files changed, 31 insertions(+), 33 deletions(-) diff --git a/ports/atk/CMakeLists.txt.in b/ports/atk/CMakeLists.txt.in index d8b84882369d99..6f49c67b540703 100644 --- a/ports/atk/CMakeLists.txt.in +++ b/ports/atk/CMakeLists.txt.in @@ -11,7 +11,7 @@ endif() # generate atkmarshal.c and atkmarshal.h source files # glib-genmarshal should be installed along with glib -find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES glib) +find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES tools/glib glib) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/atk) message("Generating atkmarshal.h: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header") diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index a68491fbd8b9c0..df30bf4b4ce0ce 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -239,9 +239,11 @@ if(WITH_GOBJECT) endif() endif() - find_package(unofficial-glib CONFIG REQUIRED) + find_package(PkgConfig REQUIRED) + pkg_check_modules(GLIB2 glib-2.0 gobject-2.0) add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES}) - target_link_libraries(cairo-gobject PRIVATE cairo unofficial::glib::gobject unofficial::glib::glib) + target_include_directories(cairo-gobject PRIVATE ${GLIB2_INCLUDE_DIRS}) + target_link_libraries(cairo-gobject PRIVATE cairo ${GLIB2_LIBRARIES_STATIC}) endif() if(MSVC) diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt index 0ff2a85e2c54ae..176b8d56247b75 100644 --- a/ports/gdk-pixbuf/CMakeLists.txt +++ b/ports/gdk-pixbuf/CMakeLists.txt @@ -62,14 +62,17 @@ if(WIN32) endif() add_library(gdk-pixbuf ${SOURCES}) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2) + target_include_directories(gdk-pixbuf PRIVATE - ${GLIB_INCLUDE_DIR} + ${GLIB2_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${Intl_INCLUDE_DIR}) set(LIBS - unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject ${Intl_LIBRARIES} + ${GLIB2_LIBRARIES_STATIC} ${Intl_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 055adaa1551028..112c6cbff21bfc 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( # This patch is required for propagating the full list of static dependencies from freetype find-package-freetype-2.patch # This patch is required for propagating the full list of dependencies from glib - glib-cmake.patch + #glib-cmake.patch fix_include.patch icu.patch ) @@ -47,16 +47,16 @@ vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() -if ("glib" IN_LIST FEATURES) - # Propagate dependency on glib downstream - file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents) - file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" " -include(CMakeFindDependencyMacro) -find_dependency(unofficial-glib CONFIG) +# if ("glib" IN_LIST FEATURES) + # # Propagate dependency on glib downstream + # file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents) + # file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" " +# include(CMakeFindDependencyMacro) +# find_dependency(unofficial-glib CONFIG) -${_contents} -") -endif() +# ${_contents} +# ") +# endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake index 24ebb21b04a739..4081f92e1f6ed7 100644 --- a/ports/lcm/portfile.cmake +++ b/ports/lcm/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( PATCHES only-install-one-flavor.patch fix-build-error.patch - fix-linux-build.patch + #fix-linux-build.patch ) vcpkg_configure_cmake( diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt index f8e8a71058eb68..b26a8b9a18f9d6 100644 --- a/ports/libcroco/CMakeLists.txt +++ b/ports/libcroco/CMakeLists.txt @@ -3,7 +3,8 @@ project(libcroco C) find_package(Iconv REQUIRED) find_package(Intl REQUIRED) -find_package(unofficial-glib CONFIG REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2) find_package(LibXml2 REQUIRED) if(NOT WIN32) find_package(Threads REQUIRED) @@ -72,10 +73,7 @@ add_library(croco-0.6 ${SOURCES}) target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) target_link_libraries(croco-0.6 PRIVATE - unofficial::glib::gio - unofficial::glib::glib - unofficial::glib::gmodule - unofficial::glib::gobject + ${GLIB2_LIBRARIES_STATIC} ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv ) diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index b3b3ca892e4763..d427d506fc43c1 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -3,7 +3,8 @@ project(librsvg C) find_package(unofficial-cairo CONFIG REQUIRED) find_package(unofficial-libcroco CONFIG REQUIRED) -find_package(unofficial-glib CONFIG REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2) find_package(LibXml2 REQUIRED) if(CMAKE_SYSTEM_NAME MATCHES "Windows") find_library(PANGO_LIB pango-1.0) @@ -110,12 +111,7 @@ target_compile_definitions(pixbufloader-svg PRIVATE -DG_LOG_DOMAIN="libpixbufloader-svg") target_link_libraries(rsvg-2.40 PRIVATE - unofficial::cairo::cairo - unofficial::libcroco::croco-0.6 - unofficial::glib::gio - unofficial::glib::glib - unofficial::glib::gmodule - unofficial::glib::gobject + ${GLIB2_LIBRARIES_STATIC} ${LIBXML2_LIBRARIES} ${PANGO_LIB} ${PANGO_CAIRO_LIB} @@ -125,8 +121,7 @@ target_link_libraries(rsvg-2.40 PRIVATE ) target_link_libraries(pixbufloader-svg PRIVATE rsvg-2.40 - unofficial::glib::glib - unofficial::glib::gobject + ${GLIB2_LIBRARIES_STATIC} ${GDK_PIXBUF_LIB} ) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index d08e319071dd3d..a9619d400503e7 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_from_github( SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 PATCHES fix-tiff-linkage.patch - fix-text2image.patch - fix-training-tools.patch + #fix-text2image.patch + #fix-training-tools.patch ) # The built-in cmake FindICU is better diff --git a/ports/v8/V8Config-static.cmake b/ports/v8/V8Config-static.cmake index 305668216f2b03..d59d3623f9ef5c 100644 --- a/ports/v8/V8Config-static.cmake +++ b/ports/v8/V8Config-static.cmake @@ -4,7 +4,7 @@ find_dependency(ZLIB REQUIRED) if(UNIX) find_package(unofficial-glib CONFIG REQUIRED) set(V8_IMPORTED_LINK_INTERFACE_LIBRARIES - "ICU::in;ICU::uc;ICU::dt;unofficial::glib::gmodule;unofficial::glib::gobject;unofficial::glib::gthread;ZLIB::ZLIB") + "ICU::in;ICU::uc;ICU::dt;ZLIB::ZLIB") elseif(WIN32) set(V8_IMPORTED_LINK_INTERFACE_LIBRARIES "Winmm;DbgHelp;ZLIB::ZLIB;ICU::in;ICU::uc;ICU::dt") From 9a58e709328d9d3fecb2320dc076f3a60f22a47e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 15:40:40 +0100 Subject: [PATCH 008/182] fix libsigcpp-3 version --- ports/libsigcpp-3/portfile.cmake | 1 + ports/libsigcpp-3/version.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/libsigcpp-3/version.patch diff --git a/ports/libsigcpp-3/portfile.cmake b/ports/libsigcpp-3/portfile.cmake index 44cf6c862b2f64..91d869d0ea0d67 100644 --- a/ports/libsigcpp-3/portfile.cmake +++ b/ports/libsigcpp-3/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 6220a3974ee90afb5028a5b60ffcbff353fffbbfcf1570d8db05b6d91604324a73badcb17c73c852d6c5265e2b31e1c2de1b3ea20c0e60ecdb17ce90c9ca40bd HEAD_REF master PATCHES disable_tests_enable_static_build.patch + version.patch ) vcpkg_configure_cmake( diff --git a/ports/libsigcpp-3/version.patch b/ports/libsigcpp-3/version.patch new file mode 100644 index 00000000000000..dd485021edbf48 --- /dev/null +++ b/ports/libsigcpp-3/version.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b06ef121c..9b9520342 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,9 +16,9 @@ + + cmake_minimum_required (VERSION 3.2) + +-set (SIGCXX_MAJOR_VERSION 2) +-set (SIGCXX_MINOR_VERSION 99) +-set (SIGCXX_MICRO_VERSION 1) ++set (SIGCXX_MAJOR_VERSION 3) ++set (SIGCXX_MINOR_VERSION 0) ++set (SIGCXX_MICRO_VERSION 3) + + set (SIGCXX_API_VERSION 3.0) + set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION}) From f71c91ea0eff05c4cc890a0c6683971c04edeed5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 15:43:46 +0100 Subject: [PATCH 009/182] fix glibmm --- ports/glibmm/CONTROL | 6 +++--- ports/glibmm/portfile.cmake | 38 +++++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL index 9fe1d1b2cb3b73..9b2797172f0e30 100644 --- a/ports/glibmm/CONTROL +++ b/ports/glibmm/CONTROL @@ -1,7 +1,7 @@ Source: glibmm -Version: 2.52.1 -Port-Version: 14 +Version: 2.68.0 +Port-Version: 1 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 +Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp-3 Supports: !uwp diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index c3bf9c9db006be..2a63aa963538d9 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -2,33 +2,39 @@ 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 + #glibmm-api-variant.patch + #fix-define-glibmmconfig.patch + #fix-thread.h.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +#file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DWARNINGS_HEADER=${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON -) +#vcpkg_configure_cmake( +# SOURCE_PATH ${SOURCE_PATH} +# PREFER_NINJA +# OPTIONS +# -DWARNINGS_HEADER=${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h +# OPTIONS_DEBUG +# -DDISABLE_INSTALL_HEADERS=ON +#) -vcpkg_install_cmake() +#vcpkg_install_cmake() +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -Dbuild-examples=false + -Dmsvc14x-parallel-installable=false +) +vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() From ce1612af609dde9203412b79b616ed57cd694d4b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 15:55:48 +0100 Subject: [PATCH 010/182] fix gmime --- ports/gmime/CMakeLists.txt | 9 +++++---- ports/gmime/portfile.cmake | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt index cefc0f22672444..dfea8328b39b61 100644 --- a/ports/gmime/CMakeLists.txt +++ b/ports/gmime/CMakeLists.txt @@ -1,12 +1,13 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.19) project(gmime C) set(GMIME_DLL_SUFFIX 3) set(GMIME_LIB_SUFFIX 3.0) -find_package(zlib REQUIRED) -find_package(unofficial-glib CONFIG REQUIRED) +find_package(ZLIB REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) find_package(Iconv REQUIRED) find_library(IDN_LIBRARY NAMES libidn2) @@ -46,7 +47,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES target_include_directories(${PROJECT_NAME} PRIVATE . ./util) target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv ZLIB::ZLIB ${IDN_LIBRARY}) -target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::glib::gobject unofficial::glib::gio unofficial::glib::glib) +target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::GLIB2) target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib) install(TARGETS ${PROJECT_NAME} diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index ac471e875b425e..d1e145a8381afa 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -21,10 +21,12 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) configure_file(${SOURCE_PATH}/build/vs2017/unistd.h ${SOURCE_PATH} COPYONLY) configure_file(${SOURCE_PATH}/build/vs2017/config.h ${SOURCE_PATH} COPYONLY) configure_file(${SOURCE_PATH}/build/vs2017/gmime.def ${SOURCE_PATH} COPYONLY) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() From 3ff6e48cdd4d261b09668e894c2327034e4b6a02 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 15:58:32 +0100 Subject: [PATCH 011/182] fix libcroco --- ports/libcroco/CMakeLists.txt | 9 +++++---- ports/libcroco/portfile.cmake | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt index b26a8b9a18f9d6..9e05f376dc6706 100644 --- a/ports/libcroco/CMakeLists.txt +++ b/ports/libcroco/CMakeLists.txt @@ -4,7 +4,7 @@ project(libcroco C) find_package(Iconv REQUIRED) find_package(Intl REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) find_package(LibXml2 REQUIRED) if(NOT WIN32) find_package(Threads REQUIRED) @@ -71,9 +71,9 @@ set(CMAKE_DEBUG_POSTFIX "d") add_library(croco-0.6 ${SOURCES}) -target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}) target_link_libraries(croco-0.6 PRIVATE - ${GLIB2_LIBRARIES_STATIC} + PkgConfig::GLIB2 ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv ) @@ -127,7 +127,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake " include(CMakeFindDependencyMacro) find_dependency(Intl) find_dependency(Iconv) -find_dependency(unofficial-glib CONFIG) +find_dependency(PkgConfig) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) find_dependency(LibXml2) if(NOT WIN32) find_dependency(Threads) diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index dd4816b52d82cc..de8c0fe2a99855 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -14,10 +14,12 @@ configure_file(${SOURCE_PATH}/config.h.win32 ${SOURCE_PATH}/src/config.h COPYONL file(READ "${SOURCE_PATH}/src/libcroco.symbols" SYMBOLS) string(REGEX REPLACE ";[^\n]*\n" "" DEF "EXPORTS\n${SYMBOLS}") file(WRITE "${SOURCE_PATH}/src/libcroco.def" "${DEF}") - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() From 459728e96ea53a64f930afaa899e4183606dbeb3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 16:04:05 +0100 Subject: [PATCH 012/182] update libnice --- ports/libnice/CMakeLists.txt | 14 ++++++-------- ports/libnice/portfile.cmake | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/libnice/CMakeLists.txt b/ports/libnice/CMakeLists.txt index 78224ecb23c2c0..0ca7cdafaa5d13 100644 --- a/ports/libnice/CMakeLists.txt +++ b/ports/libnice/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.19) project(libnice LANGUAGES C VERSION 0.1.15) @@ -20,10 +20,8 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/config.h ${CMAKE_SOURCE_DIR}/config.h COPYONLY) configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/libnice.def ${CMAKE_SOURCE_DIR}/libnice.def COPYONLY) -find_path(GLIB_INCLUDE_DIR glib.h) -find_library(GLIB_LIBRARY glib-2.0) -find_library(GOBJECT_LIBRARY gobject-2.0) -find_library(GIO_LIBRARY gio-2.0) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) find_library(IPHLPAPI_LIBRARY iphlpapi) find_library(WS2_32_LIB ws2_32) find_library(ADVAPI32_LIB advapi32) @@ -34,7 +32,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/random ${CMAKE_CURRENT_SOURCE_DIR}/socket ${CMAKE_CURRENT_SOURCE_DIR}/stun - ${GLIB_INCLUDE_DIR}) + ${GLIB2_INCLUDE_DIRS}) SET (SRCS @@ -132,9 +130,9 @@ if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244 /wd4005 /wd4391 /wd4142 /wd4267") endif() if (WIN32) - target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${ADVAPI32_LIB} ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${GIO_LIBRARY} OpenSSL::SSL) + target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${ADVAPI32_LIB} PkgConfig::GLIB2 OpenSSL::SSL) else() - target_link_libraries(libnice ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${GIO_LIBRARY} OpenSSL::SSL) + target_link_libraries(libnice PkgConfig::GLIB2 OpenSSL::SSL) endif() install(TARGETS libnice RUNTIME DESTINATION bin diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake index 2741712a3bd2c8..038b21ebbc079c 100644 --- a/ports/libnice/portfile.cmake +++ b/ports/libnice/portfile.cmake @@ -10,11 +10,13 @@ vcpkg_extract_source_archive_ex( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_RELEASE -DOPTIMIZE=1 OPTIONS_DEBUG -DDEBUGGABLE=1 ) From 477651de81a728e3b216e776b8ca4b3eeb031987 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 16:44:30 +0100 Subject: [PATCH 013/182] fix atk build --- ports/atk/CONTROL | 4 ++-- ports/atk/portfile.cmake | 34 +++++++++------------------------- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index d91c0272aebf47..3636df97136168 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -1,6 +1,6 @@ Source: atk -Version: 2.24.0-5 -Port-Version: 2 +Version: 2.36.0 +Port-Version: 1 Homepage: https://developer.gnome.org/atk/ Description: GNOME Accessibility Toolkit Build-Depends: glib, gettext diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 51cf824af5a285..b35b91401415ea 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -1,43 +1,27 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(ATK_VERSION 2.24.0) +set(ATK_VERSION 2.36.0) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.36/atk-${ATK_VERSION}.tar.xz" FILENAME "atk-${ATK_VERSION}.tar.xz" - SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962 + SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - fix-linux-config.patch ) -# Here are used API version of library, not the version of library itself -set(ATK_LIB_SUFFIX 1.0) -set(ATK_DLL_SUFFIX 1) - -set(GLIB_LIB_VERSION 2.0) -if (WIN32) - set(ATK_API_VERSION ${ATK_LIB_SUFFIX}) -else() - set(ATK_API_VERSION ${ATK_DLL_SUFFIX}) -endif() -configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH}/CMakeLists.txt" @ONLY) - -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCMAKE_PROGRAM_PATH=${CURRENT_INSTALLED_DIR}/tools/glib - -DGETTEXT_PACKAGE=atk10 - -DVERSION=10 - OPTIONS_DEBUG - -DATK_SKIP_HEADERS=ON) + OPTIONS -Dintrospection=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' +) +vcpkg_install_meson() -vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() From 39bc1c766f4f8dd6699cd7bc08c0820e4f22de65 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 14 Jan 2021 23:57:06 +0100 Subject: [PATCH 014/182] update harfbuzz --- ports/harfbuzz/0001-fix-cmake-export.patch | 13 --- ports/harfbuzz/CMakeLists.patch | 72 ++++++++++++ ports/harfbuzz/CONTROL | 2 +- ports/harfbuzz/find-package-freetype-2.patch | 13 --- ports/harfbuzz/fix_include.patch | 12 -- ports/harfbuzz/glib-cmake.patch | 30 ----- ports/harfbuzz/icu.patch | 27 ----- ports/harfbuzz/portfile.cmake | 113 +++++++++++++------ 8 files changed, 154 insertions(+), 128 deletions(-) delete mode 100644 ports/harfbuzz/0001-fix-cmake-export.patch create mode 100644 ports/harfbuzz/CMakeLists.patch delete mode 100644 ports/harfbuzz/find-package-freetype-2.patch delete mode 100644 ports/harfbuzz/fix_include.patch delete mode 100644 ports/harfbuzz/glib-cmake.patch delete mode 100644 ports/harfbuzz/icu.patch diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch deleted file mode 100644 index 31f4896f445567..00000000000000 --- a/ports/harfbuzz/0001-fix-cmake-export.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71830b6f5..a25cb09dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -712,7 +712,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - ) - install(EXPORT harfbuzzConfig - NAMESPACE harfbuzz:: -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz -+ DESTINATION share/harfbuzz - ) - if (HB_HAVE_ICU) - install(TARGETS harfbuzz-icu diff --git a/ports/harfbuzz/CMakeLists.patch b/ports/harfbuzz/CMakeLists.patch new file mode 100644 index 00000000000000..e32504966e5515 --- /dev/null +++ b/ports/harfbuzz/CMakeLists.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 11118595f..257e7c85e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.0) ++cmake_minimum_required(VERSION 3.7.0) # lets incerease that to something more appropiate + project(harfbuzz) + + message(WARN "HarfBuzz has a Meson port and tries to migrate all the other build systems to it, please consider using it as we might remove our cmake port soon.") +@@ -177,7 +177,7 @@ set (subset_project_headers ${HB_SUBSET_headers}) + + ## Find and include needed header folders and libraries + if (HB_HAVE_FREETYPE) +- include (FindFreetype) ++ find_package(Freetype REQUIRED) + if (NOT FREETYPE_FOUND) + message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") + endif () +@@ -210,6 +210,8 @@ if (HB_HAVE_GRAPHITE2) + mark_as_advanced(GRAPHITE2_INCLUDE_DIR GRAPHITE2_LIBRARY) + endif () + ++include(SelectLibraryConfigurations) ++ + if (HB_HAVE_GLIB) + add_definitions(-DHAVE_GLIB) + +@@ -217,7 +219,9 @@ if (HB_HAVE_GLIB) + find_package(PkgConfig) + pkg_check_modules(PC_GLIB QUIET glib-2.0) + +- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) ++ find_library(GLIB_LIBRARY_RELEASE NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS} ${PC_GLIB_LIBDIR}/.. ${PC_GLIB_LIBRARY_DIRS}/..) ++ find_library(GLIB_LIBRARY_DEBUG NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR}/debug ${PC_GLIB_LIBRARY_DIRS}/debug ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) ++ select_library_configurations(GLIB) + find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) + find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) + +@@ -233,20 +237,15 @@ endif () + if (HB_HAVE_ICU) + add_definitions(-DHAVE_ICU) + +- # https://github.com/WebKit/webkit/blob/fdd7733f2f30eab7fe096a9791f98c60f62f49c0/Source/cmake/FindICU.cmake +- find_package(PkgConfig) +- pkg_check_modules(PC_ICU QUIET icu-uc) +- +- find_path(ICU_INCLUDE_DIR NAMES unicode/utypes.h HINTS ${PC_ICU_INCLUDE_DIRS} ${PC_ICU_INCLUDEDIR}) +- find_library(ICU_LIBRARY NAMES libicuuc cygicuuc cygicuuc32 icuuc HINTS ${PC_ICU_LIBRARY_DIRS} ${PC_ICU_LIBDIR}) ++ find_package(ICU COMPONENTS uc REQUIRED) + +- include_directories(${ICU_INCLUDE_DIR}) ++ include_directories(${ICU_INCLUDE_DIRS }) + + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) + +- list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY}) ++ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES }) + +- mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY) ++ mark_as_advanced(ICU_INCLUDE_DIRS ICU_LIBRARIES ) + endif () + + if (APPLE AND HB_HAVE_CORETEXT) +@@ -431,6 +431,7 @@ endif () + + ## Define harfbuzz library + add_library(harfbuzz ${project_sources} ${project_extra_sources} ${project_headers}) ++target_include_directories(harfbuzz PUBLIC $) + target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS}) + + diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 753eb70b9e1569..317649ba8b5459 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 2.7.2 +Version: 2.7.4 Port-Version: 1 Description: HarfBuzz OpenType text shaping engine Homepage: https://github.com/behdad/harfbuzz diff --git a/ports/harfbuzz/find-package-freetype-2.patch b/ports/harfbuzz/find-package-freetype-2.patch deleted file mode 100644 index 608e9c890eeb66..00000000000000 --- a/ports/harfbuzz/find-package-freetype-2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index defd5d6..03f9d4e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -267,7 +267,7 @@ set (subset_project_headers - - ## Find and include needed header folders and libraries - if (HB_HAVE_FREETYPE) -- include (FindFreetype) -+ find_package(Freetype REQUIRED) - if (NOT FREETYPE_FOUND) - message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") - endif () diff --git a/ports/harfbuzz/fix_include.patch b/ports/harfbuzz/fix_include.patch deleted file mode 100644 index 894f7b37c4acf5..00000000000000 --- a/ports/harfbuzz/fix_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4dc524..bfd15ec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,6 +431,7 @@ endif () - - ## Define harfbuzz library - add_library(harfbuzz ${project_sources} ${project_extra_sources} ${project_headers}) -+target_include_directories(harfbuzz PUBLIC $) - target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS}) - - diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch deleted file mode 100644 index f982171206dad1..00000000000000 --- a/ports/harfbuzz/glib-cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b21bef2c..ae741ef63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -213,21 +213,13 @@ endif () - if (HB_HAVE_GLIB) - add_definitions(-DHAVE_GLIB) - -- # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake -- find_package(PkgConfig) -- pkg_check_modules(PC_GLIB QUIET glib-2.0) -- -- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) -- find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) -- find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) -- -- include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) -+ find_package(Threads REQUIRED) -+ find_package(Iconv REQUIRED) -+ find_package(unofficial-glib CONFIG REQUIRED) - - list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) - -- list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) -- -- mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) -+ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib Iconv::Iconv) - endif () - - if (HB_HAVE_ICU) diff --git a/ports/harfbuzz/icu.patch b/ports/harfbuzz/icu.patch deleted file mode 100644 index 1747c4a7df23e8..00000000000000 --- a/ports/harfbuzz/icu.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb6cc9007..209128695 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -226,19 +226,13 @@ if (HB_HAVE_ICU) - add_definitions(-DHAVE_ICU) - - # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindICU.cmake -- find_package(PkgConfig) -- pkg_check_modules(PC_ICU QUIET icu-uc) -- -- find_path(ICU_INCLUDE_DIR NAMES unicode/utypes.h HINTS ${PC_ICU_INCLUDE_DIRS} ${PC_ICU_INCLUDEDIR}) -- find_library(ICU_LIBRARY NAMES libicuuc cygicuuc cygicuuc32 icuuc HINTS ${PC_ICU_LIBRARY_DIRS} ${PC_ICU_LIBDIR}) -+ find_package(ICU COMPONENTS uc REQUIRED) - -- include_directories(${ICU_INCLUDE_DIR}) -+ include_directories(${ICU_INCLUDE_DIRS}) - - list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) - -- list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY}) -- -- mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY) -+ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES}) - endif () - - if (APPLE AND HB_HAVE_CORETEXT) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 112c6cbff21bfc..aabbf7fd482e57 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,37 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 9c98b2b9a9e43669c5e2b37eaa41b1e07de1ede3 # 2.7.2 - SHA512 00b61034abce61370a7ff40bf5aa80bc1b3557d1f978ef91725fc30b34c4c00c682a3b9c99233e7e52d579b60694a1ba08714d5c9b01ad13e9fd76828facc720 + REF 7236c7e29cef1c2d76c7a284c5081ff4d3aa1127 # 2.7.4 + SHA512 d231a788ea4e52231d4c363c1eca76424cb82ed0952b5c24d0b082e88b3dddbda967e7fffe67fffdcb22c7ebfbf0ec923365eb4532be772f2e61fa7d29b51998 HEAD_REF master PATCHES - 0001-fix-cmake-export.patch 0002-fix-uwp-build.patch 0003-remove-broken-test.patch - # This patch is required for propagating the full list of static dependencies from freetype - find-package-freetype-2.patch - # This patch is required for propagating the full list of dependencies from glib - #glib-cmake.patch - fix_include.patch - icu.patch + CMakeLists.patch ) -file(READ ${SOURCE_PATH}/CMakeLists.txt _contents) - -if("${_contents}" MATCHES "include \\(FindFreetype\\)") - message(FATAL_ERROR "Harfbuzz's cmake must not directly include() FindFreetype.") -endif() - -if("${_contents}" MATCHES "find_library\\(GLIB_LIBRARIES") - message(FATAL_ERROR "Harfbuzz's cmake must not directly find_library() glib.") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS icu HB_HAVE_ICU graphite2 HB_HAVE_GRAPHITE2 glib HB_HAVE_GLIB ) - +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS -DHP_HAVE_GDI=ON) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -41,22 +27,85 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) - vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +# if("icu" IN_LIST FEATURES) + # list(APPEND FEATURE_OPTIONS -Dicu=enabled) +# else() + # list(APPEND FEATURE_OPTIONS -Dicu=disabled) +# endif() +# if("graphite2" IN_LIST FEATURES) + # list(APPEND FEATURE_OPTIONS -Dgraphite=enabled) +# else() + # list(APPEND FEATURE_OPTIONS -Dgraphite=disabled) +# endif() +# if("glib" IN_LIST FEATURES) + # list(APPEND FEATURE_OPTIONS -Dglib=enabled) + # list(APPEND FEATURE_OPTIONS -Dgobject=enabled) +# else() + # list(APPEND FEATURE_OPTIONS -Dglib=disabled) + # list(APPEND FEATURE_OPTIONS -Dgobject=disabled) +# endif() +# list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) +# if(VCPKG_TARGET_IS_WINDOWS) + # list(APPEND FEATURE_OPTIONS -Dgdi=enabled) +# endif() +# vcpkg_configure_meson( + # SOURCE_PATH ${SOURCE_PATH} + # PREFER_NINJA + # OPTIONS ${FEATURE_OPTIONS} + # -Dtests=disabled + # -Dintrospection=disabled + # -Ddocs=disabled + # -Dbenchmark=disabled + # -Dfontconfig=disabled +# ) +# vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() -# if ("glib" IN_LIST FEATURES) - # # Propagate dependency on glib downstream - # file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents) - # file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" " -# include(CMakeFindDependencyMacro) -# find_dependency(unofficial-glib CONFIG) - -# ${_contents} -# ") -# endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + + +# # HarfBuzz feature options +# option('glib', type: 'feature', value: 'auto', + # description: 'Enable GLib unicode functions') +# option('gobject', type: 'feature', value: 'auto', + # description: 'Enable GObject bindings') +# option('cairo', type: 'feature', value: 'auto', + # description: 'Use Cairo graphics library') +# option('fontconfig', type: 'feature', value: 'auto', + # description: 'Use fontconfig') +# option('icu', type: 'feature', value: 'auto', + # description: 'Enable ICU library unicode functions') +# option('graphite', type: 'feature', value: disabled, + # description: 'Enable Graphite2 complementary shaper') +# option('freetype', type: 'feature', value: 'auto', + # description: 'Enable freetype interop helpers') +# option('gdi', type: 'feature', value: disabled, + # description: 'Enable GDI helpers and Uniscribe shaper backend (Windows only)') +# option('directwrite', type: 'feature', value: disabled, + # description: 'Enable DirectWrite shaper backend on Windows (experimental)') +# option('coretext', type: 'feature', value: disabled, + # description: 'Enable CoreText shaper backend on macOS') + +# # Common feature options +# option('tests', type: 'feature', value: enabled, yield: true, + # description: 'Enable or disable unit tests') +# option('introspection', type: 'feature', value: 'auto', yield: true, + # description: 'Generate gobject-introspection bindings (.gir/.typelib files)') +# option('docs', type: 'feature', value: 'auto', yield: true, + # description: 'Generate documentation with gtk-doc') + +# option('benchmark', type: 'feature', value: 'auto', + # description: 'Enable benchmark tests') +# option('icu_builtin', type: 'boolean', value: false, + # description: 'Don\'t separate ICU support as harfbuzz-icu module') +# option('experimental_api', type: 'boolean', value: false, + # description: 'Enable experimental APIs') +# option('fuzzer_ldflags', type: 'string', + # description: 'Extra LDFLAGS used during linking of fuzzing binaries') \ No newline at end of file From ddd02bf4869c58a7a2538da14a533a33a4331e77 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 09:38:39 +0100 Subject: [PATCH 015/182] fix few builds --- ports/atk/CMakeLists.txt.in | 2 +- ports/cairo/portfile.cmake | 3 ++- ports/fluidsynth/CONTROL | 1 + ports/fluidsynth/portfile.cmake | 4 ++-- ports/harfbuzz/CMakeLists.patch | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/atk/CMakeLists.txt.in b/ports/atk/CMakeLists.txt.in index 6f49c67b540703..eeb8af3f9d3ffb 100644 --- a/ports/atk/CMakeLists.txt.in +++ b/ports/atk/CMakeLists.txt.in @@ -89,7 +89,7 @@ set(ATK_SOURCES add_library(atk ${ATK_SOURCES}) target_compile_definitions(atk PRIVATE ATK_COMPILATION ${ATK_EXPORT_MACRO} G_DISABLE_SINGLE_INCLUDES ATK_LOCALEDIR="/dummy/share/locale") target_link_libraries(atk ${LIBINTL_LIBRARY} ${GLIB_LIBRARIES}) -target_include_directories(atk PRIVATE ${GLIB_INCLUDE_DIR} ${LIBINTL_INCLUDE_DIR}) +target_include_directories(atk PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) set_target_properties(atk PROPERTIES OUTPUT_NAME atk-${ATK_DLL_SUFFIX} diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 414c0df19bdb36..845d8b940ce716 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -34,11 +34,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS x11 WITH_X11 gobject WITH_GOBJECT ) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( PREFER_NINJA SOURCE_PATH ${SOURCE_PATH}/src OPTIONS ${FEATURE_OPTIONS} + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() diff --git a/ports/fluidsynth/CONTROL b/ports/fluidsynth/CONTROL index 470dc2c0b61bc3..f082b871a277e1 100644 --- a/ports/fluidsynth/CONTROL +++ b/ports/fluidsynth/CONTROL @@ -1,5 +1,6 @@ Source: fluidsynth Version: 2.1.4 +Port_Version: 1 Homepage: https://github.com/FluidSynth/fluidsynth Description: FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont. Build-Depends: glib \ No newline at end of file diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index fed30db03674a8..28cd1ccff40e2b 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -7,10 +7,10 @@ vcpkg_from_github( PATCHES force-x86-gentables.patch ) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -Denable-pkgconfig=0 + OPTIONS -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() diff --git a/ports/harfbuzz/CMakeLists.patch b/ports/harfbuzz/CMakeLists.patch index e32504966e5515..ce60acb69e3f2a 100644 --- a/ports/harfbuzz/CMakeLists.patch +++ b/ports/harfbuzz/CMakeLists.patch @@ -50,7 +50,7 @@ index 11118595f..257e7c85e 100644 + find_package(ICU COMPONENTS uc REQUIRED) - include_directories(${ICU_INCLUDE_DIR}) -+ include_directories(${ICU_INCLUDE_DIRS }) ++ include_directories(${ICU_INCLUDE_DIRS}) list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) From f36ad3996a31a45b5d7f8a83c179f9c00bb4519d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 09:56:29 +0100 Subject: [PATCH 016/182] update libxmlpp --- ports/libxmlpp/CMakeLists.txt | 95 --------------------- ports/libxmlpp/CONTROL | 5 +- ports/libxmlpp/fixAutoPtrExpired.patch | 114 ------------------------- ports/libxmlpp/portfile.cmake | 55 +++++++----- 4 files changed, 39 insertions(+), 230 deletions(-) delete mode 100644 ports/libxmlpp/CMakeLists.txt delete mode 100644 ports/libxmlpp/fixAutoPtrExpired.patch diff --git a/ports/libxmlpp/CMakeLists.txt b/ports/libxmlpp/CMakeLists.txt deleted file mode 100644 index 2a36ed7ba3782a..00000000000000 --- a/ports/libxmlpp/CMakeLists.txt +++ /dev/null @@ -1,95 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(libxmlpp) - -set(CMAKE_CXX_STANDARD 17) - -find_path(GLIBMM_INCLUDE_DIR NAMES glibmm.h) -find_library(GLIBMM_LIBRARY NAMES glibmm glibmm-2.0) -find_library(GIOMM_LIBRARY NAMES giomm) -find_library(GLIB_LIBRARY NAMES glib glib-2.0) -find_library(GIO_LIBRARY NAMES gio gio-2.0) -find_library(GMODULE_LIBRARY NAMES gmodule gmodule-2.0) -find_library(GOBJECT_LIBRARY NAMES gobject gobject-2.0) -find_library(SIGCPP_LIBRARY NAMES sigc sigc-2.0) -find_library(FFI_LIBRARY NAMES ffi libffi) -find_library(PCRE_LIBRARY NAMES pcre libpcre) -find_package(LibXml2 REQUIRED) -find_package(LibLZMA REQUIRED) -find_package(ZLIB REQUIRED) - -if(APPLE) - find_library(LIBINTL_LIBRARY NAMES intl) -endif() - -find_package(Iconv REQUIRED) -link_libraries(${LIBINTL_LIBRARY} Iconv::Iconv) - -if(APPLE) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - find_library(CORESERVICES_LIBRARY CoreServices) - find_library(FOUNDATION_LIBRARY Foundation) - link_libraries(${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${FOUNDATION_LIBRARY}) -endif() - -link_libraries( - ${GIOMM_LIBRARY} - ${GLIBMM_LIBRARY} - ${GMODULE_LIBRARY} - ${GOBJECT_LIBRARY} - ${GIO_LIBRARY} - ${GLIB_LIBRARY} - ${SIGCPP_LIBRARY} - ${FFI_LIBRARY} - ${LIBXML2_LIBRARIES} - ${PCRE_LIBRARY} - ${LIBLZMA_LIBRARIES} - ZLIB::ZLIB -) -include_directories(${GLIBMM_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIRS} ${LIBLZMA_INCLUDE_DIRS}) -include_directories(. ${CMAKE_BINARY_DIR}/config) -if(NOT WIN32) - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - link_libraries(Threads::Threads ${CMAKE_DL_LIBS}) -endif() - -# config file -if(WIN32) - configure_file(MSVC_Net2010/libxml++/libxml++config.h ${CMAKE_BINARY_DIR}/config/libxml++config.h COPYONLY) -else() - set(ENV{GLIBMM_CFLAGS} -I${GLIBMM_INCLUDE_DIR}) - set(ENV{GLIBMM_LIBS} "${GLIBMM_LIBRARY}") - set(ENV{GIOMM_CFLAGS} -I${GLIBMM_INCLUDE_DIR}) - set(ENV{GIOMM_LIBS} "${GIOMM_LIBRARY}") - set(ENV{PKG_CONFIG} "echo") - - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/config) - execute_process( - COMMAND "${CMAKE_SOURCE_DIR}/configure" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/config - RESULT_VARIABLE res - ) - if(NOT res EQUAL 0) - message(FATAL_ERROR "Configure failed.") - endif() -endif() - -file(GLOB_RECURSE SOURCES libxml++/*.cc) -add_library(xml++ ${SOURCES}) -target_compile_definitions(xml++ PRIVATE -DLIBXMLPP_BUILD) - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES ${CMAKE_BINARY_DIR}/config/libxml++config.h DESTINATION include) - install(DIRECTORY libxml++ DESTINATION include FILES_MATCHING PATTERN *.h) -endif() -install( - TARGETS xml++ - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -if(NOT DISABLE_EXAMPLES) - add_executable(dom_build examples/dom_build/main.cc) - target_link_libraries(dom_build xml++) -endif() diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL index 65ac0b963bc894..9904f6c8530ad9 100644 --- a/ports/libxmlpp/CONTROL +++ b/ports/libxmlpp/CONTROL @@ -1,5 +1,6 @@ Source: libxmlpp -Version: 2.40.1 -Port-Version: 8 +Version: 5.0 +Port-Version: 1 Description: a C++ wrapper for the libxml XML parser library. Build-Depends: libxml2, glibmm +Supports: !(windows&static) diff --git a/ports/libxmlpp/fixAutoPtrExpired.patch b/ports/libxmlpp/fixAutoPtrExpired.patch deleted file mode 100644 index 98d4df6bc63944..00000000000000 --- a/ports/libxmlpp/fixAutoPtrExpired.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff --git a/libxml++/parsers/saxparser.h b/libxml++/parsers/saxparser.h -index 1362ca3..0bd36d2 100644 ---- a/libxml++/parsers/saxparser.h -+++ b/libxml++/parsers/saxparser.h -@@ -221,7 +221,7 @@ private: - //TODO: Remove the virtual when we can break ABI? - virtual void parse(); - -- std::auto_ptr<_xmlSAXHandler> sax_handler_; -+ std::unique_ptr<_xmlSAXHandler> sax_handler_; - - // A separate xmlpp::Document that is just used for entity resolution, - // and never seen in the API: -diff --git a/libxml++/parsers/textreader.h b/libxml++/parsers/textreader.h -index 48901b2..17f0737 100644 ---- a/libxml++/parsers/textreader.h -+++ b/libxml++/parsers/textreader.h -@@ -257,7 +257,7 @@ class TextReader: NonCopyable - void * locator); - void check_for_exceptions() const; - -- std::auto_ptr propertyreader; -+ std::unique_ptr propertyreader; - _xmlTextReader* impl_; - int severity_; - Glib::ustring error_; -diff --git a/libxml++/relaxngschema.h b/libxml++/relaxngschema.h -index 8df7089..ffe2eaa 100644 ---- a/libxml++/relaxngschema.h -+++ b/libxml++/relaxngschema.h -@@ -23,7 +23,7 @@ - - #include - #include --#include // std::auto_ptr -+#include // std::unique_ptr - - #ifndef DOXYGEN_SHOULD_SKIP_THIS - extern "C" { -@@ -105,7 +105,7 @@ protected: - - private: - struct Impl; -- std::auto_ptr pimpl_; -+ std::unique_ptr pimpl_; - }; - - } // namespace xmlpp -diff --git a/libxml++/validators/relaxngvalidator.h b/libxml++/validators/relaxngvalidator.h -index 5cd5ad7..cd29393 100644 ---- a/libxml++/validators/relaxngvalidator.h -+++ b/libxml++/validators/relaxngvalidator.h -@@ -22,7 +22,7 @@ - #define __LIBXMLPP_VALIDATOR_RELAXNGVALIDATOR_H - - #include --#include // std::auto_ptr -+#include // std::unique_ptr - - namespace Glib - { -@@ -156,7 +156,7 @@ protected: - - private: - struct Impl; -- std::auto_ptr pimpl_; -+ std::unique_ptr pimpl_; - }; - - } // namespace xmlpp -diff --git a/libxml++/validators/xsdvalidator.h b/libxml++/validators/xsdvalidator.h -index 941d7f1..d64b971 100644 ---- a/libxml++/validators/xsdvalidator.h -+++ b/libxml++/validators/xsdvalidator.h -@@ -20,7 +20,7 @@ - #define __LIBXMLPP_VALIDATOR_XSDVALIDATOR_H - - #include --#include // std::auto_ptr -+#include // std::unique_ptr - - namespace Glib - { -@@ -146,7 +146,7 @@ protected: - - private: - struct Impl; -- std::auto_ptr pimpl_; -+ std::unique_ptr pimpl_; - }; - - } // namespace xmlpp -diff --git a/libxml++/xsdschema.h b/libxml++/xsdschema.h -index 1333025..8220e4e 100644 ---- a/libxml++/xsdschema.h -+++ b/libxml++/xsdschema.h -@@ -21,7 +21,7 @@ - - #include - #include --#include // std::auto_ptr -+#include // std::unique_ptr - - #ifndef DOXYGEN_SHOULD_SKIP_THIS - extern "C" { -@@ -96,7 +96,7 @@ protected: - - private: - struct Impl; -- std::auto_ptr pimpl_; -+ std::unique_ptr pimpl_; - }; - - } // namespace xmlpp diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index ae65892008784e..c7a137f1c53fd4 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -1,33 +1,50 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -set(LIBXMLPP_VERSION 2.40.1) +#..\src\libxml++-5-7c4d4a4cea.clean\meson.build:278:4: ERROR: Problem encountered: Static builds are not supported by MSVC-style builds +set(LIBXMLPP_VERSION 5.0.0) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/5.0/libxml++-${LIBXMLPP_VERSION}.tar.xz" FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz" - SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a + SHA512 ae8d7a178e7a3b48a9f0e1ea303e8a4e4d879d0d9367124ede3783d0c31e31c862b98e5d28d72edc4c0b19c6b457ead2d25664efd33d65e44fd52c5783ec3091 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - fixAutoPtrExpired.patch -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + ARCHIVE "${ARCHIVE}" ) -vcpkg_install_cmake() - +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Dbuild-documentation=false + -Dvalidation=false + -Dbuild-examples=false + -Dbuild-tests=false + -Dmsvc14x-parallel-installable=false) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() # Handle copyright and readme file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp RENAME copyright) file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp) + + +# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], + # value: 'if-git-build', description: 'Let mm-common-get copy some files to untracked/') +# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], + # value: 'min', description: 'Compiler warning level') +# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], + # value: 'fatal', description: 'Compiler warning level when a tarball is created') +# option('build-deprecated-api', type: 'boolean', value: true, + # description: 'Build deprecated API and include it in the library') +# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], + # value: 'if-maintainer-mode', description: 'Build and install the documentation') +# option('validation', type: 'boolean', value: true, + # description: 'Validate the tutorial XML file') +# option('build-pdf', type: 'boolean', value: false, + # description: 'Build tutorial PDF file') +# option('build-examples', type: 'boolean', value: true, + # description: 'Build example programs') +# option('build-tests', type: 'boolean', value: true, + # description: 'Build test programs') +# option('msvc14x-parallel-installable', type: 'boolean', value: true, + # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') From 9b57da5b761004bdc2691b50548b9474f4fcda90 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 10:06:32 +0100 Subject: [PATCH 017/182] fix gdk-pixbuf --- ports/gdk-pixbuf/CMakeLists.txt | 12 ++++++------ ports/gdk-pixbuf/CONTROL | 4 ++-- ports/gdk-pixbuf/portfile.cmake | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt index 176b8d56247b75..8f7a054f4f7c4f 100644 --- a/ports/gdk-pixbuf/CMakeLists.txt +++ b/ports/gdk-pixbuf/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.8) project(gdk-pixbuf C) set(GDK_PIXBUF_LIB_SUFFIX 2.0) @@ -9,7 +9,7 @@ set(GLIB_LIB_VERSION 2.0) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) -find_package(unofficial-glib CONFIG REQUIRED) + find_path(GLIB_INCLUDE_DIR glib.h) find_package(Intl REQUIRED) @@ -63,7 +63,7 @@ endif() add_library(gdk-pixbuf ${SOURCES}) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) target_include_directories(gdk-pixbuf PRIVATE ${GLIB2_INCLUDE_DIRS} @@ -72,7 +72,7 @@ target_include_directories(gdk-pixbuf PRIVATE ${Intl_INCLUDE_DIR}) set(LIBS - ${GLIB2_LIBRARIES_STATIC} ${Intl_LIBRARIES} + PkgConfig::GLIB2 ${Intl_LIBRARIES} ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ) @@ -118,8 +118,8 @@ install(TARGETS gdk-pixbuf macro(gdk_add_tool TOOL_NAME) add_executable(${TOOL_NAME} ${ARGN}) - target_include_directories(${TOOL_NAME} PRIVATE ${GLIB_INCLUDE_DIR}) - target_link_libraries(${TOOL_NAME} gdk-pixbuf ${GLIB_LIBRARIES}) + target_include_directories(${TOOL_NAME} PRIVATE ${GLIB2_INCLUDE_DIRS}) + target_link_libraries(${TOOL_NAME} gdk-pixbuf PkgConfig::GLIB2) install(TARGETS ${TOOL_NAME} RUNTIME DESTINATION tools/gdk-pixbuf) endmacro() diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL index 1e08aeebe74fbd..a654c570ecf7b6 100644 --- a/ports/gdk-pixbuf/CONTROL +++ b/ports/gdk-pixbuf/CONTROL @@ -1,6 +1,6 @@ Source: gdk-pixbuf -Version: 2.36.9-5 -Port-Version: 7 +Version: 2.36.9 +Port-Version: 8 Homepage: https://developer.gnome.org/gdk-pixbuf/ Description: Image loading library. Build-Depends: gettext, zlib, libpng, glib diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index b9b82df4fc9ff1..66def89e4360aa 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -17,12 +17,16 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.linux ${SOURCE_PATH}/config.h.linux) +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_DEBUG -DGDK_SKIP_HEADERS=ON - -DGDK_SKIP_TOOLS=ON) + -DGDK_SKIP_TOOLS=ON + ) vcpkg_install_cmake() vcpkg_copy_pdbs() From f4ebfff046fe087777f9a36c9b106fcb71dc3586 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 10:30:17 +0100 Subject: [PATCH 018/182] fix gts --- ports/gts/CONTROL | 3 ++- ports/gts/portfile.cmake | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/gts/CONTROL b/ports/gts/CONTROL index 7d9db739126a56..59bf76989e1bfc 100644 --- a/ports/gts/CONTROL +++ b/ports/gts/CONTROL @@ -1,5 +1,6 @@ Source: gts -Version: 0.7.6-3 +Version: 0.7.6 +Port-Version: 4 Homepage: https://github.com/finetjul/gts Description: A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles Build-Depends: glib diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake index da7ed6183c0a77..98ea07a8fab5ae 100644 --- a/ports/gts/portfile.cmake +++ b/ports/gts/portfile.cmake @@ -10,10 +10,13 @@ vcpkg_from_github( fix-M_PI-in-windows.patch support-unix.patch fix-pkgconfig.patch + glib2.patch ) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() From cff4127617b62d18696c252d42f70d08c72d852d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 11:38:45 +0100 Subject: [PATCH 019/182] gts add patch --- ports/gts/glib2.patch | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 ports/gts/glib2.patch diff --git a/ports/gts/glib2.patch b/ports/gts/glib2.patch new file mode 100644 index 00000000000000..86507306b02438 --- /dev/null +++ b/ports/gts/glib2.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 941e9b96b..ea031828d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,30 +85,34 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src + ) + +-find_library(glib_LIBRARY NAMES glib libglib glib-2.0 libglib-2.0 +- HINTS ${glib_BINARY_DIR}) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) + +-get_filename_component(glib_LIBRARY_DIR ${glib_LIBRARY} DIRECTORY) +-get_filename_component(glib_LIBRARY_NAME ${glib_LIBRARY} NAME) +-string(REGEX REPLACE "\\.[^.]*$" "" glib_LIBRARY_NAME ${glib_LIBRARY_NAME}) ++# find_library(glib_LIBRARY NAMES glib libglib glib-2.0 libglib-2.0 ++ # HINTS ${glib_BINARY_DIR}) + +-find_path(glib_H NAMES glib.h +- HINTS ${glib_LIBRARY_DIR}/../include) +-get_filename_component(glib_INCLUDE_DIR ${glib_H} DIRECTORY) ++# get_filename_component(glib_LIBRARY_DIR ${glib_LIBRARY} DIRECTORY) ++# get_filename_component(glib_LIBRARY_NAME ${glib_LIBRARY} NAME) ++# string(REGEX REPLACE "\\.[^.]*$" "" glib_LIBRARY_NAME ${glib_LIBRARY_NAME}) + +-set(glib_CONFIG_H) +-find_path(glib_CONFIG_H NAMES glibconfig.h +- HINTS ${glib_LIBRARY_DIR}/${glib_LIBRARY_NAME}/include) ++# find_path(glib_H NAMES glib.h ++ # HINTS ${glib_LIBRARY_DIR}/../include) ++# get_filename_component(glib_INCLUDE_DIR ${glib_H} DIRECTORY) + +-get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY) +-include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H}) ++# set(glib_CONFIG_H) ++# find_path(glib_CONFIG_H NAMES glibconfig.h ++ # HINTS ${glib_LIBRARY_DIR}/${glib_LIBRARY_NAME}/include) ++ ++# get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY) ++# include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H}) ++include_directories(${GLIB2_INCLUDE_DIRS}) + + if (NOT WIN32 AND BUILD_SHARED_LIBS) + add_definitions(/DGTS_COMPILATION) + endif() + + add_library(${kit} SHARED ${srcs}) +-target_link_libraries(${kit} ${glib_LIBRARY}) ++target_link_libraries(${kit} PkgConfig::GLIB2) + + if(MSVC) + SET_TARGET_PROPERTIES(${kit} PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/src/gts.def\"") From a46ccac5f6ab5b3e78953fb350ce542101d1601e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 11:52:36 +0100 Subject: [PATCH 020/182] remove old libsigcpp --- ports/atkmm/CONTROL | 4 +- ports/atkmm/portfile.cmake | 103 ++++++++++-------- ports/libsigcpp-3/portfile.cmake | 21 +--- ports/libsigcpp-3/vcpkg.json | 3 + ports/libsigcpp/CMakeLists.txt | 68 ------------ ports/libsigcpp/CONTROL | 4 - .../disable_tests_enable_static_build.patch | 0 ports/libsigcpp/portfile.cmake | 35 ++---- ports/libsigcpp/vcpkg.json | 6 + .../{libsigcpp-3 => libsigcpp}/version.patch | 0 10 files changed, 83 insertions(+), 161 deletions(-) delete mode 100644 ports/libsigcpp/CMakeLists.txt delete mode 100644 ports/libsigcpp/CONTROL rename ports/{libsigcpp-3 => libsigcpp}/disable_tests_enable_static_build.patch (100%) create mode 100644 ports/libsigcpp/vcpkg.json rename ports/{libsigcpp-3 => libsigcpp}/version.patch (100%) diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL index 6d7674c44d867e..da97428e24e6a9 100644 --- a/ports/atkmm/CONTROL +++ b/ports/atkmm/CONTROL @@ -1,6 +1,6 @@ Source: atkmm -Version: 2.24.2 -Port-Version: 5 +Version: 2.36.0 +Port-Version: 1 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 diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index 279ba7e25e5ec3..89919d15abb1e4 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -3,57 +3,74 @@ 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 + #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) - - # 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() +# 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) + + # # 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() + +vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} + OPTIONS -Dbuild-documentation=false + -Dmsvc14x-parallel-installable=false) +vcpkg_install_meson() +# 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") + + +# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], + # value: 'if-git-build', description: 'Generate source code from .hg and .ccg files') +# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'min', + # description: 'Compiler warning level') +# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'fatal', + # description: 'Compiler warning level when a tarball is created') +# option('build-deprecated-api', type: 'boolean', value: true, + # description: 'Build deprecated API and include it in the library') +# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], + # value: 'if-maintainer-mode', description: 'Build and install the documentation') +# option('msvc14x-parallel-installable', type: 'boolean', value: true, + # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') diff --git a/ports/libsigcpp-3/portfile.cmake b/ports/libsigcpp-3/portfile.cmake index 91d869d0ea0d67..0015715fb66c72 100644 --- a/ports/libsigcpp-3/portfile.cmake +++ b/ports/libsigcpp-3/portfile.cmake @@ -1,20 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libsigcplusplus/libsigcplusplus - REF 7e20b36bddab74faed39aa3768d07fd372fce596 - SHA512 6220a3974ee90afb5028a5b60ffcbff353fffbbfcf1570d8db05b6d91604324a73badcb17c73c852d6c5265e2b31e1c2de1b3ea20c0e60ecdb17ce90c9ca40bd - HEAD_REF master - PATCHES disable_tests_enable_static_build.patch - version.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} -) -vcpkg_install_cmake() -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sigc++-3 TARGET_PATH share/sigc++-3) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/libsigcpp-3/vcpkg.json b/ports/libsigcpp-3/vcpkg.json index b7cf550dbd6db7..4c4fd0c8d1aaf2 100644 --- a/ports/libsigcpp-3/vcpkg.json +++ b/ports/libsigcpp-3/vcpkg.json @@ -3,4 +3,7 @@ "version-string": "3.0.3", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" + "dependencies": [ + "libsigcpp" + ] } diff --git a/ports/libsigcpp/CMakeLists.txt b/ports/libsigcpp/CMakeLists.txt deleted file mode 100644 index e5a1dbee0d6eba..00000000000000 --- a/ports/libsigcpp/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(libsigc++) - -set(CMAKE_CXX_STANDARD 17) - -set(SIGCPP_API_VERSION 2.0) - -add_definitions(-DSIGC_BUILD) - -include_directories(./MSVC_Net2013) # config file for windows is there -include_directories(.) - -set(SICGPP_SOURCES - sigc++/connection.cc - sigc++/signal_base.cc - sigc++/trackable.cc - sigc++/adaptors/lambda/lambda.cc - sigc++/functors/slot_base.cc) - -add_library(sigc ${SICGPP_SOURCES}) -set_target_properties(sigc PROPERTIES OUTPUT_NAME sigc-${SIGCPP_API_VERSION}) -install(TARGETS sigc RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) - -if(NOT SIGCPP_SKIP_HEADERS) - install(FILES MSVC_Net2013/sigc++config.h DESTINATION include) - install(FILES sigc++/sigc++.h DESTINATION include/sigc++) - install(FILES sigc++/bind.h DESTINATION include/sigc++) - install(FILES sigc++/bind_return.h DESTINATION include/sigc++) - install(FILES sigc++/connection.h DESTINATION include/sigc++) - install(FILES sigc++/limit_reference.h DESTINATION include/sigc++) - install(FILES sigc++/reference_wrapper.h DESTINATION include/sigc++) - install(FILES sigc++/retype_return.h DESTINATION include/sigc++) - install(FILES sigc++/signal.h DESTINATION include/sigc++) - install(FILES sigc++/signal_base.h DESTINATION include/sigc++) - install(FILES sigc++/slot.h DESTINATION include/sigc++) - install(FILES sigc++/trackable.h DESTINATION include/sigc++) - install(FILES sigc++/type_traits.h DESTINATION include/sigc++) - install(FILES sigc++/visit_each.h DESTINATION include/sigc++) - install(FILES sigc++/adaptors/adaptors.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/adaptor_trait.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/bind.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/bind_return.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/bound_argument.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/compose.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/deduce_result_type.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/exception_catch.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/hide.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/retype.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/retype_return.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/track_obj.h DESTINATION include/sigc++/adaptors) - install(FILES sigc++/adaptors/lambda/base.h DESTINATION include/sigc++/adaptors/lambda) - install(FILES sigc++/adaptors/lambda/select.h DESTINATION include/sigc++/adaptors/lambda) - install(FILES sigc++/functors/functors.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/functor_trait.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/mem_fun.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/ptr_fun.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/slot.h DESTINATION include/sigc++/functors) - install(FILES sigc++/functors/slot_base.h DESTINATION include/sigc++/functors) -endif() - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(SIGCXX_API_VERSION "2.0") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sigc++.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" DESTINATION lib/pkgconfig) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++.pc" DESTINATION lib/pkgconfig RENAME sigc++-2.0.pc) diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL deleted file mode 100644 index 82b48ec5706a06..00000000000000 --- a/ports/libsigcpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libsigcpp -Version: 2.10-3 -Port-Version: 2 -Description: Typesafe callback framework for C++ diff --git a/ports/libsigcpp-3/disable_tests_enable_static_build.patch b/ports/libsigcpp/disable_tests_enable_static_build.patch similarity index 100% rename from ports/libsigcpp-3/disable_tests_enable_static_build.patch rename to ports/libsigcpp/disable_tests_enable_static_build.patch diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index a8b70d0533dd3e..91d869d0ea0d67 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,33 +1,20 @@ - -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz" - FILENAME "libsigc++-2.10.0.tar.xz" - SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO libsigcplusplus/libsigcplusplus + REF 7e20b36bddab74faed39aa3768d07fd372fce596 + SHA512 6220a3974ee90afb5028a5b60ffcbff353fffbbfcf1570d8db05b6d91604324a73badcb17c73c852d6c5265e2b31e1c2de1b3ea20c0e60ecdb17ce90c9ca40bd + HEAD_REF master + PATCHES disable_tests_enable_static_build.patch + version.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS_DEBUG - -DSIGCPP_SKIP_HEADERS=ON) - +) vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sigc++-3 TARGET_PATH share/sigc++-3) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(READ ${CURRENT_PACKAGES_DIR}/include/sigc++config.h SIGCPPCONFIG_H) - string(REPLACE "endif /* !SIGC_MSC */" - "endif /* !SIGC_MSC */ -#undef SIGC_DLL" SIGCPPCONFIG_H "${SIGCPPCONFIG_H}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/sigc++config.h "${SIGCPPCONFIG_H}") -endif() - -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsigcpp) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libsigcpp/COPYING ${CURRENT_PACKAGES_DIR}/share/libsigcpp/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json new file mode 100644 index 00000000000000..b7cf550dbd6db7 --- /dev/null +++ b/ports/libsigcpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libsigcpp-3", + "version-string": "3.0.3", + "description": "Typesafe callback framework for C++", + "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" +} diff --git a/ports/libsigcpp-3/version.patch b/ports/libsigcpp/version.patch similarity index 100% rename from ports/libsigcpp-3/version.patch rename to ports/libsigcpp/version.patch From a1b114529eb67d76fbf60acdaf415b6bf3589eec Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 12:21:41 +0100 Subject: [PATCH 021/182] add missing comma --- ports/libsigcpp-3/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libsigcpp-3/vcpkg.json b/ports/libsigcpp-3/vcpkg.json index 4c4fd0c8d1aaf2..f69acc078da0db 100644 --- a/ports/libsigcpp-3/vcpkg.json +++ b/ports/libsigcpp-3/vcpkg.json @@ -2,7 +2,7 @@ "name": "libsigcpp-3", "version-string": "3.0.3", "description": "Typesafe callback framework for C++", - "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" + "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", "dependencies": [ "libsigcpp" ] From 77243e843d5b9dd487c2b68e08e8b1e5ad5b03b8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 12:35:09 +0100 Subject: [PATCH 022/182] fix supports logic --- ports/glib/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index b9c834a5b37f17..6da5c9e0fa4a49 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -4,7 +4,7 @@ Port-Version: 0 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv, dirent -Supports: !uwp|!(windows&static) +Supports: !uwp&!(windows&static) Feature: selinux Description: Build with selinux support. \ No newline at end of file From 1338c73d02569c9554f118020c3aadca95397568 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 12:55:35 +0100 Subject: [PATCH 023/182] fix name mismatch --- ports/libsigcpp/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index b7cf550dbd6db7..d83530b95be02e 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,5 +1,5 @@ { - "name": "libsigcpp-3", + "name": "libsigcpp", "version-string": "3.0.3", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" From 6aafececfdf812feb4785c62e60c7db3e52582e1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 13:09:30 +0100 Subject: [PATCH 024/182] restore original ci baseline. --- scripts/ci.baseline.txt | 291 ++++++++++++++++++++++++++++------------ 1 file changed, 206 insertions(+), 85 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4de9bf33acfdfb..c8f6c14d8bc973 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -23,6 +23,7 @@ ## x64-uwp ## x64-windows ## x64-windows-static +## x64-windows-static-md ## x86-windows ## @@ -58,14 +59,6 @@ caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail cairomm:x64-linux=fail -# capnproto currently triggers an ICE -capnproto:x86-windows=fail -capnproto:x64-windows=fail -capnproto:x64-windows-static=fail -# capnproto doesn't support arm, arm64, or UWP -capnproto:arm64-windows=fail -capnproto:arm-uwp=fail -capnproto:x64-uwp=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail cartographer:x64-osx=fail @@ -78,6 +71,7 @@ catch-classic:x64-osx = skip catch-classic:x64-uwp = skip catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip +catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail @@ -95,16 +89,13 @@ charls:x64-osx=skip charls:x64-uwp=skip charls:x64-windows=skip charls:x64-windows-static=skip +charls:x64-windows-static-md=skip charls:x86-windows=skip chartdir:arm64-windows=fail chartdir:arm-uwp=fail chartdir:x64-uwp=fail chartdir:x64-windows-static=fail -chipmunk:arm64-windows=fail -chipmunk:arm-uwp=fail -chipmunk:x64-linux=fail -chipmunk:x64-osx=fail -chipmunk:x64-uwp=fail +chartdir:x64-windows-static-md=fail chmlib:arm-uwp=fail chmlib:x64-uwp=fail # Chromium Base requires a recent version of Clang to be installed. @@ -115,9 +106,11 @@ civetweb:x64-uwp = skip clblas:arm64-windows=fail clblast:x64-linux=fail clblast:x64-windows-static=fail +clblast:x64-windows-static-md=fail clockutils:x64-linux=fail clockutils:x64-osx=fail cmark:x64-windows-static=fail +cmark:x64-windows-static-md=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -125,11 +118,13 @@ cmcstl2:x64-osx = skip cmcstl2:x64-uwp = skip cmcstl2:x64-windows = skip cmcstl2:x64-windows-static = skip +cmcstl2:x64-windows-static-md=skip cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail collada-dom:x64-windows-static=fail +collada-dom:x64-windows-static-md=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail coolprop:x64-linux=fail @@ -143,6 +138,7 @@ corrade:x64-uwp=fail cppcms:x64-linux=fail cppcms:x64-osx=fail cppcms:x64-windows-static=fail +cppcms:x64-windows-static-md=fail cppfs:arm-uwp=fail cppfs:x64-uwp=fail cppmicroservices:arm64-windows=fail @@ -153,11 +149,6 @@ cpp-netlib:x64-uwp=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail -cppunit:arm64-windows=fail -cppunit:arm-uwp=fail -cppunit:x64-linux=fail -cppunit:x64-osx=fail -cppunit:x64-uwp=fail cpuinfo:arm64-windows=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail @@ -176,6 +167,7 @@ cudnn:arm64-windows=fail cudnn:arm-uwp=fail cudnn:x64-uwp=fail cudnn:x64-windows-static=fail +cudnn:x64-windows-static-md=fail cudnn:x86-windows=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip @@ -184,6 +176,7 @@ dbghelp:x64-linux=fail dbghelp:x64-osx=fail dbghelp:x64-uwp=skip dbghelp:x64-windows-static=skip +dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:arm-uwp=fail @@ -196,22 +189,15 @@ devicenameresolver:x64-linux=fail devicenameresolver:x64-osx=fail devicenameresolver:x64-uwp=fail devicenameresolver:x64-windows-static=fail +devicenameresolver:x64-windows-static-md=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail -directxmesh:x64-linux=fail -directxmesh:x64-osx=fail -directxmesh:x64-windows-static=fail +# directxtex, directxmesh requires GCC 9 or later for linux support directxtex:x64-linux=fail -directxtex:x64-osx=fail -directxtex:x64-windows-static=fail -directxtk:x64-linux=fail -directxtk:x64-osx=fail -directxtk:x64-windows-static=fail -directxtk12:x64-linux=fail -directxtk12:x64-osx=fail -directxtk12:x64-windows-static=fail +directxmesh:x64-linux=fail discord-game-sdk:x64-windows-static=fail +discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail dlfcn-win32:arm-uwp=fail @@ -226,6 +212,7 @@ dpdk:x64-linux=fail dpdk:x64-osx=fail dpdk:x64-uwp=fail dpdk:x64-windows-static=fail +dpdk:x64-windows-static-md=fail dpdk:x64-windows=fail dpdk:x86-windows=fail duckx:arm64-windows = skip @@ -235,6 +222,7 @@ duckx:x64-osx = skip duckx:x64-uwp = skip duckx:x64-windows = skip duckx:x64-windows-static = skip +duckx:x64-windows-static-md=skip duckx:x86-windows = skip duilib:arm-uwp=fail duilib:x64-linux=fail @@ -250,6 +238,7 @@ dxut:arm-uwp=fail dxut:x64-linux=fail dxut:x64-osx=fail dxut:x64-windows-static=fail +dxut:x64-windows-static-md=fail eastl:arm-uwp=fail easyhook:arm64-windows=fail easyhook:arm-uwp=fail @@ -257,6 +246,7 @@ easyhook:x64-linux=fail easyhook:x64-osx=fail easyhook:x64-uwp=fail easyhook:x64-windows-static=fail +easyhook:x64-windows-static-md=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail eathread:arm64-windows=fail @@ -272,18 +262,23 @@ ecm:x64-osx = skip ecm:x64-uwp = skip ecm:x64-windows = skip ecm:x64-windows-static = skip +ecm:x64-windows-static-md=skip ecm:x86-windows = skip ecsutil:arm64-windows=fail ecsutil:arm-uwp=fail ecsutil:x64-linux=fail ecsutil:x64-osx=fail ecsutil:x64-uwp=fail +# Checks for gnu extension so only works with gcc. +elfutils:x64-osx=fail embree2:x64-linux=fail embree2:x64-osx=fail embree2:x64-windows-static=fail +embree2:x64-windows-static-md=fail enet:arm-uwp=fail enet:x64-uwp=fail epsilon:x64-windows-static=fail +epsilon:x64-windows-static-md=fail epsilon:arm-uwp=fail epsilon:x64-linux=fail epsilon:x64-osx=fail @@ -295,16 +290,19 @@ fann:x64-linux=fail fann:x64-osx=fail fann:x64-uwp=fail fann:x64-windows-static=fail +fann:x64-windows-static-md=fail farmhash:arm64-windows=fail farmhash:arm-uwp=fail farmhash:x64-uwp=fail farmhash:x64-windows=fail farmhash:x64-windows-static=fail +farmhash:x64-windows-static-md=fail farmhash:x86-windows=fail fastrtps:arm-uwp=fail fastrtps:x64-linux=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail +fastrtps:x64-windows-static-md=fail fdk-aac:arm64-windows=fail fdk-aac:arm-uwp=fail fdk-aac:x64-uwp=fail @@ -325,6 +323,7 @@ fluidlite:x64-linux=skip fluidlite:x64-osx=skip fluidlite:x64-uwp=skip fluidlite:x64-windows-static=skip +fluidlite:x64-windows-static-md=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip fmem:arm-uwp=fail @@ -365,10 +364,17 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail +gdal:x64-windows-static-md=fail gdcm:arm64-windows=fail gdcm:x64-linux = skip geos:arm-uwp=fail geos:x64-uwp=fail + +# Port geotrans source ftp://ftp.nga.mil server +# extremely slow may take several hours to download +geotrans:x64-linux = skip +geotrans:x64-windows = skip +geotrans:x86-windows = skip getopt:arm-uwp=fail getopt:x64-uwp=fail getopt-win32:arm64-windows=fail @@ -377,6 +383,7 @@ getopt-win32:x64-linux=fail getopt-win32:x64-osx=fail getopt-win32:x64-uwp=fail getopt-win32:x64-windows-static=fail +getopt-win32:x64-windows-static-md=fail gflags:arm-uwp=fail gflags:x64-uwp=fail @@ -388,6 +395,7 @@ gherkin-c:x64-osx=fail gherkin-c:x64-uwp = skip gherkin-c:x64-windows = skip gherkin-c:x64-windows-static = skip +gherkin-c:x64-windows-static-md=skip gherkin-c:x86-windows = skip gl3w:arm64-windows=fail gl3w:arm-uwp=fail @@ -395,15 +403,18 @@ glew:arm64-windows=fail glew:arm-uwp=fail glfw3:arm-uwp=fail glfw3:x64-uwp=fail +glib:x64-uwp=fail +glib:x64-windows-static=fail +glib:x64-windows-static-md=fail +glib:x64-osx=fail gmmlib:arm64-windows=fail gmmlib:arm-uwp=fail gmmlib:x64-osx=fail gmmlib:x64-uwp=fail gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail +gmmlib:x64-windows-static-md=fail gmmlib:x86-windows=fail -# VS 2019 16.7 broke gmp UWP https://github.com/microsoft/vcpkg/issues/13172 -gmp:x64-uwp=fail google-cloud-cpp:arm64-windows=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail @@ -428,15 +439,14 @@ h3:arm64-windows=fail h3:arm-uwp=fail h3:x64-uwp=fail halide:x64-windows-static=fail -# Halide depends on LLVM, which is mis-compiled by MSVC in x86-windows-dbg. -# See https://developercommunity.visualstudio.com/content/problem/1179643/msvc-copies-overaligned-non-trivially-copyable-par.html -halide:x86-windows=skip +halide:x64-windows-static-md=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail hdf5:x64-uwp=fail healpix:x86-windows=fail healpix:x64-windows=fail healpix:x64-windows-static=fail +healpix:x64-windows-static-md=fail healpix:x64-uwp=fail healpix:arm64-windows=fail healpix:arm-uwp=fail @@ -449,9 +459,10 @@ hidapi:x64-uwp=fail hiredis:arm-uwp=fail hiredis:x64-uwp=fail hpx:x64-windows-static=fail +hpx:x64-windows-static-md=fail hpx:x64-linux=fail libhsplasma:x64-windows-static=fail -icu:arm64-windows=fail +libhsplasma:x64-windows-static-md=fail icu:arm-uwp=fail icu:x64-uwp=fail idevicerestore:x64-linux=fail @@ -460,17 +471,26 @@ ignition-common1:x64-linux=fail ignition-msgs1:arm64-windows=fail ignition-msgs1:arm-uwp=fail ignition-msgs1:x64-uwp=fail -ignition-msgs5:x64-linux=fail ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-uwp=fail ignition-msgs5:x64-osx=skip +# Conflicts with libjpeg-turbo, mozjpeg +ijg-libjpeg:arm64-windows = skip +ijg-libjpeg:arm-uwp = skip +ijg-libjpeg:x64-linux = skip +ijg-libjpeg:x64-osx = skip +ijg-libjpeg:x64-uwp = skip +ijg-libjpeg:x64-windows = skip +ijg-libjpeg:x64-windows-static = skip +ijg-libjpeg:x86-windows = skip intel-ipsec:arm64-windows=fail intel-ipsec:arm-uwp=fail intel-ipsec:x64-osx=fail intel-ipsec:x64-uwp=fail intel-ipsec:x64-windows=fail intel-ipsec:x64-windows-static=fail +intel-ipsec:x64-windows-static-md=fail intel-ipsec:x86-windows=fail intel-mkl:arm64-windows=fail intel-mkl:arm-uwp=fail @@ -479,6 +499,7 @@ intel-mkl:x64-osx=fail intel-mkl:x64-uwp=fail intel-mkl:x64-windows=fail intel-mkl:x64-windows-static=fail +intel-mkl:x64-windows-static-md=fail intel-mkl:x86-windows=fail intelrdfpmathlib:arm-uwp=fail intelrdfpmathlib:x64-linux=fail @@ -493,6 +514,7 @@ isal:x64-osx=fail isal:x64-uwp=fail isal:x64-windows=fail isal:x64-windows-static=fail +isal:x64-windows-static-md=fail isal:x86-windows=fail jaeger-client-cpp:arm64-windows=fail jbig2dec:arm-uwp=fail @@ -503,6 +525,7 @@ jemalloc:x64-linux=fail jemalloc:x64-osx=fail jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail +jemalloc:x64-windows-static-md=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail keystone:arm-uwp=fail @@ -533,6 +556,7 @@ libbf:arm-uwp=fail libbf:x64-uwp=fail libbf:x64-windows=fail libbf:x64-windows-static=fail +libbf:x64-windows-static-md=fail libbf:x86-windows=fail libbson:arm-uwp=fail libbson:x64-uwp=fail @@ -555,15 +579,16 @@ libdshowcapture:arm-uwp=fail libdshowcapture:x64-linux=fail libdshowcapture:x64-osx=fail libdshowcapture:x64-uwp=fail -libepoxy:arm64-windows=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail +libepoxy:x64-windows-static-md=fail libevent:arm-uwp=fail libevent:x64-uwp=fail libevhtp:x86-windows=fail libevhtp:x64-windows=fail libevhtp:x64-windows-static=fail +libevhtp:x64-windows-static-md=fail libevhtp:x64-uwp=fail libevhtp:arm64-windows=fail libevhtp:arm-uwp=fail @@ -574,6 +599,7 @@ libfabric:x64-linux=fail libfabric:x64-osx=fail libfabric:x64-uwp=fail libfabric:x64-windows-static=fail +libfabric:x64-windows-static-md=fail libfreenect2:arm64-windows=fail libfreenect2:x64-linux=fail libfreenect2:x64-osx=fail @@ -589,12 +615,14 @@ libgpod:arm-uwp=fail libgpod:x64-uwp=fail libgpod:x64-windows=fail libgpod:x64-windows-static=fail +libgpod:x64-windows-static-md=fail libgpod:x86-windows=fail libhdfs3:arm64-windows=fail libhdfs3:arm-uwp=fail libhdfs3:x64-uwp=fail libhdfs3:x64-windows=fail libhdfs3:x64-windows-static=fail +libhdfs3:x64-windows-static-md=fail libhdfs3:x86-windows=fail libhdfs3:x64-linux=fail libhydrogen:arm64-windows=fail @@ -619,6 +647,7 @@ libmad:x64-uwp=fail libmagic:x86-windows=fail libmagic:x64-windows=fail libmagic:x64-windows-static=fail +libmagic:x64-windows-static-md=fail libmagic:x64-uwp=fail libmagic:arm64-windows=fail libmagic:arm-uwp=fail @@ -629,6 +658,7 @@ libmariadb:x64-osx = skip libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip +libmariadb:x64-windows-static-md=skip libmariadb:x86-windows = skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:arm64-windows=skip @@ -636,12 +666,14 @@ libmesh:arm-uwp=skip libmesh:x64-uwp=skip libmesh:x64-windows=skip libmesh:x64-windows-static=skip +libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail +libmodman:x64-windows-static-md=fail libmodplug:arm-uwp=fail libmodplug:x64-uwp=fail libmpeg2:arm-uwp=fail @@ -661,18 +693,22 @@ libosip2:arm-uwp=fail libosip2:x64-uwp=fail libosip2:x64-windows=fail libosip2:x64-windows-static=fail +libosip2:x64-windows-static-md=fail libosip2:x86-windows=fail libpcap:arm64-windows=fail libpcap:arm-uwp=fail libpcap:x64-osx=fail libpcap:x64-uwp=fail libpcap:x64-windows-static=fail +libpcap:x64-windows-static-md=fail libpff:arm-uwp=fail libpff:x64-linux=fail libpff:x64-osx=fail libpff:x64-uwp=fail libpff:x64-windows-static=fail +libpff:x64-windows-static-md=fail libplist:x64-windows-static=fail +libplist:x64-windows-static-md=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip libpng-apng:x64-linux = skip @@ -680,6 +716,7 @@ libpng-apng:x64-osx = skip libpng-apng:x64-uwp = skip libpng-apng:x64-windows = skip libpng-apng:x64-windows-static = skip +libpng-apng:x64-windows-static-md=skip libpng-apng:x86-windows = skip libpq:arm-uwp=fail libpq:x64-uwp=fail @@ -687,16 +724,14 @@ libpq:x64-uwp=fail libqcow:arm-uwp=skip libqcow:x64-uwp=skip libqcow:x64-windows-static=skip +libqcow:x64-windows-static-md=skip libqcow:x64-osx=skip libqcow:x64-windows=skip libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip - -libraqm:x64-windows-static=fail librdkafka:arm-uwp=fail librdkafka:x64-uwp=fail - # Conflicts with openssl boringssl:arm64-windows = skip boringssl:arm-uwp = skip @@ -705,6 +740,7 @@ boringssl:x64-osx = skip boringssl:x64-uwp = skip boringssl:x64-windows = skip boringssl:x64-windows-static = skip +boringssl:x64-windows-static-md=skip boringssl:x86-windows = skip libressl:arm64-windows = skip libressl:arm-uwp = skip @@ -713,9 +749,8 @@ libressl:x64-osx = skip libressl:x64-uwp = skip libressl:x64-windows = skip libressl:x64-windows-static = skip +libressl:x64-windows-static-md=skip libressl:x86-windows = skip -libsamplerate:arm64-windows=fail -libsamplerate:arm-uwp=fail libsamplerate:x64-osx=fail libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail @@ -740,6 +775,7 @@ libudns:arm-uwp=fail libudns:x64-uwp=fail libudns:x64-windows=fail libudns:x64-windows-static=fail +libudns:x64-windows-static-md=fail libudns:x86-windows=fail libudns:x64-osx=fail libui:arm-uwp=fail @@ -764,6 +800,7 @@ libuuid:x64-osx = skip libuuid:x64-uwp=fail libuuid:x64-windows=fail libuuid:x64-windows-static=fail +libuuid:x64-windows-static-md=fail libuuid:x86-windows=fail libuv:arm-uwp=fail libuv:x64-uwp=fail @@ -773,12 +810,14 @@ libvmdk:x64-uwp=fail libvmdk:x86-windows=skip libvmdk:x64-windows=skip libvmdk:x64-windows-static=skip +libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail +libwandio:x64-windows-static-md=fail libwandio:x64-uwp=fail libwandio:arm64-windows=fail libwandio:arm-uwp=fail @@ -800,6 +839,7 @@ live555:x64-osx=fail live555:x64-uwp=fail live555:x64-windows=fail live555:x64-windows-static=fail +live555:x64-windows-static-md=fail live555:x86-windows=fail llgl:arm-uwp=fail llgl:x64-uwp=fail @@ -821,12 +861,14 @@ luajit:x64-osx = skip luajit:x64-uwp = skip luajit:x64-windows = skip luajit:x64-windows-static = skip +luajit:x64-windows-static-md=skip luajit:x86-windows = skip luasocket:x64-linux=fail luasocket:x64-osx=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip marble:x64-windows-static=fail +marble:x64-windows-static-md=fail marble:arm64-windows=fail marble:arm-uwp=fail marble:x64-linux=fail @@ -849,11 +891,17 @@ mecab:x64-linux = skip mecab:x64-uwp = skip mecab:x64-windows = skip mecab:x64-windows-static = skip +mecab:x64-windows-static-md=skip mecab:x86-windows = skip memorymodule:arm-uwp=fail memorymodule:x64-linux=fail memorymodule:x64-osx=fail memorymodule:x64-uwp=fail +# Due to static crt. +mesa:x64-windows-static=fail +# Missing dependent libraries. +mesa:x64-linux=fail +mesa:x64-osx=fail meschach:arm-uwp=fail meschach:x64-linux=fail meschach:x64-osx=fail @@ -871,6 +919,7 @@ mhook:x64-osx=fail mhook:x64-uwp=fail milerius-sfml-imgui:x64-osx=fail milerius-sfml-imgui:x64-windows-static=fail +milerius-sfml-imgui:x64-windows-static-md=fail minhook:arm64-windows=fail minhook:arm-uwp=fail minhook:x64-linux=fail @@ -892,6 +941,7 @@ microsoft-signalr:x64-osx=skip microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip +microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip mman:x64-linux=fail mman:x64-osx=fail @@ -905,6 +955,7 @@ mmloader:x86-windows=fail # mmx installs many problematic headers, such as `json.h` and `sched.h` mmx:x64-windows=skip mmx:x64-windows-static=skip +mmx:x64-windows-static-md=skip mmx:x86-windows=skip mmx:x64-linux=skip mmx:x64-osx=skip @@ -921,9 +972,11 @@ monkeys-audio:x64-linux=fail monkeys-audio:x64-osx=fail monkeys-audio:x64-uwp=fail monkeys-audio:x64-windows-static=fail +monkeys-audio:x64-windows-static-md=fail moos-core:arm-uwp=fail moos-core:x64-uwp=fail moos-core:x64-windows-static=fail +moos-core:x64-windows-static-md=fail moos-essential:arm64-windows=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail @@ -935,18 +988,21 @@ mozjpeg:x64-osx = skip mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip mozjpeg:x64-windows-static = skip +mozjpeg:x64-windows-static-md=skip mozjpeg:x86-windows = skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 mpir:x86-windows=skip mpir:x64-windows=skip mpir:x64-windows-static=skip +mpir:x64-windows-static-md=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip msix:x64-linux=fail msix:x64-osx=fail msix:x64-windows-static=fail +msix:x64-windows-static-md=fail msmpi:arm64-windows=fail msmpi:arm-uwp=fail msmpi:x64-linux=fail @@ -965,7 +1021,6 @@ nana:x64-uwp=fail nanodbc:arm-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip -nanogui:arm64-windows=fail nanorange:arm64-windows=fail nanorange:arm-uwp=fail nanorange:x64-linux=fail @@ -973,6 +1028,7 @@ nanorange:x64-osx=fail nanorange:x64-uwp=fail nanorange:x64-windows=fail nanorange:x64-windows-static=fail +nanorange:x64-windows-static-md=fail nanorange:x86-windows=fail nanovg:arm-uwp=fail nanovg:x64-uwp=fail @@ -981,14 +1037,10 @@ nativefiledialog:x64-uwp=fail nethost:x64-uwp=fail nethost:arm-uwp=fail nettle:x64-windows-static=skip +nettle:x64-windows-static-md=skip nettle:x64-windows=skip -networkdirect-sdk:arm64-windows=fail -networkdirect-sdk:arm-uwp=fail -networkdirect-sdk:x64-linux=fail -networkdirect-sdk:x64-osx=fail -networkdirect-sdk:x64-uwp=fail -networkdirect-sdk:x86-windows=fail ngspice:x64-windows-static=fail +ngspice:x64-windows-static-md=fail nng:arm-uwp=fail nng:x64-uwp=fail nrf-ble-driver:arm-uwp=fail @@ -999,13 +1051,16 @@ numactl:x64-osx=fail numactl:x64-uwp=fail numactl:x64-windows=fail numactl:x64-windows-static=fail +numactl:x64-windows-static-md=fail numactl:x86-windows=fail nvtt:arm64-windows=fail nvtt:arm-uwp=fail nvtt:x64-uwp=fail -ocilib:arm64-windows=fail ocilib:arm-uwp=fail +ocilib:arm64-windows=fail ocilib:x64-uwp=fail +ocilib:x64-windows-static=fail +ocilib:x64-windows-static-md=fail octomap:arm-uwp=fail octomap:x64-uwp=fail ode:arm64-windows=fail @@ -1020,6 +1075,7 @@ ogdf:x64-osx=fail ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip +ogdf:x64-windows-static-md=skip ogdf:x86-windows = skip ogre:x64-osx=fail # Conflicts with ogre @@ -1030,6 +1086,7 @@ ogre-next:x64-linux = skip ogre-next:x64-uwp = skip ogre-next:x64-windows = skip ogre-next:x64-windows-static = skip +ogre-next:x64-windows-static-md=skip ogre-next:x86-windows = skip ois:arm64-windows=fail ois:arm-uwp=fail @@ -1059,6 +1116,7 @@ opencc:x64-uwp=fail opencensus-cpp:arm64-windows=fail opencensus-cpp:x64-windows=fail opencensus-cpp:x64-windows-static=fail +opencensus-cpp:x64-windows-static-md=fail opencensus-cpp:x86-windows=fail opencensus-cpp:x64-uwp=fail opencl:arm-uwp=fail @@ -1071,6 +1129,7 @@ opencv2:x64-osx = skip opencv2:x64-uwp = skip opencv2:x64-windows = skip opencv2:x64-windows-static = skip +opencv2:x64-windows-static-md=skip opencv2:x86-windows = skip opencv3:arm64-windows = skip opencv3:arm-uwp = skip @@ -1079,6 +1138,7 @@ opencv3:x64-osx = skip opencv3:x64-uwp = skip opencv3:x64-windows = skip opencv3:x64-windows-static = skip +opencv3:x64-windows-static-md=skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail @@ -1095,26 +1155,26 @@ openmpi:arm-uwp=fail openmpi:x64-uwp=fail openmpi:x64-windows=fail openmpi:x64-windows-static=fail +openmpi:x64-windows-static-md=fail openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail +openni2:x64-windows-static-md=fail openscap:x64-linux=fail openssl-unix:arm64-windows=fail openssl-unix:arm-uwp=fail openssl-unix:x64-uwp=fail openssl-unix:x64-windows=fail openssl-unix:x64-windows-static=fail +openssl-unix:x64-windows-static-md=fail openssl-unix:x86-windows=fail openssl-uwp:arm64-windows=fail openssl-uwp:x64-linux=fail openssl-uwp:x64-osx=fail openssl-uwp:x64-windows=fail openssl-uwp:x64-windows-static=fail +openssl-uwp:x64-windows-static-md=fail openssl-uwp:x86-windows=fail -openssl-windows:arm-uwp=fail -openssl-windows:x64-linux=fail -openssl-windows:x64-osx=fail -openssl-windows:x64-uwp=fail opentracing:arm-uwp=fail opentracing:x64-uwp=fail openvpn3:x64-osx=fail @@ -1123,6 +1183,7 @@ openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail openvr:x64-windows-static=fail +openvr:x64-windows-static-md=fail openxr-loader:arm64-windows=fail openxr-loader:arm-uwp=fail openxr-loader:x64-osx=fail @@ -1134,14 +1195,18 @@ optional-bare:x64-osx = skip optional-bare:x64-uwp = skip optional-bare:x64-windows = skip optional-bare:x64-windows-static = skip +optional-bare:x64-windows-static-md=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail -osgearth:x64-osx=fail osgearth:x64-linux=fail +osgearth:x64-osx=fail osgearth:x64-windows-static=fail +osgearth:x64-windows-static-md=fail +osgearth:x64-windows=fail +osgearth:x86-windows=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pangomm:x64-osx=fail @@ -1151,16 +1216,19 @@ parmetis:x64-osx=fail pdal:x64-linux=fail pdal:x64-osx=fail pdal-c:x64-windows-static=fail +pdal-c:x64-windows-static-md=fail pdcurses:arm-uwp=fail pdcurses:x64-linux=fail pdcurses:x64-osx=fail pdcurses:x64-uwp=fail pdcurses:x64-windows-static=fail +pdcurses:x64-windows-static-md=fail pfring:arm64-windows=fail pfring:arm-uwp=fail pfring:x64-uwp=fail pfring:x64-windows=fail pfring:x64-windows-static=fail +pfring:x64-windows-static-md=fail pfring:x86-windows=fail pfring:x64-osx=fail # pfring on Linux currently fails because its build scripts enable warnings as @@ -1175,10 +1243,12 @@ pistache:x64-osx=fail pistache:x64-uwp=fail pistache:x64-windows=fail pistache:x64-windows-static=fail +pistache:x64-windows-static-md=fail pistache:x86-windows=fail pixel:x64-uwp=fail pixel:x64-windows=fail pixel:x64-windows-static=fail +pixel:x64-windows-static-md=fail pixel:x86-windows=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail @@ -1196,6 +1266,7 @@ pmdk:x64-linux=fail pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail +pmdk:x64-windows-static-md=fail pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail @@ -1208,6 +1279,7 @@ proj4:x64-uwp=fail protobuf-c:x86-windows=fail protobuf-c:x64-windows=fail protobuf-c:x64-windows-static=fail +protobuf-c:x64-windows-static-md=fail protobuf-c:x64-uwp=fail protobuf-c:arm64-windows=fail protobuf-c:arm-uwp=fail @@ -1219,14 +1291,12 @@ python2:arm-uwp=fail python2:x64-linux=fail python2:x64-osx=fail python2:x64-uwp=fail -python3:arm64-windows=fail -python3:arm-uwp=fail -python3:x64-uwp=fail qhull:x64-uwp=fail qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail +qpid-proton:x64-windows-static-md=fail qt5-activeqt:x64-linux=fail qt5-activeqt:x64-osx=fail # Skip deprecated Qt module @@ -1235,10 +1305,12 @@ qt5-canvas3d:x64-linux=skip qt5-canvas3d:x64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip +qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail qt5-macextras:x64-windows-static=fail +qt5-macextras:x64-windows-static-md=fail qt5-macextras:x86-windows=fail # Missing system libraries qt5-wayland:x64-osx=fail @@ -1246,6 +1318,7 @@ qt5-wayland:x64-osx=fail qt5-wayland:x86-windows=fail qt5-wayland:x64-windows=fail qt5-wayland:x64-windows-static=fail +qt5-wayland:x64-windows-static-md=fail qt5-winextras:x64-linux=fail qt5-winextras:x64-osx=fail # Missing prerequisites for CI success @@ -1259,26 +1332,21 @@ qt5-webengine:x64-windows=skip qt5-webengine:x86-windows=skip # Static builds of qt5-webengine are not supported by the port itself qt5-webengine:x64-windows-static=skip +qt5-webengine:x64-windows-static-md=skip # Missing system libraries qt5-x11extras:x64-osx=fail # Missing libraries qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail +qt5-x11extras:x64-windows-static-md=fail quickfix:arm-uwp=fail quickfix:arm64-windows=fail quickfix:x64-uwp=fail quickfix:x64-windows-static=fail +quickfix:x64-windows-static-md=fail quickfix:x64-windows=fail quickfix:x86-windows=fail -quirc:arm64-windows = skip -quirc:arm-uwp = skip -quirc:x64-linux = skip -quirc:x64-osx = skip -quirc:x64-uwp = skip -quirc:x64-windows = skip -quirc:x64-windows-static = skip -quirc:x86-windows = skip qwt:x64-osx=fail rabit:x64-osx=fail ragel:arm-uwp=fail @@ -1290,6 +1358,7 @@ range-v3-vs2015:x64-osx = skip range-v3-vs2015:x64-uwp = skip range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip +range-v3-vs2015:x64-windows-static-md=skip range-v3-vs2015:x86-windows = skip rapidstring:arm64-windows=fail rapidstring:arm-uwp=fail @@ -1297,6 +1366,7 @@ rapidstring:x64-linux=fail rapidstring:x64-uwp=fail rapidstring:x64-windows=fail rapidstring:x64-windows-static=fail +rapidstring:x64-windows-static-md=fail rapidstring:x86-windows=fail raylib:arm64-windows=fail raylib:arm-uwp=fail @@ -1320,6 +1390,7 @@ restbed:x64-uwp=fail rest-rpc:x86-windows=skip rest-rpc:x64-windows=skip rest-rpc:x64-windows-static=skip +rest-rpc:x64-windows-static-md=skip rest-rpc:x64-uwp=skip rest-rpc:arm-uwp=skip rest-rpc:arm64-windows=skip @@ -1333,6 +1404,7 @@ rpclib:arm-uwp=fail rpclib:x64-uwp=fail rsocket:x64-windows=fail rsocket:x64-windows-static=fail +rsocket:x64-windows-static-md=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail @@ -1348,12 +1420,14 @@ ryml:x64-osx=fail ryu:arm-uwp=fail ryu:x64-uwp=fail ryu:x64-windows-static=fail +ryu:x64-windows-static-md=fail ryu:x86-windows=fail ryu::arm64-windows=fail sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-uwp=fail sciter:x64-windows-static=fail +sciter:x64-windows-static-md=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail scylla-wrapper:arm-uwp=fail @@ -1361,6 +1435,7 @@ scylla-wrapper:x64-linux=fail scylla-wrapper:x64-osx=fail scylla-wrapper:x64-uwp=fail scylla-wrapper:x64-windows-static=fail +scylla-wrapper:x64-windows-static-md=fail sdformat6:arm64-windows=fail sdformat6:arm-uwp=fail sdformat6:x64-uwp=fail @@ -1391,6 +1466,7 @@ sfml:arm64-windows=fail shapelib:arm-uwp=fail shapelib:x64-uwp=fail shiva:x64-windows-static=fail +shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail shiva-sfml:x64-osx=fail shiva-sfml:x86-windows=fail @@ -1401,6 +1477,7 @@ shogun:x64-osx = skip shogun:x64-uwp = skip shogun:x64-windows = skip shogun:x64-windows-static = skip +shogun:x64-windows-static-md=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail @@ -1427,6 +1504,7 @@ soil:arm64-windows=skip soil:x64-windows=skip soil:x86-windows=skip soil:x64-windows-static=skip +soil:x64-windows-static-md=skip soil:x64-linux=skip soil:x64-osx=skip soil2:arm-uwp=fail @@ -1437,6 +1515,7 @@ soqt:x64-uwp=fail soundtouch:arm-uwp=fail soundtouch:x64-uwp=fail soundtouch:x64-windows-static=fail +soundtouch:x64-windows-static-md=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail @@ -1447,6 +1526,7 @@ spdk-dpdk:x64-osx=fail spdk-dpdk:x64-uwp=fail spdk-dpdk:x64-windows=fail spdk-dpdk:x64-windows-static=fail +spdk-dpdk:x64-windows-static-md=fail spdk-dpdk:x86-windows=fail spdk-ipsec:arm64-windows=fail spdk-ipsec:arm-uwp=fail @@ -1454,6 +1534,7 @@ spdk-ipsec:x64-osx=fail spdk-ipsec:x64-uwp=fail spdk-ipsec:x64-windows=fail spdk-ipsec:x64-windows-static=fail +spdk-ipsec:x64-windows-static-md=fail spdk-ipsec:x86-windows=fail spdk-isal:arm64-windows=fail spdk-isal:arm-uwp=fail @@ -1461,19 +1542,16 @@ spdk-isal:x64-osx=fail spdk-isal:x64-uwp=fail spdk-isal:x64-windows=fail spdk-isal:x64-windows-static=fail +spdk-isal:x64-windows-static-md=fail spdk-isal:x86-windows=fail -speexdsp:x64-linux=fail -speexdsp:x64-osx=fail spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail stormlib:x64-uwp=fail stxxl:arm-uwp=fail stxxl:x64-uwp=fail -# Sundials was broken by Ninja 1.9.0 https://github.com/ninja-build/ninja/pull/1406 -sundials:arm64-windows=fail -sundials:x64-windows=fail -sundials:x86-windows=fail +symengine:arm64-windows=fail +symengine:arm-uwp=fail systemc:arm64-windows=fail systemc:arm-uwp=fail systemc:x64-uwp=fail @@ -1483,7 +1561,6 @@ tbb:x64-uwp=fail tcl:arm-uwp=fail tcl:arm64-windows=fail tcl:x64-uwp=fail -tcl:x64-osx=fail teemo:x64-uwp=fail teemo:arm-uwp=fail teemo:arm64-windows=fail @@ -1492,11 +1569,13 @@ telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail tesseract:x64-windows=fail tesseract:x64-windows-static=fail +tesseract:x64-windows-static-md=fail tesseract:x86-windows=fail tesseract:arm64-windows=fail tfhe:x86-windows=fail tfhe:x64-windows=fail tfhe:x64-windows-static=fail +tfhe:x64-windows-static-md=fail tfhe:x64-uwp=fail tfhe:arm64-windows=fail tfhe:arm-uwp=fail @@ -1505,6 +1584,7 @@ theia:arm-uwp = skip theia:x64-uwp = skip theia:x64-windows = skip theia:x64-windows-static = skip +theia:x64-windows-static-md=skip theia:x86-windows = skip thor:x64-linux=fail thor:x64-osx=fail @@ -1525,19 +1605,23 @@ tmxparser:arm-uwp=fail tmxparser:x64-uwp=fail tmxparser:x64-windows=fail tmxparser:x64-windows-static=fail +tmxparser:x64-windows-static-md=fail tmxparser:x86-windows=fail torch-th:arm64-windows=fail torch-th:arm-uwp=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail +torch-th:x64-windows-static-md=fail tre:x64-osx=fail treehopper:x64-windows-static=fail +treehopper:x64-windows-static-md=fail treehopper:x64-linux=fail turbobase64:arm64-windows=fail turbobase64:arm-uwp=fail turbobase64:x64-uwp=fail turbobase64:x64-windows=fail turbobase64:x64-windows-static=fail +turbobase64:x64-windows-static-md=fail turbobase64:x86-windows=fail unicorn:arm64-windows=fail unicorn:arm-uwp=fail @@ -1554,6 +1638,7 @@ unixodbc:arm-uwp=fail unixodbc:x64-uwp=fail unixodbc:x64-windows=fail unixodbc:x64-windows-static=fail +unixodbc:x64-windows-static-md=fail unixodbc:x86-windows=fail unrar:arm64-windows=fail unrar:arm-uwp=fail @@ -1561,15 +1646,14 @@ unrar:x64-linux=fail unrar:x64-osx=fail unrar:x64-uwp=fail unrar:x64-windows-static=fail +unrar:x64-windows-static-md=fail urdfdom:x64-windows-static=fail +urdfdom:x64-windows-static-md=fail usd:x86-windows=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail -uvatlas:arm64-windows=fail -uvatlas:arm-uwp=fail +# uvatlas requires GCC 9 or later for linux support uvatlas:x64-linux=fail -uvatlas:x64-osx=fail -uvatlas:x64-windows-static=fail v8:arm64-windows=fail v8:arm-uwp=fail v8:x64-osx=fail @@ -1584,6 +1668,7 @@ vulkan:x64-osx=fail vulkan:x64-uwp=fail vulkan:x64-windows=fail vulkan:x64-windows-static=fail +vulkan:x64-windows-static-md=fail vulkan:x86-windows=fail # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) # conflicts with qt5-location @@ -1594,12 +1679,9 @@ vxl:x64-osx = skip vxl:x64-uwp = skip vxl:x64-windows = skip vxl:x64-windows-static = skip +vxl:x64-windows-static-md=skip vxl:x86-windows = skip wampcc:arm64-windows=fail -wepoll:arm-uwp=fail -wepoll:x64-uwp=fail -wepoll:x64-linux=fail -wepoll:x64-osx=fail wildmidi:x64-osx=fail wincrypt:x64-linux=fail wincrypt:x64-osx=fail @@ -1610,6 +1692,7 @@ winpcap:x64-osx=fail winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip +winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail @@ -1622,6 +1705,7 @@ wintoast:x64-uwp=fail woff2:x64-linux=fail woff2:x64-osx=fail woff2:x64-windows-static=fail +woff2:x64-windows-static-md=fail wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail @@ -1634,6 +1718,7 @@ x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-uwp=fail xalan-c:x64-windows-static=fail +xalan-c:x64-windows-static-md=fail xalan-c:arm64-windows=fail xbyak:arm64-windows=fail xbyak:arm-uwp=fail @@ -1650,12 +1735,9 @@ xmsh:x64-linux=skip xmsh:x64-osx=skip xmsh:x64-uwp=skip xmsh:x64-windows-static=skip +xmsh:x64-windows-static-md=skip xmsh:x64-windows=skip xmsh:x86-windows=skip -x-plane:arm64-windows=fail -x-plane:arm-uwp=fail -x-plane:x64-linux=fail -x-plane:x86-windows=fail yajl:arm-uwp=fail yajl:x64-uwp=fail yara:arm-uwp=fail @@ -1677,6 +1759,7 @@ zeromq:x64-uwp=fail zkpp:x86-windows=fail zkpp:x64-windows=fail zkpp:x64-windows-static=fail +zkpp:x64-windows-static-md=fail zkpp:arm64-windows=fail zkpp:x64-uwp=fail zkpp:arm-uwp=fail @@ -1693,6 +1776,7 @@ ctp:x64-osx=skip ctp:x64-uwp=skip ctp:x64-windows=skip ctp:x64-windows-static=skip +ctp:x64-windows-static-md=skip ctp:x86-windows=skip protozero:arm-uwp=fail protozero:x64-uwp=fail @@ -1701,8 +1785,45 @@ protozero:x64-uwp=fail clapack:x64-linux=skip clapack:x64-osx=skip clapack:x64-windows-static=skip +clapack:x64-windows-static-md=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack:x64-uwp=skip lapack-reference:arm64-windows=skip lapack-reference:arm-uwp=skip + + +# failures for x64-windows-static-md +ace:x64-windows-static-md=fail +activemq-cpp:x64-windows-static-md=fail +akali:x64-windows-static-md=fail +chromium-base:x64-windows-static-md=fail +clockutils:x64-windows-static-md=fail +fastcgi:x64-windows-static-md=fail +gmp:x64-windows-static-md=fail +graphqlparser:x64-windows-static-md=fail +ijg-libjpeg:x64-windows-static-md=fail +keystone:x64-windows-static-md=fail +libcerf:x64-windows-static-md=fail +libgo:x64-windows-static-md=fail +libmicrohttpd:x64-windows-static-md=fail +libspatialite:x64-windows-static-md=fail +linenoise-ng:x64-windows-static-md=fail +mmloader:x64-windows-static-md=fail +mpg123:x64-windows-static-md=fail +netcdf-cxx4:x64-windows-static-md=fail +open62541:x64-windows-static-md=fail +pngpp:x64-windows-static-md=fail +portmidi:x64-windows-static-md=fail +pthreads:x64-windows-static-md=fail +qt5-tools:x64-windows-static-md=fail +quantlib:x64-windows-static-md=fail +readosm:x64-windows-static-md=fail +sentencepiece:x64-windows-static-md=fail +spirv-tools:x64-windows-static-md=fail +symengine:x64-windows-static-md=fail +teemo:x64-windows-static-md=fail +unicorn:x64-windows-static-md=fail +v8:x64-windows-static-md=fail +yato:x64-windows-static-md=fail +zyre:x64-windows-static-md=fail From 75f65fdca8f11fc56f6e95eaeaa6e60d2376204b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 13:12:25 +0100 Subject: [PATCH 025/182] fix a lot of small details. increment controls. --- ports/atk/fix-linux-config.patch | 22 -- ports/atkmm/fix_charset.patch | 98 ------ ports/atkmm/fix_properties.patch | 306 ------------------ ports/atkmm/msvc_recommended_pragmas.h | 34 -- ports/atkmm/portfile.cmake | 36 --- ports/cairo/CONTROL | 2 +- ports/glib/arm64-defines.patch | 78 ----- ports/glib/cmake/install_headers.cmake | 255 --------------- .../cmake/unofficial-glib-config.in.cmake | 7 - ports/glib/fix-arm-builds.patch | 46 --- ports/glib/fix_pkgconfig.patch | 30 -- ports/glib/portfile.cmake | 8 +- ports/glib/remove_tests.patch | 34 -- ports/gmime/CMakeLists.txt | 2 +- ports/gmime/CONTROL | 2 +- ports/lcm/CONTROL | 2 +- ports/libcroco/CONTROL | 2 +- ports/libnice/CONTROL | 2 +- ports/librsvg/CONTROL | 3 +- ports/tesseract/CONTROL | 2 +- ports/v8/CONTROL | 1 + ports/v8/V8Config-static.cmake | 5 +- 22 files changed, 15 insertions(+), 962 deletions(-) delete mode 100644 ports/atk/fix-linux-config.patch delete mode 100644 ports/atkmm/fix_charset.patch delete mode 100644 ports/atkmm/fix_properties.patch delete mode 100644 ports/atkmm/msvc_recommended_pragmas.h delete mode 100644 ports/glib/arm64-defines.patch delete mode 100644 ports/glib/cmake/install_headers.cmake delete mode 100644 ports/glib/cmake/unofficial-glib-config.in.cmake delete mode 100644 ports/glib/fix-arm-builds.patch delete mode 100644 ports/glib/fix_pkgconfig.patch delete mode 100644 ports/glib/remove_tests.patch diff --git a/ports/atk/fix-linux-config.patch b/ports/atk/fix-linux-config.patch deleted file mode 100644 index ec6a37a8b44277..00000000000000 --- a/ports/atk/fix-linux-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/config.h.in b/config.h.in -index b94d23f..a26dac8 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -5,7 +5,7 @@ - #undef ENABLE_NLS - - /* Define the gettext package to be used */ --#undef GETTEXT_PACKAGE -+#cmakedefine GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" - - /* Define to 1 if you have the `bind_textdomain_codeset' function. */ - #undef HAVE_BIND_TEXTDOMAIN_CODESET -@@ -86,7 +86,7 @@ - #undef STDC_HEADERS - - /* Version number of package */ --#undef VERSION -+#cmakedefine VERSION @VERSION@ - - /* defines how to decorate public symbols while building */ - #undef _ATK_EXTERN diff --git a/ports/atkmm/fix_charset.patch b/ports/atkmm/fix_charset.patch deleted file mode 100644 index 60cd8fbcd6bc6e..00000000000000 --- 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 @@ - atkmm - {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} - Win32Proj -+ 8.1 - - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - -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 @@ - - {07324745-C9BE-4D65-B08A-9C88188C0C28} - Win32Proj -+ 8.1 - - - - Application -- MultiByte -+ Unicode - v120 - - - Application -- MultiByte -+ Unicode - v120 - - - Application -- MultiByte -+ Unicode - v120 - - -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 @@ - {2093D218-190E-4194-9421-3BA7CBF33B10} - install - Win32Proj -+ 8.1 - - - - Utility -- MultiByte -+ Unicode - true - v120 - - - Utility -- MultiByte -+ Unicode - v120 - - - Utility -- MultiByte -+ Unicode - true - v120 - - - Utility -- MultiByte -+ Unicode - v120 - - diff --git a/ports/atkmm/fix_properties.patch b/ports/atkmm/fix_properties.patch deleted file mode 100644 index a0392438690861..00000000000000 --- 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 @@ - - - ATKMM_BUILD -- glibmm-vc$(VSVer)0-2_4.lib;sigc-vc$(VSVer)0-2_0.lib -- glibmm-vc$(VSVer)0-d-2_4.lib;sigc-vc$(VSVer)0-d-2_0.lib - - - <_PropertySheetDisplayName>panogmmbuilddefinesprops -@@ -15,25 +13,19 @@ - - - -- .\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) -+ .\atkmm;..\atk;.;%(AdditionalIncludeDirectories) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - true - /d2Zi+ %(AdditionalOptions) - - -- atk-1.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) -- $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) -+ %(AdditionalDependencies) -+ %(AdditionalLibraryDirectories) - - - - - $(AtkMMBuildDefs) - -- -- $(CPPDepLibsRelease) -- -- -- $(CPPDepLibsDebug) -- - - -\ 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 @@ - - - 12 -- $(SolutionDir)\..\..\vs$(VSVer)\$(Platform) -- $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\ - 1 - 6 -- -vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion) -- -vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion) - - - <_PropertySheetDisplayName>atkmmversionpathsprops -@@ -17,12 +13,6 @@ - - $(VSVer) - -- -- $(GlibEtcInstallRoot) -- -- -- $(CopyDir) -- - - $(DefDir) - -@@ -32,11 +22,5 @@ - - $(ApiMinorVersion) - -- -- $(ReleaseDllSuffix) -- -- -- $(DebugDllSuffix) -- - - -\ 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 @@ - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - -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 @@ - - - -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ - - -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ - - -- -+ - Resource Files - - -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 @@ - - - Application -- MultiByte -+ Unicode - v120 - - diff --git a/ports/atkmm/msvc_recommended_pragmas.h b/ports/atkmm/msvc_recommended_pragmas.h deleted file mode 100644 index c0eb1d5edf4cd5..00000000000000 --- 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 89919d15abb1e4..c5f607c75f6165 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -12,44 +12,8 @@ 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) - - # # 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() - vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} OPTIONS -Dbuild-documentation=false -Dmsvc14x-parallel-installable=false) diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 06877af9b7f25b..84b6258c6475e7 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,6 +1,6 @@ Source: cairo Version: 1.16.0 -Port-Version: 8 +Port-Version: 9 Homepage: https://cairographics.org Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. Build-Depends: zlib, libpng, pixman, freetype, fontconfig diff --git a/ports/glib/arm64-defines.patch b/ports/glib/arm64-defines.patch deleted file mode 100644 index c1b5181c65c077..00000000000000 --- a/ports/glib/arm64-defines.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/config.h.win32 b/config.h.win32 -index 999641d65..531843e0e 100644 ---- a/config.h.win32 -+++ b/config.h.win32 -@@ -728,7 +728,7 @@ - - /* The size of `void *', as computed by sizeof. */ - #ifdef _MSC_VER --#if (defined(_M_X64) || defined(_M_AMD64)) -+#if (defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)) - #define SIZEOF_VOID_P 8 - #elif (defined(_M_IX86)) - #define SIZEOF_VOID_P 4 -diff --git a/config.h.win32.in b/config.h.win32.in -index eaf7e2818..049c5e9f4 100644 ---- a/config.h.win32.in -+++ b/config.h.win32.in -@@ -728,7 +728,7 @@ - - /* The size of `void *', as computed by sizeof. */ - #ifdef _MSC_VER --#if (defined(_M_X64) || defined(_M_AMD64)) -+#if (defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64)) - #define SIZEOF_VOID_P 8 - #elif (defined(_M_IX86)) - #define SIZEOF_VOID_P 4 -diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c -index 9b3619cb1..6400572a2 100644 ---- a/gio/gdbusaddress.c -+++ b/gio/gdbusaddress.c -@@ -1469,7 +1469,7 @@ get_session_address_dbus_launch (GError **error) - wcscat (args, rundll_path); - wcscat (args, L"\" "); - wcscat (args, gio_path_short); --#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) -+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64) - wcscat (args, L",g_win32_run_session_bus"); - #elif defined (_MSC_VER) - wcscat (args, L",_g_win32_run_session_bus@16"); -diff --git a/glib/gatomic.c b/glib/gatomic.c -index e3e49fab4..e257e4377 100644 ---- a/glib/gatomic.c -+++ b/glib/gatomic.c -@@ -474,7 +474,7 @@ gsize - #elif defined (G_PLATFORM_WIN32) - - #include --#if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200) -+#if !defined(_M_ARM64) && !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200) - #define InterlockedAnd _InterlockedAnd - #define InterlockedOr _InterlockedOr - #define InterlockedXor _InterlockedXor -diff --git a/glib/glibconfig.h.win32 b/glib/glibconfig.h.win32 -index d9f893a15..b75a86f10 100644 ---- a/glib/glibconfig.h.win32 -+++ b/glib/glibconfig.h.win32 -@@ -68,7 +68,7 @@ typedef unsigned __int64 guint64; - #define G_GINT64_FORMAT "I64i" - #define G_GUINT64_FORMAT "I64u" - --#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) -+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64) - - #define GLIB_SIZEOF_VOID_P 8 - #define GLIB_SIZEOF_LONG 4 -diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in -index 9a91c5e96..f0b88c976 100644 ---- a/glib/glibconfig.h.win32.in -+++ b/glib/glibconfig.h.win32.in -@@ -68,7 +68,7 @@ typedef unsigned __int64 guint64; - #define G_GINT64_FORMAT "I64i" - #define G_GUINT64_FORMAT "I64u" - --#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) -+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64) - - #define GLIB_SIZEOF_VOID_P 8 - #define GLIB_SIZEOF_LONG 4 diff --git a/ports/glib/cmake/install_headers.cmake b/ports/glib/cmake/install_headers.cmake deleted file mode 100644 index 7840f34ab983b4..00000000000000 --- a/ports/glib/cmake/install_headers.cmake +++ /dev/null @@ -1,255 +0,0 @@ -# generated from glib-install.props -install(FILES glib/glib.h DESTINATION include) -install(FILES ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include) -install(FILES glib/glib-object.h DESTINATION include) -install(FILES glib/deprecated/gallocator.h DESTINATION include/glib/deprecated) -install(FILES glib/deprecated/gcache.h DESTINATION include/glib/deprecated) -install(FILES glib/deprecated/gcompletion.h DESTINATION include/glib/deprecated) -install(FILES glib/deprecated/gmain.h DESTINATION include/glib/deprecated) -install(FILES glib/deprecated/grel.h DESTINATION include/glib/deprecated) -install(FILES glib/deprecated/gthread.h DESTINATION include/glib/deprecated) -install(FILES glib/glib-autocleanups.h DESTINATION include/glib) -install(FILES glib/galloca.h DESTINATION include/glib) -install(FILES glib/garray.h DESTINATION include/glib) -install(FILES glib/gasyncqueue.h DESTINATION include/glib) -install(FILES glib/gatomic.h DESTINATION include/glib) -install(FILES glib/gbacktrace.h DESTINATION include/glib) -install(FILES glib/gbase64.h DESTINATION include/glib) -install(FILES glib/gbitlock.h DESTINATION include/glib) -install(FILES glib/gbookmarkfile.h DESTINATION include/glib) -install(FILES glib/gbytes.h DESTINATION include/glib) -install(FILES glib/gcharset.h DESTINATION include/glib) -install(FILES glib/gchecksum.h DESTINATION include/glib) -install(FILES glib/gconvert.h DESTINATION include/glib) -install(FILES glib/gdataset.h DESTINATION include/glib) -install(FILES glib/gdate.h DESTINATION include/glib) -install(FILES glib/gdatetime.h DESTINATION include/glib) -install(FILES glib/gdir.h DESTINATION include/glib) -install(FILES glib/genviron.h DESTINATION include/glib) -install(FILES glib/gerror.h DESTINATION include/glib) -install(FILES glib/gfileutils.h DESTINATION include/glib) -install(FILES glib/ggettext.h DESTINATION include/glib) -install(FILES glib/ghash.h DESTINATION include/glib) -install(FILES glib/ghmac.h DESTINATION include/glib) -install(FILES glib/ghook.h DESTINATION include/glib) -install(FILES glib/ghostutils.h DESTINATION include/glib) -install(FILES glib/gi18n.h DESTINATION include/glib) -install(FILES glib/gi18n-lib.h DESTINATION include/glib) -install(FILES glib/giochannel.h DESTINATION include/glib) -install(FILES glib/gkeyfile.h DESTINATION include/glib) -install(FILES glib/glist.h DESTINATION include/glib) -install(FILES glib/gmacros.h DESTINATION include/glib) -install(FILES glib/gmain.h DESTINATION include/glib) -install(FILES glib/gmappedfile.h DESTINATION include/glib) -install(FILES glib/gmarkup.h DESTINATION include/glib) -install(FILES glib/gmem.h DESTINATION include/glib) -install(FILES glib/gmessages.h DESTINATION include/glib) -install(FILES glib/gnode.h DESTINATION include/glib) -install(FILES glib/goption.h DESTINATION include/glib) -install(FILES glib/gpattern.h DESTINATION include/glib) -install(FILES glib/gpoll.h DESTINATION include/glib) -install(FILES glib/gprimes.h DESTINATION include/glib) -install(FILES glib/gqsort.h DESTINATION include/glib) -install(FILES glib/gquark.h DESTINATION include/glib) -install(FILES glib/gqueue.h DESTINATION include/glib) -install(FILES glib/grand.h DESTINATION include/glib) -install(FILES glib/gregex.h DESTINATION include/glib) -install(FILES glib/gscanner.h DESTINATION include/glib) -install(FILES glib/gsequence.h DESTINATION include/glib) -install(FILES glib/gshell.h DESTINATION include/glib) -install(FILES glib/gslice.h DESTINATION include/glib) -install(FILES glib/gslist.h DESTINATION include/glib) -install(FILES glib/gspawn.h DESTINATION include/glib) -install(FILES glib/gstdio.h DESTINATION include/glib) -install(FILES glib/gstrfuncs.h DESTINATION include/glib) -install(FILES glib/gtestutils.h DESTINATION include/glib) -install(FILES glib/gstring.h DESTINATION include/glib) -install(FILES glib/gstringchunk.h DESTINATION include/glib) -install(FILES glib/gthread.h DESTINATION include/glib) -install(FILES glib/gthreadpool.h DESTINATION include/glib) -install(FILES glib/gtimer.h DESTINATION include/glib) -install(FILES glib/gtimezone.h DESTINATION include/glib) -install(FILES glib/gtrashstack.h DESTINATION include/glib) -install(FILES glib/gtree.h DESTINATION include/glib) -install(FILES glib/gtypes.h DESTINATION include/glib) -install(FILES glib/gunicode.h DESTINATION include/glib) -install(FILES glib/gurifuncs.h DESTINATION include/glib) -install(FILES glib/gutils.h DESTINATION include/glib) -install(FILES glib/guuid.h DESTINATION include/glib) -install(FILES glib/gvarianttype.h DESTINATION include/glib) -install(FILES glib/gvariant.h DESTINATION include/glib) -install(FILES glib/gversion.h DESTINATION include/glib) -install(FILES glib/gversionmacros.h DESTINATION include/glib) -install(FILES glib/gwin32.h DESTINATION include/glib) -install(FILES glib/gprintf.h DESTINATION include/glib) -install(FILES gmodule/gmodule.h DESTINATION include) -install(FILES gobject/gobject-autocleanups.h DESTINATION include/gobject) -install(FILES gobject/glib-types.h DESTINATION include/gobject) -install(FILES gobject/gbinding.h DESTINATION include/gobject) -install(FILES gobject/gboxed.h DESTINATION include/gobject) -install(FILES gobject/gclosure.h DESTINATION include/gobject) -install(FILES gobject/genums.h DESTINATION include/gobject) -install(FILES gobject/gmarshal.h DESTINATION include/gobject) -install(FILES gobject/gobject.h DESTINATION include/gobject) -install(FILES gobject/gparam.h DESTINATION include/gobject) -install(FILES gobject/gparamspecs.h DESTINATION include/gobject) -install(FILES gobject/gsignal.h DESTINATION include/gobject) -install(FILES gobject/gsourceclosure.h DESTINATION include/gobject) -install(FILES gobject/gtype.h DESTINATION include/gobject) -install(FILES gobject/gtypemodule.h DESTINATION include/gobject) -install(FILES gobject/gtypeplugin.h DESTINATION include/gobject) -install(FILES gobject/gvalue.h DESTINATION include/gobject) -install(FILES gobject/gvaluearray.h DESTINATION include/gobject) -install(FILES gobject/gvaluecollector.h DESTINATION include/gobject) -install(FILES gobject/gvaluetypes.h DESTINATION include/gobject) -install(FILES gobject/gobjectnotifyqueue.c DESTINATION include/gobject) -install(FILES gio/gappinfo.h DESTINATION include/gio) -install(FILES gio/gasyncinitable.h DESTINATION include/gio) -install(FILES gio/gasyncresult.h DESTINATION include/gio) -install(FILES gio/gbufferedinputstream.h DESTINATION include/gio) -install(FILES gio/gbufferedoutputstream.h DESTINATION include/gio) -install(FILES gio/gbytesicon.h DESTINATION include/gio) -install(FILES gio/gcancellable.h DESTINATION include/gio) -install(FILES gio/gcontenttype.h DESTINATION include/gio) -install(FILES gio/gcharsetconverter.h DESTINATION include/gio) -install(FILES gio/gconverter.h DESTINATION include/gio) -install(FILES gio/gconverterinputstream.h DESTINATION include/gio) -install(FILES gio/gconverteroutputstream.h DESTINATION include/gio) -install(FILES gio/gdatagrambased.h DESTINATION include/gio) -install(FILES gio/gdatainputstream.h DESTINATION include/gio) -install(FILES gio/gdataoutputstream.h DESTINATION include/gio) -install(FILES gio/gdrive.h DESTINATION include/gio) -install(FILES gio/gemblem.h DESTINATION include/gio) -install(FILES gio/gemblemedicon.h DESTINATION include/gio) -install(FILES gio/gfile.h DESTINATION include/gio) -install(FILES gio/gfileattribute.h DESTINATION include/gio) -install(FILES gio/gfileenumerator.h DESTINATION include/gio) -install(FILES gio/gfileicon.h DESTINATION include/gio) -install(FILES gio/gfileinfo.h DESTINATION include/gio) -install(FILES gio/gfileinputstream.h DESTINATION include/gio) -install(FILES gio/gfilemonitor.h DESTINATION include/gio) -install(FILES gio/gfilenamecompleter.h DESTINATION include/gio) -install(FILES gio/gfileoutputstream.h DESTINATION include/gio) -install(FILES gio/gfileiostream.h DESTINATION include/gio) -install(FILES gio/gfilterinputstream.h DESTINATION include/gio) -install(FILES gio/gfilteroutputstream.h DESTINATION include/gio) -install(FILES gio/gicon.h DESTINATION include/gio) -install(FILES gio/ginetaddress.h DESTINATION include/gio) -install(FILES gio/ginetaddressmask.h DESTINATION include/gio) -install(FILES gio/ginetsocketaddress.h DESTINATION include/gio) -install(FILES gio/ginputstream.h DESTINATION include/gio) -install(FILES gio/ginitable.h DESTINATION include/gio) -install(FILES gio/gio.h DESTINATION include/gio) -install(FILES gio/gio-autocleanups.h DESTINATION include/gio) -install(FILES gio/giotypes.h DESTINATION include/gio) -install(FILES gio/gioenums.h DESTINATION include/gio) -install(FILES gio/gioerror.h DESTINATION include/gio) -install(FILES gio/giomodule.h DESTINATION include/gio) -install(FILES gio/gioscheduler.h DESTINATION include/gio) -install(FILES gio/giostream.h DESTINATION include/gio) -install(FILES gio/gloadableicon.h DESTINATION include/gio) -install(FILES gio/gmount.h DESTINATION include/gio) -install(FILES gio/gmemoryinputstream.h DESTINATION include/gio) -install(FILES gio/gmemoryoutputstream.h DESTINATION include/gio) -install(FILES gio/gmountoperation.h DESTINATION include/gio) -install(FILES gio/gnativevolumemonitor.h DESTINATION include/gio) -install(FILES gio/gnetworkaddress.h DESTINATION include/gio) -install(FILES gio/gnetworkmonitor.h DESTINATION include/gio) -install(FILES gio/gnetworkservice.h DESTINATION include/gio) -install(FILES gio/goutputstream.h DESTINATION include/gio) -install(FILES gio/gpermission.h DESTINATION include/gio) -install(FILES gio/gpollableinputstream.h DESTINATION include/gio) -install(FILES gio/gpollableoutputstream.h DESTINATION include/gio) -install(FILES gio/gpollableutils.h DESTINATION include/gio) -install(FILES gio/gproxyaddress.h DESTINATION include/gio) -install(FILES gio/gproxy.h DESTINATION include/gio) -install(FILES gio/gproxyaddressenumerator.h DESTINATION include/gio) -install(FILES gio/gproxyresolver.h DESTINATION include/gio) -install(FILES gio/gresolver.h DESTINATION include/gio) -install(FILES gio/gresource.h DESTINATION include/gio) -install(FILES gio/gseekable.h DESTINATION include/gio) -install(FILES gio/gsimpleasyncresult.h DESTINATION include/gio) -install(FILES gio/gsimpleiostream.h DESTINATION include/gio) -install(FILES gio/gsimplepermission.h DESTINATION include/gio) -install(FILES gio/gsocket.h DESTINATION include/gio) -install(FILES gio/gsocketaddress.h DESTINATION include/gio) -install(FILES gio/gsocketaddressenumerator.h DESTINATION include/gio) -install(FILES gio/gsocketclient.h DESTINATION include/gio) -install(FILES gio/gsocketconnectable.h DESTINATION include/gio) -install(FILES gio/gsocketconnection.h DESTINATION include/gio) -install(FILES gio/gsocketcontrolmessage.h DESTINATION include/gio) -install(FILES gio/gsocketlistener.h DESTINATION include/gio) -install(FILES gio/gsocketservice.h DESTINATION include/gio) -install(FILES gio/gsrvtarget.h DESTINATION include/gio) -install(FILES gio/gsimpleproxyresolver.h DESTINATION include/gio) -install(FILES gio/gtask.h DESTINATION include/gio) -install(FILES gio/gsubprocess.h DESTINATION include/gio) -install(FILES gio/gsubprocesslauncher.h DESTINATION include/gio) -install(FILES gio/gtcpconnection.h DESTINATION include/gio) -install(FILES gio/gtcpwrapperconnection.h DESTINATION include/gio) -install(FILES gio/gthreadedsocketservice.h DESTINATION include/gio) -install(FILES gio/gthemedicon.h DESTINATION include/gio) -install(FILES gio/gtlsbackend.h DESTINATION include/gio) -install(FILES gio/gtlscertificate.h DESTINATION include/gio) -install(FILES gio/gtlsclientconnection.h DESTINATION include/gio) -install(FILES gio/gtlsconnection.h DESTINATION include/gio) -install(FILES gio/gtlsdatabase.h DESTINATION include/gio) -install(FILES gio/gtlsfiledatabase.h DESTINATION include/gio) -install(FILES gio/gtlsinteraction.h DESTINATION include/gio) -install(FILES gio/gtlspassword.h DESTINATION include/gio) -install(FILES gio/gtlsserverconnection.h DESTINATION include/gio) -install(FILES gio/gdtlsconnection.h DESTINATION include/gio) -install(FILES gio/gdtlsclientconnection.h DESTINATION include/gio) -install(FILES gio/gdtlsserverconnection.h DESTINATION include/gio) -install(FILES gio/gvfs.h DESTINATION include/gio) -install(FILES gio/gvolume.h DESTINATION include/gio) -install(FILES gio/gvolumemonitor.h DESTINATION include/gio) -install(FILES gio/gzlibcompressor.h DESTINATION include/gio) -install(FILES gio/gzlibdecompressor.h DESTINATION include/gio) -install(FILES gio/glistmodel.h DESTINATION include/gio) -install(FILES gio/gliststore.h DESTINATION include/gio) -install(FILES gio/gapplication.h DESTINATION include/gio) -install(FILES gio/gapplicationcommandline.h DESTINATION include/gio) -install(FILES gio/gactiongroup.h DESTINATION include/gio) -install(FILES gio/gactionmap.h DESTINATION include/gio) -install(FILES gio/gsimpleactiongroup.h DESTINATION include/gio) -install(FILES gio/gremoteactiongroup.h DESTINATION include/gio) -install(FILES gio/gactiongroupexporter.h DESTINATION include/gio) -install(FILES gio/gdbusactiongroup.h DESTINATION include/gio) -install(FILES gio/gaction.h DESTINATION include/gio) -install(FILES gio/gpropertyaction.h DESTINATION include/gio) -install(FILES gio/gsimpleaction.h DESTINATION include/gio) -install(FILES gio/gmenumodel.h DESTINATION include/gio) -install(FILES gio/gmenu.h DESTINATION include/gio) -install(FILES gio/gmenuexporter.h DESTINATION include/gio) -install(FILES gio/gdbusmenumodel.h DESTINATION include/gio) -install(FILES gio/gnotification.h DESTINATION include/gio) -install(FILES gio/gsettingsbackend.h DESTINATION include/gio) -install(FILES gio/gsettingsschema.h DESTINATION include/gio) -install(FILES gio/gsettings.h DESTINATION include/gio) -install(FILES gio/gdbusauthobserver.h DESTINATION include/gio) -install(FILES gio/gcredentials.h DESTINATION include/gio) -install(FILES gio/gdbusutils.h DESTINATION include/gio) -install(FILES gio/gdbuserror.h DESTINATION include/gio) -install(FILES gio/gdbusaddress.h DESTINATION include/gio) -install(FILES gio/gdbusconnection.h DESTINATION include/gio) -install(FILES gio/gdbusmessage.h DESTINATION include/gio) -install(FILES gio/gdbusnameowning.h DESTINATION include/gio) -install(FILES gio/gdbusnamewatching.h DESTINATION include/gio) -install(FILES gio/gdbusproxy.h DESTINATION include/gio) -install(FILES gio/gdbusintrospection.h DESTINATION include/gio) -install(FILES gio/gdbusmethodinvocation.h DESTINATION include/gio) -install(FILES gio/gdbusserver.h DESTINATION include/gio) -install(FILES gio/gdbusinterface.h DESTINATION include/gio) -install(FILES gio/gdbusinterfaceskeleton.h DESTINATION include/gio) -install(FILES gio/gdbusobject.h DESTINATION include/gio) -install(FILES gio/gdbusobjectskeleton.h DESTINATION include/gio) -install(FILES gio/gdbusobjectproxy.h DESTINATION include/gio) -install(FILES gio/gdbusobjectmanager.h DESTINATION include/gio) -install(FILES gio/gdbusobjectmanagerclient.h DESTINATION include/gio) -install(FILES gio/gdbusobjectmanagerserver.h DESTINATION include/gio) -install(FILES gio/gtestdbus.h DESTINATION include/gio) -install(FILES gio/gioenumtypes.h DESTINATION include/gio) -install(FILES ${CMAKE_BINARY_DIR}/config/gio/gnetworking.h DESTINATION include/gio) -install(FILES gio/gwin32inputstream.h DESTINATION include/gio) -install(FILES gio/gwin32outputstream.h DESTINATION include/gio) diff --git a/ports/glib/cmake/unofficial-glib-config.in.cmake b/ports/glib/cmake/unofficial-glib-config.in.cmake deleted file mode 100644 index 6edc8348be7e34..00000000000000 --- a/ports/glib/cmake/unofficial-glib-config.in.cmake +++ /dev/null @@ -1,7 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(Iconv) -if(NOT WIN32) - find_dependency(Threads) -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-glib-targets.cmake") diff --git a/ports/glib/fix-arm-builds.patch b/ports/glib/fix-arm-builds.patch deleted file mode 100644 index 257ee75c6b35c9..00000000000000 --- a/ports/glib/fix-arm-builds.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/gio/tests/plugin_resources.c b/gio/tests/plugin_resources.c -index 4c1b0214b..bbfc7ae07 100644 ---- a/gio/tests/plugin_resources.c -+++ b/gio/tests/plugin_resources.c -@@ -80,13 +80,13 @@ GResource *_g_plugin_get_resource (void) - */ - - /* We need to account for differences between the mangling of symbols -- * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed -- * with an underscore but symbols on x64 are not. -+ * for x86 and x64/ARM/ARM64 programs, as symbols on x86 are prefixed -+ * with an underscore but symbols on x64/ARM/ARM64 are not. - */ --#ifdef _WIN64 --#define G_MSVC_SYMBOL_PREFIX "" --#else -+#ifdef _M_IX86 - #define G_MSVC_SYMBOL_PREFIX "_" -+#else -+#define G_MSVC_SYMBOL_PREFIX "" - #endif - - #define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) -diff --git a/glib/gconstructor.h b/glib/gconstructor.h -index dccb0314c..fa1139302 100644 ---- a/glib/gconstructor.h -+++ b/glib/gconstructor.h -@@ -40,13 +40,13 @@ - */ - - /* We need to account for differences between the mangling of symbols -- * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed -- * with an underscore but symbols on x64 are not. -+ * for x86 and x64/ARM/ARM64 programs, as symbols on x86 are prefixed -+ * with an underscore but symbols on x64/ARM/ARM64 are not. - */ --#ifdef _WIN64 --#define G_MSVC_SYMBOL_PREFIX "" --#else -+#ifdef _M_IX86 - #define G_MSVC_SYMBOL_PREFIX "_" -+#else -+#define G_MSVC_SYMBOL_PREFIX "" - #endif - - #define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) diff --git a/ports/glib/fix_pkgconfig.patch b/ports/glib/fix_pkgconfig.patch deleted file mode 100644 index e429120f23323f..00000000000000 --- a/ports/glib/fix_pkgconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/gio-unix-2.0.pc.in b/gio-unix-2.0.pc.in -index fba58e2..2d015f6 100644 ---- a/gio-unix-2.0.pc.in -+++ b/gio-unix-2.0.pc.in -@@ -8,4 +8,4 @@ Description: unix specific headers for glib I/O library - Version: @VERSION@ - Requires: gobject-2.0,gio-2.0 - Libs: -L${libdir} -lgio-2.0 --Cflags: -I${includedir}/gio-unix-2.0/ -+Cflags: -I${includedir}/gio -diff --git a/gio-windows-2.0.pc.in b/gio-windows-2.0.pc.in -index 77eecdf..25bb0ae 100644 ---- a/gio-windows-2.0.pc.in -+++ b/gio-windows-2.0.pc.in -@@ -8,4 +8,4 @@ Description: Windows specific headers for glib I/O library - Version: @VERSION@ - Requires: gobject-2.0,gmodule-no-export-2.0,gio-2.0 - Libs: -L${libdir} -lgio-2.0 --Cflags: -I${includedir}/gio-win32-2.0/ -+Cflags: -I${includedir}/gio -diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in -index 275fc01..1bfd74a 100644 ---- a/glib-2.0.pc.in -+++ b/glib-2.0.pc.in -@@ -13,4 +13,4 @@ Version: @VERSION@ - Requires.private: @PCRE_REQUIRES@ - Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ - Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@ --Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ -+Cflags: -I${includedir}/glib @GLIB_EXTRA_CFLAGS@ diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index f296010e83df54..cfaadb1ac16089 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -19,11 +19,7 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} REF ${GLIB_VERSION} PATCHES - #remove_tests.patch - #use-libiconv-on-windows.patch - #arm64-defines.patch - #fix-arm-builds.patch - #fix_pkgconfig.patch + use-libiconv-on-windows.patch ) @@ -108,7 +104,7 @@ endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") endif() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/glib/remove_tests.patch b/ports/glib/remove_tests.patch deleted file mode 100644 index a0a66532dcf862..00000000000000 --- a/ports/glib/remove_tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/gio/meson.build b/gio/meson.build -index 40a9ca6d0..538652e61 100644 ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -1002,9 +1002,9 @@ if enable_systemtap - endif - - subdir('fam') --if build_tests -- subdir('tests') --endif -+#if build_tests -+# subdir('tests') -+#endif - - # The following is an example for building internal marshallers that are used - # by GIO. We cannot guarantee glib-genmarshal availability while building GLib -diff --git a/meson.build b/meson.build -index 947a4058c..ad4f5793e 100644 ---- a/meson.build -+++ b/meson.build -@@ -2295,9 +2295,9 @@ subdir('gthread') - subdir('gmodule') - subdir('gio') - subdir('fuzzing') --if build_tests -- subdir('tests') --endif -+#if build_tests -+# subdir('tests') -+#endif - - # xgettext is optional (on Windows for instance) - if find_program('xgettext', required : get_option('nls')).found() diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt index dfea8328b39b61..b957e4656e5fba 100644 --- a/ports/gmime/CMakeLists.txt +++ b/ports/gmime/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.8) project(gmime C) diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL index 301f303e3f8bb7..b14eeeeec05e67 100644 --- a/ports/gmime/CONTROL +++ b/ports/gmime/CONTROL @@ -1,6 +1,6 @@ Source: gmime Version: 3.2.6 -Port-Version: 1 +Port-Version: 2 Build-Depends: zlib, glib, libiconv, libidn2 Homepage: https://developer.gnome.org/gmime/ Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME). diff --git a/ports/lcm/CONTROL b/ports/lcm/CONTROL index 6a20be1dbf0173..0c4c82ed82cd7e 100644 --- a/ports/lcm/CONTROL +++ b/ports/lcm/CONTROL @@ -1,6 +1,6 @@ Source: lcm Version: 1.4.0 -Port-Version: 1 +Port-Version: 2 Build-Depends: glib Homepage: https://github.com/lcm-proj/lcm Description: Lightweight Communications and Marshalling (LCM) diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL index bb1ea8fd29376b..cf566c7001ad96 100644 --- a/ports/libcroco/CONTROL +++ b/ports/libcroco/CONTROL @@ -1,5 +1,5 @@ Source: libcroco Version: 0.6.13 -Port-Version: 2 +Port-Version: 3 Description: A standalone css2 parsing and manipulation library Build-Depends: glib, libxml2 diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL index 106ee6064d9f94..e45fc9b57f2e4d 100644 --- a/ports/libnice/CONTROL +++ b/ports/libnice/CONTROL @@ -1,6 +1,6 @@ Source: libnice Version: 0.1.15 -Port-Version: 6 +Port-Version: 7 Homepage: https://nice.freedesktop.org Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389). Build-Depends: glib, openssl diff --git a/ports/librsvg/CONTROL b/ports/librsvg/CONTROL index 380186c6eccec0..b26ed9d696424a 100644 --- a/ports/librsvg/CONTROL +++ b/ports/librsvg/CONTROL @@ -1,5 +1,6 @@ Source: librsvg -Version: 2.40.20-2 +Version: 2.40.20 +Port-Version: 3 Homepage: https://gitlab.gnome.org/GNOME/librsvg Description: A small library to render Scalable Vector Graphics (SVG) Build-Depends: cairo, pango, gdk-pixbuf, libcroco \ No newline at end of file diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 530abc04dc7cea..715682442dbd54 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,6 +1,6 @@ Source: tesseract Version: 4.1.1 -Port-Version: 5 +Port-Version: 6 Homepage: https://github.com/tesseract-ocr/tesseract Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. Build-Depends: leptonica, libarchive diff --git a/ports/v8/CONTROL b/ports/v8/CONTROL index dad60e5ee852c2..727245f89f059d 100644 --- a/ports/v8/CONTROL +++ b/ports/v8/CONTROL @@ -1,5 +1,6 @@ Source: v8 Version: 8.6.395.17 +Port-Version: 1 Homepage: https://v8.dev Description: Google Chrome's JavaScript engine Build-Depends: icu, zlib, glib (linux), pthread (linux) diff --git a/ports/v8/V8Config-static.cmake b/ports/v8/V8Config-static.cmake index d59d3623f9ef5c..6a47593efb6ded 100644 --- a/ports/v8/V8Config-static.cmake +++ b/ports/v8/V8Config-static.cmake @@ -2,12 +2,13 @@ include(CMakeFindDependencyMacro) find_dependency(ICU REQUIRED COMPONENTS in uc dt) find_dependency(ZLIB REQUIRED) if(UNIX) - find_package(unofficial-glib CONFIG REQUIRED) + find_package(PkgConfig REQUIRED) + pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) set(V8_IMPORTED_LINK_INTERFACE_LIBRARIES "ICU::in;ICU::uc;ICU::dt;ZLIB::ZLIB") elseif(WIN32) set(V8_IMPORTED_LINK_INTERFACE_LIBRARIES - "Winmm;DbgHelp;ZLIB::ZLIB;ICU::in;ICU::uc;ICU::dt") + "Winmm;DbgHelp;ZLIB::ZLIB;PkgConfig::GLIB2;ICU::in;ICU::uc;ICU::dt") endif() get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) From 19323422aee22cba73629ac02552e6f689117b32 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 14:22:34 +0100 Subject: [PATCH 026/182] fix harfbuzz & glib --- ports/glib/use-libiconv-on-windows.patch | 14 ++++++++++++++ ports/harfbuzz/CMakeLists.patch | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports/glib/use-libiconv-on-windows.patch b/ports/glib/use-libiconv-on-windows.patch index 927de0bb1d161e..a8ccde0a5ff6c5 100644 --- a/ports/glib/use-libiconv-on-windows.patch +++ b/ports/glib/use-libiconv-on-windows.patch @@ -12,3 +12,17 @@ index 3deac78..134ded9 100644 #endif #ifdef G_PLATFORM_WIN32 +diff --git a/meson.build b/meson.build +index d938ddf51..2ba256115 100644 +--- a/meson.build ++++ b/meson.build +@@ -1914,7 +1914,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack) + # the built-in implementation + iconv_opt = get_option('iconv') + if host_system == 'windows' +- libiconv = [] ++ libiconv = [cc.find_library('iconv')] ++ found_iconv = true + # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need + # any external library for it + if iconv_opt != 'auto' diff --git a/ports/harfbuzz/CMakeLists.patch b/ports/harfbuzz/CMakeLists.patch index ce60acb69e3f2a..a2ee03237d47f3 100644 --- a/ports/harfbuzz/CMakeLists.patch +++ b/ports/harfbuzz/CMakeLists.patch @@ -55,7 +55,7 @@ index 11118595f..257e7c85e 100644 list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) - list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY}) -+ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES }) ++ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES}) - mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY) + mark_as_advanced(ICU_INCLUDE_DIRS ICU_LIBRARIES ) From 02df19a2f82d19d5c930a5a65b41804c1e6081ad Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 14:37:05 +0100 Subject: [PATCH 027/182] bump port version --- ports/libsigcpp-3/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libsigcpp-3/vcpkg.json b/ports/libsigcpp-3/vcpkg.json index f69acc078da0db..c2f0a76afea7ea 100644 --- a/ports/libsigcpp-3/vcpkg.json +++ b/ports/libsigcpp-3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsigcpp-3", "version-string": "3.0.3", + "port-version" : 1 "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", "dependencies": [ From f231f4fcdf094c86f8772997655e75a8ac6d06a8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 14:39:09 +0100 Subject: [PATCH 028/182] update port_versions --- port_versions/a-/atk.json | 5 +++ port_versions/a-/atkmm.json | 5 +++ port_versions/baseline.json | 52 ++++++++++++++++---------------- port_versions/c-/cairo.json | 5 +++ port_versions/g-/gdk-pixbuf.json | 5 +++ port_versions/g-/glib.json | 5 +++ port_versions/g-/glibmm.json | 5 +++ port_versions/g-/gmime.json | 5 +++ port_versions/g-/gts.json | 5 +++ port_versions/h-/harfbuzz.json | 5 +++ port_versions/l-/lcm.json | 5 +++ port_versions/l-/libcroco.json | 5 +++ port_versions/l-/libnice.json | 5 +++ port_versions/l-/librsvg.json | 5 +++ port_versions/l-/libsigcpp.json | 5 +++ port_versions/l-/libxmlpp.json | 5 +++ port_versions/t-/tesseract.json | 5 +++ port_versions/v-/v8.json | 5 +++ 18 files changed, 111 insertions(+), 26 deletions(-) diff --git a/port_versions/a-/atk.json b/port_versions/a-/atk.json index 163f0e3aed978e..8da223d20a37f0 100644 --- a/port_versions/a-/atk.json +++ b/port_versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b658e0ba886cfcc96713280bd9877a8b93eee21d", + "version-string": "2.36.0", + "port-version": 1 + }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/port_versions/a-/atkmm.json b/port_versions/a-/atkmm.json index e239881ae79757..bb867d976666ef 100644 --- a/port_versions/a-/atkmm.json +++ b/port_versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66a68879d7bdfcc46089201456e2c9e83a54f490", + "version-string": "2.36.0", + "port-version": 1 + }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d304104c5dd36d..f660447bebf3ca 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 1 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 1 }, "atlmfc": { "baseline": "0", @@ -1042,7 +1042,7 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 8 + "port-version": 9 }, "cairomm": { "baseline": "1.15.3", @@ -2073,8 +2073,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.36.9", + "port-version": 8 }, "genann": { "baseline": "2019-07-10", @@ -2157,12 +2157,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 25 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2190,7 +2190,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2281,8 +2281,8 @@ "port-version": 5 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2309,7 +2309,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.7.2", + "baseline": "2.7.4", "port-version": 1 }, "hayai": { @@ -2770,7 +2770,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -2862,7 +2862,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -3130,7 +3130,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3261,8 +3261,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 3 }, "librsync": { "baseline": "2020-09-16", @@ -3285,8 +3285,8 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", @@ -3453,8 +3453,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0", + "port-version": 1 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -5626,7 +5626,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 5 + "port-version": 6 }, "tfhe": { "baseline": "1.0.1-1", @@ -5958,7 +5958,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", diff --git a/port_versions/c-/cairo.json b/port_versions/c-/cairo.json index aefdf577b92b33..0d52573edb460a 100644 --- a/port_versions/c-/cairo.json +++ b/port_versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb3093314176710a915998ef27b486dfd6a0a1f9", + "version-string": "1.16.0", + "port-version": 9 + }, { "git-tree": "b3a1d73d5c8c18a8c6512385b59d40719f963c8c", "version-string": "1.16.0", diff --git a/port_versions/g-/gdk-pixbuf.json b/port_versions/g-/gdk-pixbuf.json index b97d4dc18f7215..2a61770197ba9c 100644 --- a/port_versions/g-/gdk-pixbuf.json +++ b/port_versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59fe81bc77c0b43e3fbf6c6746cf8fe3e6ffe3de", + "version-string": "2.36.9", + "port-version": 8 + }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/port_versions/g-/glib.json b/port_versions/g-/glib.json index 9cfd59ea012ad3..65b12610c67460 100644 --- a/port_versions/g-/glib.json +++ b/port_versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a23636f1e88189934404d411e1934b697039bb3b", + "version-string": "2.66.4", + "port-version": 0 + }, { "git-tree": "5cadd8fd83d64bc11b551994268c796eabf629b6", "version-string": "2.52.3", diff --git a/port_versions/g-/glibmm.json b/port_versions/g-/glibmm.json index 4cf69bdaf52f74..c90be74e4779aa 100644 --- a/port_versions/g-/glibmm.json +++ b/port_versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "701454d5ead4fb275eedc5f4bb568b07e451e707", + "version-string": "2.68.0", + "port-version": 1 + }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/port_versions/g-/gmime.json b/port_versions/g-/gmime.json index 2e7e8725fd3c3e..293e837381a7bd 100644 --- a/port_versions/g-/gmime.json +++ b/port_versions/g-/gmime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6bc0323c2ad89dc02918e979c62685ae109990c", + "version-string": "3.2.6", + "port-version": 2 + }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/port_versions/g-/gts.json b/port_versions/g-/gts.json index 536f7229e8a253..d70b054a93091d 100644 --- a/port_versions/g-/gts.json +++ b/port_versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cdd175e9b34cba56c2a7ae290bb101aed84c91e", + "version-string": "0.7.6", + "port-version": 4 + }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/port_versions/h-/harfbuzz.json b/port_versions/h-/harfbuzz.json index c5a87612582f00..4487356a84d788 100644 --- a/port_versions/h-/harfbuzz.json +++ b/port_versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b65cac7a37940d8eeb9423eb21f8ee51beba78f", + "version-string": "2.7.4", + "port-version": 1 + }, { "git-tree": "2a196719fa9c0b074b71119ee781233eecf2a455", "version-string": "2.7.2", diff --git a/port_versions/l-/lcm.json b/port_versions/l-/lcm.json index fef7df868650a2..f4aa48345ee022 100644 --- a/port_versions/l-/lcm.json +++ b/port_versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a65fd21d5b6621edf09027c51519bf46e9fb68d", + "version-string": "1.4.0", + "port-version": 2 + }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/port_versions/l-/libcroco.json b/port_versions/l-/libcroco.json index 698b3aa5e5e7c7..e16bcf17731455 100644 --- a/port_versions/l-/libcroco.json +++ b/port_versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bcb19e4f340e0fbda821b4c29e3b31c38cb1e44", + "version-string": "0.6.13", + "port-version": 3 + }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/port_versions/l-/libnice.json b/port_versions/l-/libnice.json index 8da130a656e44f..8fc070af2389d5 100644 --- a/port_versions/l-/libnice.json +++ b/port_versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0242706caa01291cdd89b147c24427eda31f514", + "version-string": "0.1.15", + "port-version": 7 + }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/port_versions/l-/librsvg.json b/port_versions/l-/librsvg.json index 8ec19294d84978..40beed10c719a4 100644 --- a/port_versions/l-/librsvg.json +++ b/port_versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10c56463d99f9b067df509d329419435cf228035", + "version-string": "2.40.20", + "port-version": 3 + }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/port_versions/l-/libsigcpp.json b/port_versions/l-/libsigcpp.json index 8b666ff86ef141..cb960085a55edb 100644 --- a/port_versions/l-/libsigcpp.json +++ b/port_versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "329fb670d579bd3dca135f414d4d3af17e88ff37", + "version-string": "3.0.3", + "port-version": 0 + }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/port_versions/l-/libxmlpp.json b/port_versions/l-/libxmlpp.json index 0bdfeffe82817a..a8bb3d873e60b6 100644 --- a/port_versions/l-/libxmlpp.json +++ b/port_versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c996518168e9937837b41350d589aeb00bf6a63e", + "version-string": "5.0", + "port-version": 1 + }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/port_versions/t-/tesseract.json b/port_versions/t-/tesseract.json index f6cec1d56e89dd..1824a9ff88ea55 100644 --- a/port_versions/t-/tesseract.json +++ b/port_versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dde59646274b9f0e1e6470dca68d14d35893aaf1", + "version-string": "4.1.1", + "port-version": 6 + }, { "git-tree": "118674017f17f5289563c3b07f4fe5403d508151", "version-string": "4.1.1", diff --git a/port_versions/v-/v8.json b/port_versions/v-/v8.json index 827273bc245a24..d16adc0cb9f3b4 100644 --- a/port_versions/v-/v8.json +++ b/port_versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "029191f061fed542434dfabbd3d3b622dfbc366c", + "version-string": "8.6.395.17", + "port-version": 1 + }, { "git-tree": "06594ed228d75261805f473207a1db1757f974fe", "version-string": "8.6.395.17", From 734bb6fb0b47248f3a6e3f701edbd04c77098ce8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 14:44:38 +0100 Subject: [PATCH 029/182] fix version field --- ports/libsigcpp-3/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libsigcpp-3/vcpkg.json b/ports/libsigcpp-3/vcpkg.json index c2f0a76afea7ea..17eb13485e04f0 100644 --- a/ports/libsigcpp-3/vcpkg.json +++ b/ports/libsigcpp-3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsigcpp-3", "version-string": "3.0.3", - "port-version" : 1 + "port-version": 1, "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", "dependencies": [ From 2351f47c60ea5d08d5bdc711c97d0a994ef7ed1b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 14:46:39 +0100 Subject: [PATCH 030/182] update versions --- port_versions/baseline.json | 2 +- port_versions/l-/libsigcpp-3.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index f660447bebf3ca..12bffe3db39fdd 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -3290,7 +3290,7 @@ }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.30", diff --git a/port_versions/l-/libsigcpp-3.json b/port_versions/l-/libsigcpp-3.json index 2ac14dd336ea2e..069ab1a71e7b3d 100644 --- a/port_versions/l-/libsigcpp-3.json +++ b/port_versions/l-/libsigcpp-3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e09df080412a20aaf2755e78cd4314168fb8853", + "version-string": "3.0.3", + "port-version": 1 + }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", From 0bab287546a3df0ca2b3e0c45afcc5e0f337b8e8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 14:59:30 +0100 Subject: [PATCH 031/182] fix glib in harfbuzz --- ports/harfbuzz/CMakeLists.patch | 4 +++- ports/harfbuzz/portfile.cmake | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/harfbuzz/CMakeLists.patch b/ports/harfbuzz/CMakeLists.patch index a2ee03237d47f3..05d4b069ec067e 100644 --- a/ports/harfbuzz/CMakeLists.patch +++ b/ports/harfbuzz/CMakeLists.patch @@ -26,14 +26,16 @@ index 11118595f..257e7c85e 100644 if (HB_HAVE_GLIB) add_definitions(-DHAVE_GLIB) -@@ -217,7 +219,9 @@ if (HB_HAVE_GLIB) +@@ -217,7 +219,11 @@ if (HB_HAVE_GLIB) find_package(PkgConfig) pkg_check_modules(PC_GLIB QUIET glib-2.0) ++ find_package(Iconv REQUIRED) - find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) + find_library(GLIB_LIBRARY_RELEASE NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS} ${PC_GLIB_LIBDIR}/.. ${PC_GLIB_LIBRARY_DIRS}/..) + find_library(GLIB_LIBRARY_DEBUG NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR}/debug ${PC_GLIB_LIBRARY_DIRS}/debug ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) + select_library_configurations(GLIB) ++ list(APPEND GLIB_LIBRARIES ${Iconv_LIBRARIES}) find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index aabbf7fd482e57..e0edf88a2426b8 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -18,12 +18,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if(VCPKG_TARGET_IS_WINDOWS) list(APPEND FEATURE_OPTIONS -DHP_HAVE_GDI=ON) endif() +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DHB_HAVE_FREETYPE=ON -DHB_BUILD_TESTS=OFF + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) From f0dfae914941d820b49d848e187c25e3116cdf6f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 15:00:51 +0100 Subject: [PATCH 032/182] update port versions --- port_versions/h-/harfbuzz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/h-/harfbuzz.json b/port_versions/h-/harfbuzz.json index 4487356a84d788..3f64480a7795cb 100644 --- a/port_versions/h-/harfbuzz.json +++ b/port_versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0b65cac7a37940d8eeb9423eb21f8ee51beba78f", + "git-tree": "6bb44c602836a5aa8c83769195c3b92ff0e65e00", "version-string": "2.7.4", "port-version": 1 }, From 6468b2350d5a0429b482eabb10cb40de67f000ab Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 15:09:19 +0100 Subject: [PATCH 033/182] silly uppercase type --- ports/fluidsynth/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/fluidsynth/CONTROL b/ports/fluidsynth/CONTROL index f082b871a277e1..406bb91a1d12bd 100644 --- a/ports/fluidsynth/CONTROL +++ b/ports/fluidsynth/CONTROL @@ -1,6 +1,6 @@ Source: fluidsynth Version: 2.1.4 -Port_Version: 1 +Port-Version: 1 Homepage: https://github.com/FluidSynth/fluidsynth Description: FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont. Build-Depends: glib \ No newline at end of file From 9994a995072d1622ed7ab230e30fee8cd7b6e350 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 15:09:57 +0100 Subject: [PATCH 034/182] update port-versions --- port_versions/baseline.json | 2 +- port_versions/f-/fluidsynth.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 12bffe3db39fdd..7d069a3cd5df93 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1926,7 +1926,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/port_versions/f-/fluidsynth.json b/port_versions/f-/fluidsynth.json index a766ae2ca7c7b7..b273df8c8249b1 100644 --- a/port_versions/f-/fluidsynth.json +++ b/port_versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fee8bac7705601eccd92f8cf169b8c8fa82789fc", + "version-string": "2.1.4", + "port-version": 1 + }, { "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", "version-string": "2.1.4", From cd431ae1350e5af520a9fa54d251b0744223064a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 15:46:52 +0100 Subject: [PATCH 035/182] fix cairo build --- ports/cairo/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index df30bf4b4ce0ce..23bdfdda81b619 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -240,10 +240,11 @@ if(WITH_GOBJECT) endif() find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 glib-2.0 gobject-2.0) + pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 IMPORTED_TARGET) + find_package(Iconv REQUIRED) add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES}) target_include_directories(cairo-gobject PRIVATE ${GLIB2_INCLUDE_DIRS}) - target_link_libraries(cairo-gobject PRIVATE cairo ${GLIB2_LIBRARIES_STATIC}) + target_link_libraries(cairo-gobject PRIVATE cairo PkgConfig::GLIB2 ${Iconv_LIBRARIES}) endif() if(MSVC) @@ -302,7 +303,8 @@ find_dependency(Freetype) find_dependency(Fontconfig) find_dependency(unofficial-pixman CONFIG) if(WITH_GOBJECT) - find_dependency(unofficial-glib CONFIG) + find_dependency(PkgConfig REQUIRED) + pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 IMPORTED_TARGET) endif() include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-cairo-targets.cmake) From 68c889cb1ac91b1a70bc101ada8d20c755b3335e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 15:47:54 +0100 Subject: [PATCH 036/182] update version --- port_versions/c-/cairo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/c-/cairo.json b/port_versions/c-/cairo.json index 0d52573edb460a..92dabe35d39341 100644 --- a/port_versions/c-/cairo.json +++ b/port_versions/c-/cairo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fb3093314176710a915998ef27b486dfd6a0a1f9", + "git-tree": "80969d5edb94c0438a56ee1d1668bea736d04655", "version-string": "1.16.0", "port-version": 9 }, From 3eade91ede7be418192a2a237ff70efc4a2569cd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 16:36:29 +0100 Subject: [PATCH 037/182] fix atk --- ports/atk/CMakeLists.txt.in | 155 ------------------------------------ ports/atk/portfile.cmake | 2 + 2 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 ports/atk/CMakeLists.txt.in diff --git a/ports/atk/CMakeLists.txt.in b/ports/atk/CMakeLists.txt.in deleted file mode 100644 index eeb8af3f9d3ffb..00000000000000 --- a/ports/atk/CMakeLists.txt.in +++ /dev/null @@ -1,155 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(atk C) - -set(ATK_LIB_SUFFIX @ATK_LIB_SUFFIX@) -set(ATK_DLL_SUFFIX @ATK_DLL_SUFFIX@) -set(GLIB_LIB_VERSION @GLIB_LIB_VERSION@) - -if(BUILD_SHARED_LIBS) - set(ATK_EXPORT_MACRO DLL_EXPORT) -endif() - -# generate atkmarshal.c and atkmarshal.h source files -# glib-genmarshal should be installed along with glib -find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES tools/glib glib) -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/atk) - -message("Generating atkmarshal.h: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header") -execute_process( - COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/atk - OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/atk/atkmarshal.h -) - -message("Generating atkmarshal.c: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body") -execute_process( - COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/atk - OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/atk/atkmarshal.c -) - -if (WIN32) - configure_file(config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY) -else() - configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY) -endif() -add_definitions(-DHAVE_CONFIG_H) -include_directories(. ./atk ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/atk) - -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}) - -if (WIN32 OR APPLE) - find_path(LIBINTL_INCLUDE_DIR libintl.h) - find_library(LIBINTL_LIBRARY NAMES libintl intl) -else() - find_package(Intl REQUIRED) - set(LIBINTL_INCLUDE_DIR ${Intl_INCLUDE_DIRS}) - set(LIBINTL_LIBRARY ${Intl_LIBRARIES}) -endif() - -set(ATK_SOURCES - atk/atkaction.c - atk/atkcomponent.c - atk/atkdocument.c - atk/atkeditabletext.c - atk/atkgobjectaccessible.c - atk/atkhyperlink.c - atk/atkhyperlinkimpl.c - atk/atkhypertext.c - atk/atkimage.c - atk/atknoopobject.c - atk/atknoopobjectfactory.c - atk/atkobject.c - atk/atkobjectfactory.c - atk/atkplug.c - atk/atkprivate.c - atk/atkrange.c - atk/atkregistry.c - atk/atkrelation.c - atk/atkrelationset.c - atk/atkselection.c - atk/atksocket.c - atk/atkstate.c - atk/atkstateset.c - atk/atkstreamablecontent.c - atk/atktable.c - atk/atktablecell.c - atk/atktext.c - atk/atkutil.c - atk/atkmisc.c - atk/atkvalue.c - atk/atkversion.c - atk/atkwindow.c - atk/atk-enum-types.c) - -add_library(atk ${ATK_SOURCES}) -target_compile_definitions(atk PRIVATE ATK_COMPILATION ${ATK_EXPORT_MACRO} G_DISABLE_SINGLE_INCLUDES ATK_LOCALEDIR="/dummy/share/locale") -target_link_libraries(atk ${LIBINTL_LIBRARY} ${GLIB_LIBRARIES}) -target_include_directories(atk PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) - -set_target_properties(atk PROPERTIES - OUTPUT_NAME atk-${ATK_DLL_SUFFIX} - ARCHIVE_OUTPUT_NAME atk-${ATK_LIB_SUFFIX}) - -install(TARGETS atk RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) - -if(NOT ATK_SKIP_HEADERS) - install(FILES - atk/atk.h - atk/atkaction.h - atk/atkcomponent.h - atk/atkdocument.h - atk/atkeditabletext.h - atk/atkgobjectaccessible.h - atk/atkhyperlink.h - atk/atkhyperlinkimpl.h - atk/atkhypertext.h - atk/atknoopobject.h - atk/atknoopobjectfactory.h - atk/atkobject.h - atk/atkobjectfactory.h - atk/atkplug.h - atk/atkimage.h - atk/atkrange.h - atk/atkregistry.h - atk/atkrelation.h - atk/atkrelationtype.h - atk/atkrelationset.h - atk/atkselection.h - atk/atksocket.h - atk/atkstate.h - atk/atkstateset.h - atk/atkstreamablecontent.h - atk/atktable.h - atk/atktablecell.h - atk/atktext.h - atk/atkutil.h - atk/atkmisc.h - atk/atkvalue.h - atk/atkwindow.h - atk/atkversion.h - atk/atk-enum-types.h - atk/atkversion.h - DESTINATION include/atk) -endif() - -message(STATUS "Link-time dependencies:") -message(STATUS " " ${LIBINTL_LIBRARY}) -foreach(GL ${GLIB_LIBRARIES}) - message(STATUS " " ${GL}) -endforeach() - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(ATK_API_VERSION @ATK_API_VERSION@) -set(VERSION @ATK_VERSION@) -set(GLIB_PACKAGES "glib-${GLIB_LIB_VERSION} gobject-${GLIB_LIB_VERSION} gmodule-${GLIB_LIB_VERSION}") - -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/atk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" DESTINATION lib/pkgconfig) \ No newline at end of file diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index b35b91401415ea..dab9d077edf3c3 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_configure_meson( OPTIONS -Dintrospection=false ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson() From ef9b396679f6d3734ce08d4e5ade08821190724b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 16:37:36 +0100 Subject: [PATCH 038/182] update atk port-verisons --- port_versions/a-/atk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/a-/atk.json b/port_versions/a-/atk.json index 8da223d20a37f0..875745e67da32e 100644 --- a/port_versions/a-/atk.json +++ b/port_versions/a-/atk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b658e0ba886cfcc96713280bd9877a8b93eee21d", + "git-tree": "d0b4ba8b993ce9c6fa4a6e2dfbbbb39a817fae44", "version-string": "2.36.0", "port-version": 1 }, From 3dd2bb2f4ae48ad9f008539257cda388ba40f096 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 16:50:13 +0100 Subject: [PATCH 039/182] fix gts public includes --- ports/gts/glib2.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/gts/glib2.patch b/ports/gts/glib2.patch index 86507306b02438..60de77c70d9e16 100644 --- a/ports/gts/glib2.patch +++ b/ports/gts/glib2.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 941e9b96b..ea031828d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -85,30 +85,34 @@ include_directories( +@@ -85,30 +85,35 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) @@ -47,6 +47,7 @@ index 941e9b96b..ea031828d 100644 add_library(${kit} SHARED ${srcs}) -target_link_libraries(${kit} ${glib_LIBRARY}) ++target_include_directories(${kit} PUBLIC ${GLIB2_INCLUDE_DIRS}) +target_link_libraries(${kit} PkgConfig::GLIB2) if(MSVC) From 1d3b21f68a7e6fcec590aa31c84f18e0d061fedb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 16:50:36 +0100 Subject: [PATCH 040/182] update versions --- port_versions/g-/gts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port_versions/g-/gts.json b/port_versions/g-/gts.json index d70b054a93091d..2dfcb6950c7c8a 100644 --- a/port_versions/g-/gts.json +++ b/port_versions/g-/gts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1cdd175e9b34cba56c2a7ae290bb101aed84c91e", + "git-tree": "5e4ec0af9a4be523f882ac823baae6a59862c5e9", "version-string": "0.7.6", "port-version": 4 }, From 6962976849fb4a0a2546939ff77fd999e4b176cd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 20:43:55 +0100 Subject: [PATCH 041/182] fix cairomm --- ports/cairomm/CMakeLists.txt | 10 ++++++---- ports/cairomm/CONTROL | 2 +- ports/cairomm/portfile.cmake | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/cairomm/CMakeLists.txt b/ports/cairomm/CMakeLists.txt index 1cc02978601678..0c6ed363e66db8 100644 --- a/ports/cairomm/CMakeLists.txt +++ b/ports/cairomm/CMakeLists.txt @@ -14,9 +14,11 @@ string(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" CAIROMM_MINOR_VERSION ${ string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" CAIROMM_MICRO_VERSION ${VERSION}) message(STATUS "Ciaromm version: ${CAIROMM_MAJOR_VERSION}.${CAIROMM_MINOR_VERSION}.${CAIROMM_MICRO_VERSION}") -find_package(Cairo REQUIRED) +find_package(CAIRO REQUIRED) find_package(Freetype REQUIRED) -find_package(SigC++ REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(SIGCPP sigc++-3.0 IMPORTED_TARGET) + #configure option(BUILD_SHARED_LIBS "Build the shared library" ON) @@ -88,10 +90,10 @@ set(cairomm_rc ${CMAKE_BINARY_DIR}/cairomm.rc) add_library(cairomm-1.0 ${cairomm_cc} ${cairomm_rc}) -target_link_libraries(cairomm-1.0 ${CAIRO_LIBRARY} ${SIGC++_LIBRARY} Freetype::Freetype) +target_link_libraries(cairomm-1.0 ${CAIRO_LIBRARY} PkgConfig::SIGCPP Freetype::Freetype) target_include_directories(cairomm-1.0 PRIVATE ${CAIRO_INCLUDE_DIR} - ${SIGC++_INCLUDE_DIR} + ${SIGCCPP_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) diff --git a/ports/cairomm/CONTROL b/ports/cairomm/CONTROL index 7a89c9ec1de468..185d4314b1b689 100644 --- a/ports/cairomm/CONTROL +++ b/ports/cairomm/CONTROL @@ -1,6 +1,6 @@ Source: cairomm Version: 1.15.3 -Port-Version: 5 +Port-Version: 6 Homepage: https://www.cairographics.org Description: A C++ wrapper for the cairo graphics library Build-Depends: cairo, libsigcpp diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index c1adb249b01bc2..c954b3bc150479 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -19,9 +19,12 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}/build) +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() From b572fe4c7f9d27ff30276e6efb28ad6a68d310f4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 20:44:14 +0100 Subject: [PATCH 042/182] fix pango --- ports/pango/CMakeLists.txt | 23 +++++++++-------------- ports/pango/CONTROL | 2 +- ports/pango/portfile.cmake | 4 +++- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index 127b92319c7dce..230832c182bb48 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.8) project(pango C) set(PANGO_LIB_SUFFIX 1.0) @@ -26,11 +26,9 @@ 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_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 IMPORTED_TARGET) +set(GLIB_LIBRARIES PkgConfig::GLIB2) # find cairo find_path(CAIRO_INCLUDE_DIR cairo.h) @@ -45,23 +43,20 @@ 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_package(Fontconfig REQUIRED) # find freetype find_package(Freetype REQUIRED) # find harfbuzz -find_path(HARFBUZZ_INCLUDE_DIR harfbuzz/hb.h) -find_library(HARFBUZZ_LIBRARY harfbuzz) +find_package(harfbuzz REQUIRED) 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}) +#set(FONT_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR} ${FONTCONFIG_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR}/harfbuzz) +set(FONT_LIBRARIES Freetype::Freetype Fontconfig::Fontconfig harfbuzz::harfbuzz) macro(pango_add_module MODULE_NAME) add_library(${MODULE_NAME} ${ARGN}) @@ -135,7 +130,7 @@ pango_add_module(pangoft2 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}) +#target_include_directories(pangoft2 PRIVATE ${FONT_INCLUDE_DIRS}) list(APPEND PANGO_CAIRO_SOURCES pango/pangocairo-fcfont.c diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index cea8f146423d8e..316e02569fcfba 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,6 +1,6 @@ Source: pango Version: 1.40.11 -Port-Version: 8 +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[glib] (!(windows&static)&!osx) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 475d49f01038ec..a94c2b2fe169ea 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -12,10 +12,12 @@ vcpkg_extract_source_archive_ex( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.unix DESTINATION ${SOURCE_PATH}) - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_DEBUG -DPANGO_SKIP_HEADERS=ON ) From 50f62364a2ebabc7c6c41bbcef38f14c4adeebba Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 22:08:04 +0100 Subject: [PATCH 043/182] fix ignition --- ports/ignition-cmake2/CONTROL | 1 + ports/ignition-cmake2/FindGTS.patch | 31 ++++++++++++++++++++++++++++ ports/ignition-cmake2/portfile.cmake | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/ignition-cmake2/FindGTS.patch diff --git a/ports/ignition-cmake2/CONTROL b/ports/ignition-cmake2/CONTROL index 66c405a0d730b0..7ce098593ae1dc 100644 --- a/ports/ignition-cmake2/CONTROL +++ b/ports/ignition-cmake2/CONTROL @@ -1,5 +1,6 @@ Source: ignition-cmake2 Version: 2.5.0 +Port-Version: 1 Homepage: https://ignitionrobotics.org/libs/cmake Description: CMake helper functions for building robotic applications Build-Depends: ignition-modularscripts diff --git a/ports/ignition-cmake2/FindGTS.patch b/ports/ignition-cmake2/FindGTS.patch new file mode 100644 index 00000000000000..47bb145e00235b --- /dev/null +++ b/ports/ignition-cmake2/FindGTS.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake +index ad00a9715..a83d8af40 100644 +--- a/cmake/FindGTS.cmake ++++ b/cmake/FindGTS.cmake +@@ -67,6 +67,26 @@ else() + # 2.1 Need glib library + find_library(GLIB_LIBRARY glib-2.0) + list(APPEND GTS_LIBRARIES "${GLIB_LIBRARY}") ++ find_path(GLIB_INCLUDE_DIRS glib.h ++ HINTS ++ ${CMAKE_FIND_ROOT_PATH} ++ PATH ++ ${CMAKE_FIND_ROOT_PATH} ++ PATH_SUFFIXES ++ include ++ include/glib-2.0 ++ DOC "glib header include dir" ++ ) ++ find_path(GLIB_CONFIG_INCLUDE_DIRS glibconfig.h ++ HINTS ++ ${CMAKE_FIND_ROOT_PATH} ++ PATHS ++ ${CMAKE_FIND_ROOT_PATH} ++ PATH_SUFFIXES ++ lib/glib-2.0/include ++ doc "glib header include dir" ++ ) ++ list(APPEND GTS_INCLUDE_DIRS ${GLIB_INCLUDE_DIRS} ${GLIB_CONFIG_INCLUDE_DIRS}) + + if (GTS_FOUND) + # We need to manually specify the pkgconfig entry (and type of entry), diff --git a/ports/ignition-cmake2/portfile.cmake b/ports/ignition-cmake2/portfile.cmake index 5c6879bf3ad87f..454a84f1734052 100644 --- a/ports/ignition-cmake2/portfile.cmake +++ b/ports/ignition-cmake2/portfile.cmake @@ -4,7 +4,8 @@ set(PACKAGE_VERSION "2.5.0") ignition_modular_library(NAME cmake VERSION ${PACKAGE_VERSION} - SHA512 dc546e5e4deabba12faec5fb0162309dfce9b429a6bbd6637c058acdda3eb4fa1e44e9b71f55603d0cff77550117dafc3fc8475621ede65fa8aa915254beb463) + SHA512 dc546e5e4deabba12faec5fb0162309dfce9b429a6bbd6637c058acdda3eb4fa1e44e9b71f55603d0cff77550117dafc3fc8475621ede65fa8aa915254beb463 + PATCHES FindGTS.patch) # Install custom usage configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) From 07caf5d4736c1ffbd1a66af1ef69f76e8d991f74 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 22:08:43 +0100 Subject: [PATCH 044/182] update versions. --- port_versions/baseline.json | 6 +++--- port_versions/c-/cairomm.json | 5 +++++ port_versions/i-/ignition-cmake2.json | 5 +++++ port_versions/p-/pango.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 7d069a3cd5df93..d790d93833e68a 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -1046,7 +1046,7 @@ }, "cairomm": { "baseline": "1.15.3", - "port-version": 5 + "port-version": 6 }, "camport3": { "baseline": "1.5.3", @@ -2402,7 +2402,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -4370,7 +4370,7 @@ }, "pango": { "baseline": "1.40.11", - "port-version": 8 + "port-version": 9 }, "pangolin": { "baseline": "0.5", diff --git a/port_versions/c-/cairomm.json b/port_versions/c-/cairomm.json index 0e8797f14846c2..386779509ea098 100644 --- a/port_versions/c-/cairomm.json +++ b/port_versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "920d887aa5c35b9d689bba35c8bfdd8bbf8f0553", + "version-string": "1.15.3", + "port-version": 6 + }, { "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", "version-string": "1.15.3", diff --git a/port_versions/i-/ignition-cmake2.json b/port_versions/i-/ignition-cmake2.json index f229c494bdb39e..c305c03193569d 100644 --- a/port_versions/i-/ignition-cmake2.json +++ b/port_versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2473a6eb3ef729b0e0b8d4403db680f143d8c0ea", + "version-string": "2.5.0", + "port-version": 1 + }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/port_versions/p-/pango.json b/port_versions/p-/pango.json index 06b8e2bc695ddb..a48314c4a77c7f 100644 --- a/port_versions/p-/pango.json +++ b/port_versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2d9e78ba235a56564304e7116375335df202e7", + "version-string": "1.40.11", + "port-version": 9 + }, { "git-tree": "c0585c64466afdd652539982316d65c086b3d4f6", "version-string": "1.40.11", From 57406b68a738f883232356c5c14c359973faa88f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 22:29:25 +0100 Subject: [PATCH 045/182] fix gtk --- ports/gtk/CMakeLists.txt | 11 ++++------- ports/gtk/CONTROL | 3 ++- ports/gtk/portfile.cmake | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt index 9c265c7e597426..f7052f32687f4a 100644 --- a/ports/gtk/CMakeLists.txt +++ b/ports/gtk/CMakeLists.txt @@ -19,12 +19,9 @@ endif() # find dependencies # glib -find_path(GLIB_INCLUDE_DIR glib.h) -find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GIO_LIBRARY gio-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GMODULE_LIBRARY gmodule-${GLIB_LIB_SUFFIX}) -find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_SUFFIX}) -set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GIO_LIBRARY} ${GLIB_GMODULE_LIBRARY} ${GLIB_GOBJECT_LIBRARY}) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) +set(GLIB_LIBRARIES PkgConfig::GLIB2) # pango find_path(PANGO_INCLUDE_DIR pango/pango.h) @@ -66,7 +63,7 @@ set(GTK_REQUIRED_LIBRARIES set(GTK_REQUIRED_INCLUDE_DIR ${LIBINTL_INCLUDE_DIR} ${EPOXY_INCLUDE_DIR} - ${GLIB_INCLUDE_DIR} + ${GLIB_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL index 037d87efddd3d2..a03595a932bf0f 100644 --- a/ports/gtk/CONTROL +++ b/ports/gtk/CONTROL @@ -1,5 +1,6 @@ Source: gtk -Version: 3.22.19-4 +Version: 3.22.19 +Port-Version: 5 Homepage: https://www.gtk.org/ Description: Portable library for creating graphical user interfaces. Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 92f69ca8f58f95..f7e63393ce32ed 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -25,13 +25,14 @@ if(NOT EXISTS ${SOURCE_PATH}/gtk/gtkdbusgenerated.h OR NOT EXISTS ${SOURCE_PATH} WORKING_DIRECTORY ${SOURCE_PATH}/gtk LOGNAME source-gen) endif() - +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DGTK_VERSION=${GTK_VERSION} + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_DEBUG -DGTK_SKIP_HEADERS=ON) From 880ac5cf95b8f4ea2b78b3a066746d6b8da70c2d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 22:29:34 +0100 Subject: [PATCH 046/182] fix librsvg --- ports/librsvg/CMakeLists.txt | 2 +- ports/librsvg/portfile.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index d427d506fc43c1..df822e5bac02ee 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -4,7 +4,7 @@ project(librsvg C) find_package(unofficial-cairo CONFIG REQUIRED) find_package(unofficial-libcroco CONFIG REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGETS) find_package(LibXml2 REQUIRED) if(CMAKE_SYSTEM_NAME MATCHES "Windows") find_library(PANGO_LIB pango-1.0) diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index 2720c5011748e8..b100d22965156f 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -12,9 +12,12 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.linux ${SOURCE_PATH}/config.h.linux COPYONLY) +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) vcpkg_install_cmake() From feccef297892e972fab80967ed19211a9f2e169a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 22:30:33 +0100 Subject: [PATCH 047/182] update versions --- port_versions/baseline.json | 4 ++-- port_versions/g-/gtk.json | 5 +++++ port_versions/l-/librsvg.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index d790d93833e68a..4beec570a3abeb 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2273,8 +2273,8 @@ "port-version": 2 }, "gtk": { - "baseline": "3.22.19-4", - "port-version": 0 + "baseline": "3.22.19", + "port-version": 5 }, "gtkmm": { "baseline": "3.22.2", diff --git a/port_versions/g-/gtk.json b/port_versions/g-/gtk.json index f56dba6ffdc30e..44a628e39b2efd 100644 --- a/port_versions/g-/gtk.json +++ b/port_versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a30d94c1b17c18e69e6d491c364a58ceb39bf9", + "version-string": "3.22.19", + "port-version": 5 + }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/port_versions/l-/librsvg.json b/port_versions/l-/librsvg.json index 40beed10c719a4..1ddc6108ba079b 100644 --- a/port_versions/l-/librsvg.json +++ b/port_versions/l-/librsvg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "10c56463d99f9b067df509d329419435cf228035", + "git-tree": "07dcfa5a1a2cdfe38604f2383b00c0dd6a3817be", "version-string": "2.40.20", "port-version": 3 }, From 566766cebd4740d60cfd406115f53256b658787f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 15 Jan 2021 22:33:51 +0100 Subject: [PATCH 048/182] fix atk linux --- ports/atk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index dab9d077edf3c3..638e41e6986d3e 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -27,5 +27,5 @@ vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() - +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 5a0c0ad1b512cbd46bd32bc04e68b91289dc00ce Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 01:04:31 +0100 Subject: [PATCH 049/182] fix libgpod --- ports/libgpod/CMakeLists.txt | 78 ------------ ports/libgpod/CONTROL | 2 +- ports/libgpod/configure.ac.patch | 13 ++ ports/libgpod/fix-glibconfigpath.patch | 117 ------------------ ports/libgpod/portfile.cmake | 40 ++++-- ports/libplist/CONTROL | 3 +- ports/libplist/portfile.cmake | 22 ++++ .../azure-pipelines/linux/provision-image.sh | 3 + 8 files changed, 73 insertions(+), 205 deletions(-) delete mode 100644 ports/libgpod/CMakeLists.txt create mode 100644 ports/libgpod/configure.ac.patch delete mode 100644 ports/libgpod/fix-glibconfigpath.patch diff --git a/ports/libgpod/CMakeLists.txt b/ports/libgpod/CMakeLists.txt deleted file mode 100644 index f74038d71c49d0..00000000000000 --- 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 index f681cdf35cdc8e..5500f154d7627d 100644 --- a/ports/libgpod/CONTROL +++ b/ports/libgpod/CONTROL @@ -1,6 +1,6 @@ Source: libgpod Version: 2019-08-29 -Port-Version: 2 +Port-Version: 3 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 00000000000000..53ca42c2db5316 --- /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 ]) + 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 1a60eb1aa0b8cb..00000000000000 --- 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 -+#include - #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 -+#include - - #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 -+#include - - #include "itdb_device.h" - #include -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 -+#include - - #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 -+#include - - #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 -+#include - - #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 -+#include - - #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 -+#include - #include - #include - -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 -+#include - #include "itdb.h" - #include "db-image-parser.h" - diff --git a/ports/libgpod/portfile.cmake b/ports/libgpod/portfile.cmake index 2bcf7fc37a9f25..142bb78dcc9573 100644 --- a/ports/libgpod/portfile.cmake +++ b/ports/libgpod/portfile.cmake @@ -6,19 +6,43 @@ 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}) +#file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +# vcpkg_configure_cmake( + # SOURCE_PATH ${SOURCE_PATH} + # PREFER_NINJA + # OPTIONS ${FEATURE_OPTIONS} + # -DLIBGPOD_BLOB_DIR=${CURRENT_PACKAGES_DIR}/tools +# ) +# vcpkg_install_cmake() + +#file(COPY "/usr/share/gtk-doc/data/gtk-doc.make" DESTINATION "${SOURCE_PATH}") +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/libplist/CONTROL b/ports/libplist/CONTROL index e6ba166f023501..087b184ece391f 100644 --- a/ports/libplist/CONTROL +++ b/ports/libplist/CONTROL @@ -1,3 +1,4 @@ Source: libplist -Version: 1.3.6 +Version: 1.3.6 +Port-Version: 1 Description: A library to handle Apple Property List format in binary or XML diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake index 5137b40467cced..2cad077a6f8e1b 100644 --- a/ports/libplist/portfile.cmake +++ b/ports/libplist/portfile.cmake @@ -23,3 +23,25 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(pcfile "libplist-2.0.pc") +set(pcfiletarget "libplist.pc") +set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() +set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() + +set(pcfile "libplist++-2.0.pc") +set(pcfiletarget "libplist++.pc") +set(basepath "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() +set(basepath "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") +if(EXISTS "${basepath}${pcfile}") + file(CREATE_LINK "${basepath}${pcfile}" "${basepath}${pcfiletarget}" COPY_ON_ERROR) +endif() diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index c04f4b3caac191..fec17ec9df738f 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -42,6 +42,9 @@ APT_PACKAGES="$APT_PACKAGES libasound2-dev" # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60" +# Required by libgpod +APT_PACKAGES="$APT_PACKAGES gtk-doc-tools" + sudo apt -y install $APT_PACKAGES # Install newer version of nasm than the apt package, required by intel-ipsec From 451b5ca54fe7407193c58393a5f48b6bf862c9f8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 01:07:50 +0100 Subject: [PATCH 050/182] update versions --- port_versions/a-/atk.json | 2 +- port_versions/baseline.json | 4 ++-- port_versions/l-/libgpod.json | 5 +++++ port_versions/l-/libplist.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/port_versions/a-/atk.json b/port_versions/a-/atk.json index 875745e67da32e..8746d643883f17 100644 --- a/port_versions/a-/atk.json +++ b/port_versions/a-/atk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d0b4ba8b993ce9c6fa4a6e2dfbbbb39a817fae44", + "git-tree": "e0b101e154971ffe46c75a5429ceee13cbfaf04d", "version-string": "2.36.0", "port-version": 1 }, diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 4beec570a3abeb..c675a2f734729d 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2962,7 +2962,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3198,7 +3198,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.11", diff --git a/port_versions/l-/libgpod.json b/port_versions/l-/libgpod.json index a9f78ea687d836..6791d102502786 100644 --- a/port_versions/l-/libgpod.json +++ b/port_versions/l-/libgpod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afaf6b4fea7f832662cba5da071bb1305ed0067f", + "version-string": "2019-08-29", + "port-version": 3 + }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/port_versions/l-/libplist.json b/port_versions/l-/libplist.json index ad060ee201e27a..ab916e78dde2dd 100644 --- a/port_versions/l-/libplist.json +++ b/port_versions/l-/libplist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03648fe1fa9a293e77e8b819cbdb81e6687e1e30", + "version-string": "1.3.6", + "port-version": 1 + }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", From 629e2a37e334492145e3cb85ffcb3705d9cb1036 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 20:26:08 +0100 Subject: [PATCH 051/182] fix lcm --- ports/lcm/fix-linux-build.patch | 127 -------------------------------- ports/lcm/glib.link.patch | 30 ++++++++ ports/lcm/portfile.cmake | 2 +- 3 files changed, 31 insertions(+), 128 deletions(-) delete mode 100644 ports/lcm/fix-linux-build.patch create mode 100644 ports/lcm/glib.link.patch diff --git a/ports/lcm/fix-linux-build.patch b/ports/lcm/fix-linux-build.patch deleted file mode 100644 index 47ccf8b9390986..00000000000000 --- a/ports/lcm/fix-linux-build.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d3a4c2..da3bfc5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS 3.7) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3.7") - endif() - --find_package(GLib2 REQUIRED) -+find_package(unofficial-glib CONFIG REQUIRED) - - # Configuration and utility functions - include(lcm-cmake/config.cmake NO_POLICY_SCOPE) -@@ -22,6 +22,11 @@ if (WIN32) - include_directories(${lcm_SOURCE_DIR}) - add_subdirectory(WinSpecific) - set(lcm-winport lcm-winport) -+ if(CMAKE_BUILD_TYPE STREQUAL Debug) -+ get_target_property(GLIB2_GLIB_RUNTIME unofficial::glib::glib IMPORTED_LOCATION_DEBUG) -+ elseif(CMAKE_BUILD_TYPE STREQUAL Release) -+ get_target_property(GLIB2_GLIB_RUNTIME unofficial::glib::glib IMPORTED_LOCATION_RELEASE) -+ endif() - get_filename_component(LCM_LCMGEN_PATH ${GLIB2_GLIB_RUNTIME} DIRECTORY) - set(LCM_USE_GLIB_RUNTIME "set(LCM_LCMGEN_PATH \"${LCM_LCMGEN_PATH}\")") - else() -diff --git a/lcm-logger/CMakeLists.txt b/lcm-logger/CMakeLists.txt -index 9aee9df..253af08 100644 ---- a/lcm-logger/CMakeLists.txt -+++ b/lcm-logger/CMakeLists.txt -@@ -1,9 +1,9 @@ - add_executable(lcm-logger lcm_logger.c glib_util.c) --target_link_libraries(lcm-logger -- lcm -- ${lcm-winport} -- GLib2::glib --) -+if(WIN32) -+ target_link_libraries(lcm-logger lcm ${lcm-winport} unofficial::glib::glib ws2_32) -+else() -+ target_link_libraries(lcm-logger lcm ${lcm-winport} unofficial::glib::glib) -+endif() - - add_executable(lcm-logplayer lcm_logplayer.c) - target_link_libraries(lcm-logplayer lcm ${lcm-winport}) -diff --git a/lcm/CMakeLists.txt b/lcm/CMakeLists.txt -index 639ec12..9da0c00 100644 ---- a/lcm/CMakeLists.txt -+++ b/lcm/CMakeLists.txt -@@ -60,10 +60,11 @@ foreach(lcm_lib lcm lcm-static) - $ - ) - -- target_link_libraries(${lcm_lib} PRIVATE -- GLib2::glib -- ${CMAKE_THREAD_LIBS_INIT} -- ) -+ if(WIN32) -+ target_link_libraries(${lcm_lib} PRIVATE unofficial::glib::glib ${CMAKE_THREAD_LIBS_INIT} ws2_32) -+ else() -+ target_link_libraries(${lcm_lib} PRIVATE unofficial::glib::glib ${CMAKE_THREAD_LIBS_INIT}) -+ endif() - endforeach() - - generate_export_header(lcm STATIC_DEFINE LCM_STATIC) -diff --git a/lcmgen/CMakeLists.txt b/lcmgen/CMakeLists.txt -index 29354bb..d848b16 100644 ---- a/lcmgen/CMakeLists.txt -+++ b/lcmgen/CMakeLists.txt -@@ -43,7 +43,11 @@ if(_uses_sanitizers AND NOT LCM_SANITIZE_LCMGEN) - endif() - - add_executable(lcm-gen ${lcm-gen_sources}) --target_link_libraries(lcm-gen PRIVATE GLib2::glib) -+if(WIN32) -+ target_link_libraries(lcm-gen PRIVATE unofficial::glib::glib ws2_32) -+else() -+ target_link_libraries(lcm-gen PRIVATE unofficial::glib::glib) -+endif() - - install(TARGETS lcm-gen - EXPORT lcmTargets -diff --git a/liblcm-test/CMakeLists.txt b/liblcm-test/CMakeLists.txt -index bb24675..da041d9 100644 ---- a/liblcm-test/CMakeLists.txt -+++ b/liblcm-test/CMakeLists.txt -@@ -5,7 +5,11 @@ add_executable(lcm-source lcm-source.c) - target_link_libraries(lcm-source lcm ${lcm-winport}) - - add_executable(lcm-tester lcm-tester.c) --target_link_libraries(lcm-tester lcm GLib2::glib) -+if(WIN32) -+ target_link_libraries(lcm-tester lcm unofficial::glib::glib ws2_32) -+else() -+ target_link_libraries(lcm-tester lcm unofficial::glib::glib) -+endif() - - add_executable(lcm-example lcm-example.c) - target_link_libraries(lcm-example lcm) -@@ -14,13 +18,25 @@ if(WIN32) - endif() - - add_executable(lcm-logfilter lcm-logfilter.c) --target_link_libraries(lcm-logfilter lcm ${lcm-winport} GLib2::glib) -+if(WIN32) -+ target_link_libraries(lcm-logfilter lcm ${lcm-winport} unofficial::glib::glib ws2_32) -+else() -+ target_link_libraries(lcm-logfilter lcm ${lcm-winport} unofficial::glib::glib) -+endif() - - add_executable(lcm-buftest-receiver buftest-receiver.c) --target_link_libraries(lcm-buftest-receiver lcm GLib2::glib) -+if(WIN32) -+ target_link_libraries(lcm-buftest-receiver lcm unofficial::glib::glib ws2_32) -+else() -+ target_link_libraries(lcm-buftest-receiver lcm unofficial::glib::glib) -+endif() - - add_executable(lcm-buftest-sender buftest-sender.c) --target_link_libraries(lcm-buftest-sender lcm GLib2::glib) -+if(WIN32) -+ target_link_libraries(lcm-buftest-sender lcm unofficial::glib::glib ws2_32) -+else() -+ target_link_libraries(lcm-buftest-sender lcm unofficial::glib::glib) -+endif() - - install(TARGETS - lcm-sink diff --git a/ports/lcm/glib.link.patch b/ports/lcm/glib.link.patch new file mode 100644 index 00000000000000..67f6dc0f5805c8 --- /dev/null +++ b/ports/lcm/glib.link.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/FindGLib2.cmake b/cmake/FindGLib2.cmake +index 2f1a8be45..db823b953 100644 +--- a/cmake/FindGLib2.cmake ++++ b/cmake/FindGLib2.cmake +@@ -14,7 +14,7 @@ function(_glib2_find_include VAR HEADER) + + find_path(GLIB2_${VAR}_INCLUDE_DIR ${HEADER} + PATHS ${_paths} +- PATH_SUFFIXES glib-2.0 glib-2.0/include ++ PATH_SUFFIXES glib-2.0 glib-2.0/include lib/glib-2.0/include + ) + mark_as_advanced(GLIB2_${VAR}_INCLUDE_DIR) + endfunction() +@@ -108,6 +108,16 @@ foreach(_glib2_component ${GLib2_FIND_COMPONENTS}) + + endforeach() + ++find_library(PCRE_LIBRARY pcre) ++set_property(TARGET GLib2::glib APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES ${PCRE_LIBRARY} ++) ++set(THREADS_PREFER_PTHREAD_FLAG ON) ++find_package(Threads) ++set_property(TARGET GLib2::glib APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES Threads::Threads ++) ++ + list(APPEND GLib2_FIND_COMPONENTS glib) + set(GLib2_FIND_REQUIRED_glib TRUE) + diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake index 4081f92e1f6ed7..74bca46d300d8c 100644 --- a/ports/lcm/portfile.cmake +++ b/ports/lcm/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( PATCHES only-install-one-flavor.patch fix-build-error.patch - #fix-linux-build.patch + glib.link.patch ) vcpkg_configure_cmake( From 1e481440f330323919e9baf8dcad4116e955b3c4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 20:38:28 +0100 Subject: [PATCH 052/182] fix librsvg --- ports/librsvg/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index df822e5bac02ee..862d4f8d303dc6 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -25,7 +25,7 @@ endif() find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) # Add include directories -include_directories(${CAIRO_INCLUDE_DIR} ${GDK_PIXBUF_INCLUDE_DIR}) +include_directories(${CAIRO_INCLUDE_DIR} ${GDK_PIXBUF_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}) set(LIBRSVG_SOURCES librsvg-features.c From 3c2c0d3abb37d15a56e2821064ce9cd48384d53c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 20:38:43 +0100 Subject: [PATCH 053/182] update pango and pangomm --- ports/pango/CONTROL | 4 +- ports/pango/portfile.cmake | 65 +++++++++++--- ports/pangomm/CONTROL | 4 +- ports/pangomm/fix_charset.patch | 110 ----------------------- ports/pangomm/fix_properties.patch | 75 ---------------- ports/pangomm/msvc_recommended_pragmas.h | 34 ------- ports/pangomm/portfile.cmake | 58 ++---------- 7 files changed, 66 insertions(+), 284 deletions(-) delete mode 100644 ports/pangomm/fix_charset.patch delete mode 100644 ports/pangomm/fix_properties.patch delete mode 100644 ports/pangomm/msvc_recommended_pragmas.h diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 316e02569fcfba..681c22593af83f 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,6 +1,6 @@ Source: pango -Version: 1.40.11 -Port-Version: 9 +Version: 1.48.0 +Port-Version: 0 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index a94c2b2fe169ea..8bf458ac8706b2 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -1,6 +1,6 @@ -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) @@ -8,21 +8,62 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PANGO_VERSION} - PATCHES 0001-fix-static-symbols-export.diff + #PATCHES 0001-fix-static-symbols-export.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_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( + +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - OPTIONS_DEBUG - -DPANGO_SKIP_HEADERS=ON + -Dintrospection=false + -Dfontconfig=true + -Dsysprof=disabled + -Dlibtahi=false + -Dcairo=true + -Dxft=false + -Dfreetype=true ) -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 +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# option('gtk_doc', + # description: 'Build API reference for Pango using GTK-Doc', + # type: 'boolean', + # value: false) +# option('introspection', + # description: 'Build the GObject introspection data for Pango', + # type: 'feature', + # value: 'auto', + # yield: true) +# option('install-tests', + # description : 'Install tests', + # type: 'boolean', + # value: 'false') +# option('fontconfig', + # description : 'Build with FontConfig support. Passing \'auto\' or \'disabled\' disables fontconfig where it is optional, i.e. on Windows and macOS. Passing \'disabled\' on platforms where fontconfig is required results in error.', + # type: 'feature', + # value: 'auto') +# option('sysprof', + # type : 'feature', + # value : 'disabled', + # description : 'include tracing support for sysprof') +# option('libthai', + # type : 'feature', + # value : 'auto', + # description : 'Build with libthai support') +# option('cairo', + # type : 'feature', + # value : 'auto', + # description : 'Build with cairo support') +# option('xft', + # type : 'feature', + # value : 'auto', + # description : 'Build with xft support') +# option('freetype', + # type : 'feature', + # value : 'auto', + # description : 'Build with freetype support') diff --git a/ports/pangomm/CONTROL b/ports/pangomm/CONTROL index a373ba7ed268f7..87e763a6490f35 100644 --- a/ports/pangomm/CONTROL +++ b/ports/pangomm/CONTROL @@ -1,6 +1,6 @@ Source: pangomm -Version: 2.40.1 -Port-Version: 4 +Version: 2.48.0 +Port-Version: 0 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pangomm Description: pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz, pango, cairomm, glibmm diff --git a/ports/pangomm/fix_charset.patch b/ports/pangomm/fix_charset.patch deleted file mode 100644 index d57063c86e9330..00000000000000 --- a/ports/pangomm/fix_charset.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj -index ceca956..c29a2a1 100644 ---- a/MSVC_Net2013/gendef.vcxproj -+++ b/MSVC_Net2013/gendef.vcxproj -@@ -21,26 +21,27 @@ - - {07324745-C9BE-4D65-B08A-9C88188C0C28} - Win32Proj -+ 8.1 - - - - Application -- MultiByte -+ Unicode - v120 - - - Application -- MultiByte -+ Unicode - v120 - - - Application -- MultiByte -+ Unicode - v120 - - - Application -- MultiByte -+ Unicode - v120 - - -diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj -index fecde32..8f97675 100644 ---- a/MSVC_Net2013/install.vcxproj -+++ b/MSVC_Net2013/install.vcxproj -@@ -22,28 +22,29 @@ - {2093D218-190E-4194-9421-3BA7CBF33B10} - install - Win32Proj -+ 8.1 - - - - Utility -- MultiByte -+ Unicode - true - v120 - - - Utility -- MultiByte -+ Unicode - v120 - - - Utility -- MultiByte -+ Unicode - true - v120 - - - Utility -- MultiByte -+ Unicode - v120 - - -diff --git a/MSVC_Net2013/pangomm.vcxproj b/MSVC_Net2013/pangomm.vcxproj -index aa03fad..d63becf 100644 ---- a/MSVC_Net2013/pangomm.vcxproj -+++ b/MSVC_Net2013/pangomm.vcxproj -@@ -23,26 +23,27 @@ - {A93D607A-5C37-4AEC-BA08-6A655F6DC834} - pangomm - Win32Proj -+ 8.1 - - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - - DynamicLibrary -- MultiByte -+ Unicode - v120 - - diff --git a/ports/pangomm/fix_properties.patch b/ports/pangomm/fix_properties.patch deleted file mode 100644 index 22ee67bf1ced3c..00000000000000 --- a/ports/pangomm/fix_properties.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/MSVC_Net2013/pangomm-build-defines.props b/MSVC_Net2013/pangomm-build-defines.props -index 3c3108d..f30890b 100644 ---- a/MSVC_Net2013/pangomm-build-defines.props -+++ b/MSVC_Net2013/pangomm-build-defines.props -@@ -5,8 +5,6 @@ - - - PANGOMM_BUILD -- glibmm-vc$(VSVer)0-2_4.lib;cairomm-vc$(VSVer)0-1_0.lib;sigc-vc$(VSVer)0-2_0.lib -- glibmm-vc$(VSVer)0-d-2_4.lib;cairomm-vc$(VSVer)0-d-1_0.lib;sigc-vc$(VSVer)0-d-2_0.lib - - - <_PropertySheetDisplayName>panogmmbuilddefinesprops -@@ -15,14 +13,14 @@ - - - -- .\pangomm;..\pango;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\cairomm-1.0;$(GlibEtcInstallRoot)\lib\cairomm-1.0\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) -+ .\pangomm;..\pango;.;%(AdditionalIncludeDirectories) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - true - /d2Zi+ %(AdditionalOptions) - - -- pangocairo-1.0.lib;pango-1.0.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) -- $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) -+ %(AdditionalDependencies) -+ %(AdditionalLibraryDirectories) - - - -diff --git a/MSVC_Net2013/pangomm-version-paths.props b/MSVC_Net2013/pangomm-version-paths.props -index b287629..01a267e 100644 ---- a/MSVC_Net2013/pangomm-version-paths.props -+++ b/MSVC_Net2013/pangomm-version-paths.props -@@ -2,13 +2,9 @@ - - - 12 -- $(SolutionDir)\..\..\vs$(VSVer)\$(Platform) -- $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\ - 1 - 4 -- -vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion) -- -vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion) - - - <_PropertySheetDisplayName>pangommversionpathsprops -@@ -17,12 +13,6 @@ - - $(VSVer) - -- -- $(GlibEtcInstallRoot) -- -- -- $(CopyDir) -- - - $(DefDir) - -@@ -32,11 +22,5 @@ - - $(ApiMinorVersion) - -- -- $(ReleaseDllSuffix) -- -- -- $(DebugDllSuffix) -- - - -\ No newline at end of file diff --git a/ports/pangomm/msvc_recommended_pragmas.h b/ports/pangomm/msvc_recommended_pragmas.h deleted file mode 100644 index c0eb1d5edf4cd5..00000000000000 --- a/ports/pangomm/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/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 956a240461c2b5..d97afc7639b04c 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -1,65 +1,25 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz" - FILENAME "pangomm-2.40.1.tar.xz" + URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.48/pangomm-2.48.0.tar.xz" + FILENAME "pangomm-2.48.0.tar.xz" SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES - fix_properties.patch - fix_charset.patch ) -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_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/pangomm.sln - TARGET pangomm - PLATFORM ${VS_PLATFORM} - USE_VCPKG_INTEGRATION -) - -# Handle headers -file(COPY ${SOURCE_PATH}/MSVC_Net2013/pangomm/pangommconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/pango/pangomm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file( - COPY - ${SOURCE_PATH}/pango/pangomm - DESTINATION ${CURRENT_PACKAGES_DIR}/include - FILES_MATCHING PATTERN *.h -) - -# Handle libraries -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/pangomm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/pangomm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/pangomm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/pangomm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dmsvc14x-parallel-installable=false ) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From f2b612e40a944677991f3b66380ad6bee9339e80 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 21:06:36 +0100 Subject: [PATCH 054/182] update pango to meson --- .../pango/0001-fix-static-symbols-export.diff | 16 -- ports/pango/CMakeLists.txt | 206 ------------------ ports/pango/CONTROL | 2 +- ports/pango/config.h.unix | 153 ------------- ports/pango/portfile.cmake | 20 +- 5 files changed, 14 insertions(+), 383 deletions(-) delete mode 100644 ports/pango/0001-fix-static-symbols-export.diff delete mode 100644 ports/pango/CMakeLists.txt delete mode 100644 ports/pango/config.h.unix 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 a7ab60901ff1a6..00000000000000 --- 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/CMakeLists.txt b/ports/pango/CMakeLists.txt deleted file mode 100644 index 230832c182bb48..00000000000000 --- a/ports/pango/CMakeLists.txt +++ /dev/null @@ -1,206 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -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_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 IMPORTED_TARGET) -set(GLIB_LIBRARIES PkgConfig::GLIB2) - -# 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_package(Fontconfig REQUIRED) -# find freetype -find_package(Freetype REQUIRED) - -# find harfbuzz -find_package(harfbuzz REQUIRED) - -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::Fontconfig harfbuzz::harfbuzz) - -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 index 681c22593af83f..b93c9eab6a5f53 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -3,4 +3,4 @@ Version: 1.48.0 Port-Version: 0 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. -Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx) +Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx), fribidi diff --git a/ports/pango/config.h.unix b/ports/pango/config.h.unix deleted file mode 100644 index 83b2f52fddc806..00000000000000 --- 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 header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the 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 header file. */ -#define HAVE_INTTYPES_H 1 - -/* Whether libthai is available */ -/* #undef HAVE_LIBTHAI */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the 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 header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_MMAN_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the 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 8bf458ac8706b2..3c087482347d05 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -2,7 +2,7 @@ set(PANGO_VERSION 1.48.0) vcpkg_download_distfile(ARCHIVE 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 @@ -15,19 +15,25 @@ vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -Dintrospection=false - -Dfontconfig=true + -Dintrospection=disabled + -Dfontconfig=enabled -Dsysprof=disabled - -Dlibtahi=false - -Dcairo=true - -Dxft=false - -Dfreetype=true + -Dlibtahi=disabled + -Dcairo=enabled + -Dxft=disabled + -Dfreetype=enabled + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +vcpkg_copy_tools(TOOL_NAMES pango-view pango-list AUTO_CLEAN) + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) # option('gtk_doc', From 4ba5f8cd85001351948e9baf9a9cf2cec8490cf8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 21:56:59 +0100 Subject: [PATCH 055/182] more updates --- ports/cairo/CONTROL | 2 +- ports/cairo/portfile.cmake | 45 +++++--- ports/cairomm/0001-fix-build.patch | 25 ----- ports/cairomm/CMakeLists.txt | 112 ------------------ ports/cairomm/CONTROL | 4 +- ports/cairomm/cmake/FindCairo.cmake | 131 ---------------------- ports/cairomm/cmake/FindSigC++.cmake | 111 ------------------ ports/cairomm/cmake/cairomm.rc.cmake | 71 ------------ ports/cairomm/cmake/cairommconfig.h.cmake | 13 --- ports/cairomm/portfile.cmake | 41 +++++-- ports/cairomm/undef.win32.patch | 12 ++ ports/gtk/CMakeLists.txt | 2 +- ports/gtk/portfile.cmake | 4 +- ports/pangomm/portfile.cmake | 6 +- 14 files changed, 82 insertions(+), 497 deletions(-) delete mode 100644 ports/cairomm/0001-fix-build.patch delete mode 100644 ports/cairomm/CMakeLists.txt delete mode 100644 ports/cairomm/cmake/FindCairo.cmake delete mode 100644 ports/cairomm/cmake/FindSigC++.cmake delete mode 100644 ports/cairomm/cmake/cairomm.rc.cmake delete mode 100644 ports/cairomm/cmake/cairommconfig.h.cmake create mode 100644 ports/cairomm/undef.win32.patch diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 84b6258c6475e7..10d4349cf72ead 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -3,7 +3,7 @@ Version: 1.16.0 Port-Version: 9 Homepage: https://cairographics.org Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. -Build-Depends: zlib, libpng, pixman, freetype, fontconfig +Build-Depends: zlib, lzo, libpng, pixman, freetype, fontconfig Feature: x11 Description: build with x11 support diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 845d8b940ce716..6d7d3c0e51b072 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -14,37 +14,38 @@ vcpkg_extract_source_archive_ex( 0001_fix_osx_defined.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src) -file(COPY ${CURRENT_PORT_DIR}/cairo-features.h DESTINATION ${SOURCE_PATH}/src) - +#TODO the autoconf script has a lot of additional option which use auto detection and should be disabled! if ("x11" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "Feature x11 only support UNIX.") endif() message(WARNING "You will need to install Xorg dependencies to use feature x11:\napt install libx11-dev libxft-dev\n") + list(APPEND OPTIONS --with-x --enable-xlib=yes) +else() + list(APPEND OPTIONS --enable-xlib=no) endif() if("gobject" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") message(FATAL_ERROR "Feature gobject currently only supports dynamic build.") endif() + list(APPEND OPTIONS --enable-gobject=yes) +else() + list(APPEND OPTIONS --enable-gobject=no) endif() -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - x11 WITH_X11 - gobject WITH_GOBJECT -) -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH}/src - OPTIONS ${FEATURE_OPTIONS} - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} +set(PORT_DEBUG ON) +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + #AUTOCONFIG + OPTIONS ${OPTIONS} + ax_cv_c_float_words_bigendian=no + ac_cv_lib_z_compress=yes + ac_cv_lib_lzo2_lzo2a_decompress=yes ) +vcpkg_install_make() -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cairo TARGET_PATH share/unofficial-cairo) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -62,3 +63,15 @@ endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() + +# This is required so that meson can find cairo since there is no *.pc file installed for cairo! +# file(WRITE "${CURRENT_PACKAGES_DIR}/share/cairo/cairo-config.cmake" +# " \ +# find_package(unofficial-cairo REQUIRED)\n \ +# add_library(cairo::cairo INTERFACE IMPORTED)\n \ +# target_link_libraries(cairo::cairo INTERFACE unofficial::cairo::cairo)\n \ +# if(TARGET unofficial::cairo::cairo-gobject)\n \ + # target_link_libraries(cairo::cairo INTERFACE unofficial::cairo::cairo-gobject)\n \ +# endif()\n \ +# set(cairo_FOUND TRUE)" +# ) diff --git a/ports/cairomm/0001-fix-build.patch b/ports/cairomm/0001-fix-build.patch deleted file mode 100644 index 59e281d79d8b07..00000000000000 --- a/ports/cairomm/0001-fix-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b769f250a39df110db2615c0e0d85b52f2ab6e77 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Sun, 12 Mar 2017 17:57:03 +0300 -Subject: [PATCH] Fix build - ---- - cairomm/win32_surface.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cairomm/win32_surface.h b/cairomm/win32_surface.h -index 2e35b9a..c4454c4 100644 ---- a/cairomm/win32_surface.h -+++ b/cairomm/win32_surface.h -@@ -84,6 +84,8 @@ public: - */ - static RefPtr create(HDC hdc); - -+ static RefPtr create(Format format, int width, int height); -+ - /** Creates a device-independent-bitmap surface not associated with any - * particular existing surface or device context. The created bitmap will be - * unititialized. --- -2.11.0.windows.1 - diff --git a/ports/cairomm/CMakeLists.txt b/ports/cairomm/CMakeLists.txt deleted file mode 100644 index 0c6ed363e66db8..00000000000000 --- a/ports/cairomm/CMakeLists.txt +++ /dev/null @@ -1,112 +0,0 @@ -project(cairomm) -cmake_minimum_required(VERSION 3.4) - -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build/cmake") - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -#get cairomm version -file (STRINGS "configure.ac" CONFIGURE_AC_INIT REGEX "AC_INIT\\(\\[cairomm\\], \\[.*\\].*" ) -string(REGEX REPLACE "AC_INIT\\(\\[.*\\], \\[([0-9]+\\.[0-9]+\\.[0-9]+)\\].*" "\\1" VERSION ${CONFIGURE_AC_INIT}) -string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" CAIROMM_MAJOR_VERSION ${VERSION}) -string(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" CAIROMM_MINOR_VERSION ${VERSION}) -string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" CAIROMM_MICRO_VERSION ${VERSION}) -message(STATUS "Ciaromm version: ${CAIROMM_MAJOR_VERSION}.${CAIROMM_MINOR_VERSION}.${CAIROMM_MICRO_VERSION}") - -find_package(CAIRO REQUIRED) -find_package(Freetype REQUIRED) -find_package(PkgConfig REQUIRED) -pkg_check_modules(SIGCPP sigc++-3.0 IMPORTED_TARGET) - - -#configure -option(BUILD_SHARED_LIBS "Build the shared library" ON) - -option(CAIROMM_ENABLE_API_EXCEPTIONS "enable API exceptions" ON) -if(CAIROMM_ENABLE_API_EXCEPTIONS) - set(CAIROMM_EXCEPTIONS_ENABLED ON) -else() - set(CAIROMM_EXCEPTIONS_ENABLED OFF) -endif() - -configure_file("build/cmake/cairommconfig.h.cmake" "cairommconfig.h") -configure_file("build/cmake/cairomm.rc.cmake" "cairomm.rc" @ONLY) - -#build -set(cairomm_cc - cairomm/context.cc - cairomm/context_surface_quartz.cc - cairomm/context_surface_win32.cc - cairomm/context_surface_xlib.cc - cairomm/device.cc - cairomm/exception.cc - cairomm/fontface.cc - cairomm/fontoptions.cc - cairomm/matrix.cc - cairomm/path.cc - cairomm/pattern.cc - cairomm/private.cc - cairomm/quartz_font.cc - cairomm/quartz_surface.cc - cairomm/region.cc - cairomm/scaledfont.cc - cairomm/script.cc - cairomm/script_surface.cc - cairomm/surface.cc - cairomm/win32_font.cc - cairomm/win32_surface.cc - cairomm/xlib_surface.cc) - -set(cairomm_public_h - cairomm/cairomm.h - cairomm/context.h - cairomm/device.h - cairomm/enums.h - cairomm/exception.h - cairomm/fontface.h - cairomm/fontoptions.h - cairomm/matrix.h - cairomm/path.h - cairomm/pattern.h - cairomm/quartz_font.h - cairomm/quartz_surface.h - cairomm/refptr.h - cairomm/region.h - cairomm/scaledfont.h - cairomm/script.h - cairomm/script_surface.h - cairomm/surface.h - cairomm/types.h - cairomm/win32_font.h - cairomm/win32_surface.h - cairomm/xlib_surface.h) - -set(cairomm_private_h - cairomm/context_private.h - cairomm/private.h) - -set(cairomm_rc - ${CMAKE_BINARY_DIR}/cairomm.rc) - -add_library(cairomm-1.0 ${cairomm_cc} ${cairomm_rc}) -target_link_libraries(cairomm-1.0 ${CAIRO_LIBRARY} PkgConfig::SIGCPP Freetype::Freetype) -target_include_directories(cairomm-1.0 PRIVATE - ${CAIRO_INCLUDE_DIR} - ${SIGCCPP_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}) - -install( - TARGETS cairomm-1.0 - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -install( - FILES ${cairomm_public_h} - DESTINATION include/cairomm) - -install( - FILES ${CMAKE_BINARY_DIR}/cairommconfig.h - DESTINATION include) diff --git a/ports/cairomm/CONTROL b/ports/cairomm/CONTROL index 185d4314b1b689..2a35a7adff554f 100644 --- a/ports/cairomm/CONTROL +++ b/ports/cairomm/CONTROL @@ -1,6 +1,6 @@ Source: cairomm -Version: 1.15.3 -Port-Version: 6 +Version: 1.16.0 +Port-Version: 0 Homepage: https://www.cairographics.org Description: A C++ wrapper for the cairo graphics library Build-Depends: cairo, libsigcpp diff --git a/ports/cairomm/cmake/FindCairo.cmake b/ports/cairomm/cmake/FindCairo.cmake deleted file mode 100644 index 0a87fadf8df6fa..00000000000000 --- a/ports/cairomm/cmake/FindCairo.cmake +++ /dev/null @@ -1,131 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. -# -# revision: 2 -# See https://github.com/CMakePorts/CMakeFindPackages for updates -# -#.rst: -# FindCairo -# --------- -# -# Locate Cairo library -# -# This module defines -# -# :: -# CAIRO_FOUND - system has the CAIRO library -# CAIRO_INCLUDE_DIR - the CAIRO include directory -# CAIRO_LIBRARIES - The libraries needed to use CAIRO -# CAIRO_VERSION - This is set to $major.$minor.$revision (eg. 0.9.8) -# CAIRO_VERSION_STRING - This is set to $major.$minor.$revision (eg. 0.9.8) -# -# Authors: -# Copyright (c) Eric Wing -# Copyright (c) Alexander Neundorf -# Copyright (c) 2008 Joshua L. Blocher -# Copyright (c) 2012 Dmitry Baryshnikov -# Copyright (c) 2013-2017 Mikhail Paulyshka -# - - -if (NOT WIN32) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_CAIRO cairo) - - SET(CAIRO_VERSION ${_CAIRO_VERSION}) - STRING (REGEX REPLACE "([0-9]+).([0-9]+).([0-9]+)" "\\1" num "${CAIRO_VERSION}") - MATH (EXPR CAIRO_VERSION_MAJOR "${num}") - STRING (REGEX REPLACE "([0-9]+).([0-9]+).([0-9]+)" "\\2" num "${CAIRO_VERSION}") - MATH (EXPR CAIRO_VERSION_MINOR "${num}") - STRING (REGEX REPLACE "([0-9]+).([0-9]+).([0-9]+)" "\\3" num "${CAIRO_VERSION}") - MATH (EXPR CAIRO_VERSION_MICRO "${num}") - endif (PKG_CONFIG_FOUND) -endif (NOT WIN32) - -set(_CAIRO_ROOT_HINTS_AND_PATHS - HINTS - $ENV{CAIRO} - $ENV{CAIRO_DIR} - ${CMAKE_FIND_ROOT_PATH} - ${CAIRO_ROOT_DIR} - PATHS - ${CMAKE_FIND_ROOT_PATH} - $ENV{CAIRO}/src - /usr - /usr/local -) - -find_path(CAIRO_INCLUDE_DIR - NAMES - cairo.h - HINTS - ${_CAIRO_INCLUDEDIR} - ${_CAIRO_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - include - "include/cairo" -) - -if(NOT CAIRO_LIBRARY) - FIND_LIBRARY(CAIRO_LIBRARY_RELEASE - NAMES - cairo - cairo-static - HINTS - ${_CAIRO_LIBDIR} - ${_CAIRO_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - "local/lib" - ) - - FIND_LIBRARY(CAIRO_LIBRARY_DEBUG - NAMES - cairod - cairo-staticd - HINTS - ${_CAIRO_LIBDIR} - ${_CAIRO_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - "local/lib" - ) - - include(SelectLibraryConfigurations) - select_library_configurations(CAIRO) -endif() -set(CAIRO_LIBRARIES ${CAIRO_LIBRARY}) - -if (NOT CAIRO_VERSION) - if (EXISTS "${CAIRO_INCLUDE_DIR}/cairo-version.h") - file(READ "${CAIRO_INCLUDE_DIR}/cairo-version.h" CAIRO_VERSION_CONTENT) - - string(REGEX MATCH "#define +CAIRO_VERSION_MAJOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}") - set(CAIRO_VERSION_MAJOR "${CMAKE_MATCH_1}") - - string(REGEX MATCH "#define +CAIRO_VERSION_MINOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}") - set(CAIRO_VERSION_MINOR "${CMAKE_MATCH_1}") - - string(REGEX MATCH "#define +CAIRO_VERSION_MICRO +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}") - set(CAIRO_VERSION_MICRO "${CMAKE_MATCH_1}") - - set(CAIRO_VERSION "${CAIRO_VERSION_MAJOR}.${CAIRO_VERSION_MINOR}.${CAIRO_VERSION_MICRO}") - set(CAIRO_VERSION_STRING CAIRO_VERSION) - endif () -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - CAIRO - REQUIRED_VARS - CAIRO_LIBRARIES - CAIRO_INCLUDE_DIR - VERSION_VAR - CAIRO_VERSION_STRING -) - -MARK_AS_ADVANCED( - CAIRO_INCLUDE_DIR - CAIRO_LIBRARY - CAIRO_LIBRARIES) diff --git a/ports/cairomm/cmake/FindSigC++.cmake b/ports/cairomm/cmake/FindSigC++.cmake deleted file mode 100644 index 8d65f70d9a67ad..00000000000000 --- a/ports/cairomm/cmake/FindSigC++.cmake +++ /dev/null @@ -1,111 +0,0 @@ -# - Try to find SIGC++ -# Once done this will define -# -# SIGC++_ROOT_DIR - Set this variable to the root installation of SIGC++ -# SIGC++_FOUND - system has SIGC++ -# SIGC++_INCLUDE_DIRS - the SIGC++ include directory -# SIGC++_LIBRARIES - Link these to use SIGC++ -# -# Copyright (c) 2008 Joshua L. Blocher -# Copyright (c) 2012 Dmitry Baryshnikov -# Copyright (c) 2013-2017 Mikhail Paulyshka -# -# Distributed under the OSI-approved BSD License -# - -if (NOT WIN32) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_SIGC++ sigc++-2.0) - SET(SIGC++_VERSION ${_SIGC++_VERSION}) - endif (PKG_CONFIG_FOUND) -endif (NOT WIN32) - -SET(_SIGC++_ROOT_HINTS - $ENV{SIGC++} - ${CMAKE_FIND_ROOT_PATH} - ${SIGC++_ROOT_DIR} -) - -SET(_SIGC++_ROOT_PATHS - $ENV{SIGC++}/src - /usr - /usr/local -) - -SET(_SIGC++_ROOT_HINTS_AND_PATHS - HINTS ${_SIGC++_ROOT_HINTS} - PATHS ${_SIGC++_ROOT_PATHS} -) - -FIND_PATH(SIGC++_INCLUDE_DIR - NAMES - "sigc++/sigc++.h" - HINTS - ${_SIGC++_INCLUDEDIR} - ${_SIGC++_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - include - "include/sigc++-2.0" -) - -find_path(SIGC++_CONFIG_INCLUDE_DIR - NAMES - sigc++config.h - HINTS - ${_SIGC++_LIBDIR} - ${_SIGC++_INCLUDEDIR} - ${_SIGC++_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - include - lib - "sigc++-2.0/include" - "lib/sigc++-2.0" - "lib/sigc++-2.0/include" -) - -FIND_LIBRARY(SIGC++_LIBRARY - NAMES - sigc-2.0 - HINTS - ${_SIGC++_LIBDIR} - ${_SIGC++_ROOT_HINTS_AND_PATHS} - PATH_SUFFIXES - "lib" - "local/lib" -) - -SET(SIGC++_LIBRARIES - ${SIGC++_LIBRARY} -) - -SET(SIGC++_INCLUDE_DIRS - ${SIGC++_INCLUDE_DIR} - ${SIGC++_CONFIG_INCLUDE_DIR} -) - -if (NOT SIGC++_VERSION) - if (EXISTS "${SIGC++_CONFIG_INCLUDE_DIR}/sigc++config.h") - file(READ "${SIGC++_CONFIG_INCLUDE_DIR}/sigc++config.h" SIGC++_VERSION_CONTENT) - - string(REGEX MATCH "#define +SIGCXX_MAJOR_VERSION +([0-9]+)" _dummy "${SIGC++_VERSION_CONTENT}") - set(SIGC++_VERSION_MAJOR "${CMAKE_MATCH_1}") - - string(REGEX MATCH "#define +SIGCXX_MINOR_VERSION +([0-9]+)" _dummy "${SIGC++_VERSION_CONTENT}") - set(SIGC++_VERSION_MINOR "${CMAKE_MATCH_1}") - - string(REGEX MATCH "#define +SIGCXX_MICRO_VERSION +([0-9]+)" _dummy "${SIGC++_VERSION_CONTENT}") - set(SIGC++_VERSION_MICRO "${CMAKE_MATCH_1}") - - set(SIGC++_VERSION "${SIGC++_VERSION_MAJOR}.${SIGC++_VERSION_MINOR}.${SIGC++_VERSION_MICRO}") - endif (EXISTS "${SIGC++_CONFIG_INCLUDE_DIR}/sigc++config.h") -endif(NOT SIGC++_VERSION) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(SIGC++ - REQUIRED_VARS SIGC++_LIBRARIES SIGC++_INCLUDE_DIRS - VERSION_VAR SIGC++_VERSION - FAIL_MESSAGE "Could NOT find SIGC++, try to set the path to SIGC++ root folder in the system variable SIGC++" -) - -MARK_AS_ADVANCED(SIGC++_CONFIG_INCLUDE_DIR SIGC++_INCLUDE_DIR SIGC++_INCLUDE_DIRS SIGC++_LIBRARY SIGC++_LIBRARIES) diff --git a/ports/cairomm/cmake/cairomm.rc.cmake b/ports/cairomm/cmake/cairomm.rc.cmake deleted file mode 100644 index 4aa7a0a0598b4c..00000000000000 --- a/ports/cairomm/cmake/cairomm.rc.cmake +++ /dev/null @@ -1,71 +0,0 @@ - -#define APSTUDIO_READONLY_SYMBOLS - -#include - -#undef APSTUDIO_READONLY_SYMBOLS - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @CAIROMM_MAJOR_VERSION@,@CAIROMM_MINOR_VERSION@,@CAIROMM_MICRO_VERSION@,1 - PRODUCTVERSION @CAIROMM_MAJOR_VERSION@,@CAIROMM_MINOR_VERSION@,@CAIROMM_MICRO_VERSION@,1 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "The cairomm development team (see AUTHORS)" - VALUE "FileDescription", "The official C++ wrapper for cairo" - VALUE "FileVersion", "@VERSION@" - VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" - VALUE "OriginalFilename", "cairomm-1.0" - VALUE "ProductName", "cairomm" - VALUE "ProductVersion", "@VERSION@" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources - -#ifndef APSTUDIO_INVOKED - -#endif // not APSTUDIO_INVOKED diff --git a/ports/cairomm/cmake/cairommconfig.h.cmake b/ports/cairomm/cmake/cairommconfig.h.cmake deleted file mode 100644 index 526a70c4cc312c..00000000000000 --- a/ports/cairomm/cmake/cairommconfig.h.cmake +++ /dev/null @@ -1,13 +0,0 @@ -/* This file is part of cairomm. */ - -/* Defined when the --enable-api-exceptions configure argument was given */ -#cmakedefine CAIROMM_EXCEPTIONS_ENABLED 1 - -/* Major version number of cairomm. */ -#cmakedefine CAIROMM_MAJOR_VERSION @CAIROMM_MAJOR_VERSION@ - -/* Minor version number of cairomm. */ -#cmakedefine CAIROMM_MINOR_VERSION @CAIROMM_MINOR_VERSION@ - -/* Micro version number of cairomm. */ -#cmakedefine CAIROMM_MICRO_VERSION @CAIROMM_MICRO_VERSION@ diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index c954b3bc150479..9806ebd14d4c22 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(CAIROMM_VERSION 1.15.3) -set(CAIROMM_HASH a2c28786dbd167179561d8f580eeb11d10634a36dfdb1adeefc0279acf83ee906f01f264cb924845fc4ab98da1afac71e1ead742f283c1a32368ca9af28e464a) +set(CAIROMM_VERSION 1.16.0) +set(CAIROMM_HASH 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3) vcpkg_download_distfile(ARCHIVE - URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.gz" + URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz" FILENAME "cairomm-${CAIROMM_VERSION}.tar.gz" SHA512 ${CAIROMM_HASH} ) @@ -13,23 +13,42 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - 0001-fix-build.patch + undef.win32.patch # because WIN32 is used as an ENUM identifier. ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}/build) - -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + -Dbuild-examples=false + -Dmsvc14x-parallel-installable=false ) -vcpkg_install_cmake() +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], + # value: 'if-git-build', description: 'Let mm-common-get copy some files to untracked/') +# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], + # value: 'min', description: 'Compiler warning level') +# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], + # value: 'fatal', description: 'Compiler warning level when a tarball is created') +# option('build-deprecated-api', type: 'boolean', value: true, + # description: 'Build deprecated API and include it in the library') +# option('build-exceptions-api', type: 'boolean', value: true, + # description: 'Build exceptions API and include it in the library') +# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], + # value: 'if-maintainer-mode', description: 'Build and install the documentation') +# option('build-examples', type: 'boolean', value: true, + # description: 'Build example programs') +# option('build-tests', type: 'combo', choices: ['false', 'if-dependencies-found', 'true'], + # value: 'if-dependencies-found', description: 'Build test programs (requires Boost Test and Fontconfig or Windows)') +# option('boost-shared', type: 'boolean', + # value: false, description: 'Use shared version of boost') +# option('msvc14x-parallel-installable', type: 'boolean', value: true, + # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') \ No newline at end of file diff --git a/ports/cairomm/undef.win32.patch b/ports/cairomm/undef.win32.patch new file mode 100644 index 00000000000000..e91db0bfe42b06 --- /dev/null +++ b/ports/cairomm/undef.win32.patch @@ -0,0 +1,12 @@ +diff --git a/cairomm/surface.h b/cairomm/surface.h +index c923e6086..8cfaa76a3 100644 +--- a/cairomm/surface.h ++++ b/cairomm/surface.h +@@ -49,6 +49,7 @@ + #include + #endif // CAIRO_HAS_GLITZ_SURFACE + ++#undef WIN32 + + namespace Cairo + { diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt index f7052f32687f4a..4853e3d207d64a 100644 --- a/ports/gtk/CMakeLists.txt +++ b/ports/gtk/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.8) project(gtk+ C) configure_file(config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index f7e63393ce32ed..f9517575f1d339 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -1,8 +1,8 @@ -set(GTK_VERSION 3.22.19) +set(GTK_VERSION 4.0.1) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-${GTK_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/4.0.1/gtk+-${GTK_VERSION}.tar.xz" FILENAME "gtk+-${GTK_VERSION}.tar.xz" SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 ) diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index d97afc7639b04c..95eb70ed2aa677 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64") vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.48/pangomm-2.48.0.tar.xz" FILENAME "pangomm-2.48.0.tar.xz" - SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f + SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3 ) vcpkg_extract_source_archive_ex( @@ -16,6 +16,10 @@ vcpkg_configure_meson( PREFER_NINJA OPTIONS -Dmsvc14x-parallel-installable=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson() From 10fa1ad929d0837c85f2c1c269bf82150b1344b8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 16 Jan 2021 22:03:12 +0100 Subject: [PATCH 056/182] update pixman --- ports/pixman/CMakeLists.txt | 87 ------------------------------------- ports/pixman/CONTROL | 4 +- ports/pixman/portfile.cmake | 71 +++++++++++++++++------------- 3 files changed, 42 insertions(+), 120 deletions(-) delete mode 100644 ports/pixman/CMakeLists.txt diff --git a/ports/pixman/CMakeLists.txt b/ports/pixman/CMakeLists.txt deleted file mode 100644 index 06643c30cf8e0c..00000000000000 --- a/ports/pixman/CMakeLists.txt +++ /dev/null @@ -1,87 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(pixman VERSION 0.34.0 LANGUAGES C) - -set(CMAKE_DEBUG_POSTFIX "d") - -if(UNIX) - add_definitions(-DHAVE_PTHREADS) -endif() - -include_directories(".") - -file(GLOB SOURCES -"pixman.c" -"pixman-access.c" -"pixman-access-accessors.c" -"pixman-bits-image.c" -"pixman-combine32.c" -"pixman-combine-float.c" -"pixman-conical-gradient.c" -"pixman-filter.c" -"pixman-x86.c" -"pixman-mips.c" -"pixman-arm.c" -"pixman-ppc.c" -"pixman-edge.c" -"pixman-edge-accessors.c" -"pixman-fast-path.c" -"pixman-glyph.c" -"pixman-general.c" -"pixman-gradient-walker.c" -"pixman-image.c" -"pixman-implementation.c" -"pixman-linear-gradient.c" -"pixman-matrix.c" -"pixman-noop.c" -"pixman-radial-gradient.c" -"pixman-region16.c" -"pixman-region32.c" -"pixman-solid-fill.c" -"pixman-timer.c" -"pixman-trap.c" -"pixman-utils.c" -) - -# pixman requires the three PACKAGE* definitions in order to compile. -set(PIXMAN_DEFS - PRIVATE - PACKAGE="pixman-1" - PACKAGE_VERSION="0.34.0" - PACKAGE_BUGREPORT="" -) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - # don't enable SSE2 for arm64-windows and arm-windows -else() - # The USE_SSE2 definition lets it use SSE2 instructions for speed. Every x86/64 target machine should have SSE2 these days. - set(PIXMAN_DEFS ${PIXMAN_DEFS} USE_SSE2) - file(GLOB SSE2_SOURCES "pixman-sse2.c") - set(SOURCES ${SOURCES} ${SSE2_SOURCES}) -endif() - -add_library(pixman-1 ${SOURCES}) -target_include_directories(pixman-1 PUBLIC $) -target_compile_definitions(pixman-1 ${PIXMAN_DEFS}) - -if(USE_SSE2 AND UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4) - target_compile_options(pixman-1 PRIVATE -msse2) -endif() - -# pixman produces a lot of warnings which are disabled here because they otherwise fill up the log files -if(MSVC) - target_compile_options(pixman-1 PRIVATE "/wd4244" "/wd4146" "/wd4996") # PUBLIC "/D_CRT_SECURE_NO_WARNINGS" -endif() - -install(TARGETS pixman-1 - EXPORT pixman-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install( - EXPORT pixman-targets - NAMESPACE unofficial::pixman:: - FILE unofficial-pixman-config.cmake - DESTINATION share/unofficial-pixman -) diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index a9e21f833a2384..b80738e2629e4e 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -1,5 +1,5 @@ Source: pixman -Version: 0.38.4 -Port-Version: 2 +Version: 0.40.0 Homepage: https://www.cairographics.org/releases Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. +Build-Depends: libpng, tool-meson \ No newline at end of file diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 25bbd2d04869f7..db82ff89828ee6 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -1,43 +1,52 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -set(PIXMAN_VERSION 0.38.4) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs + # Insert in the beginning to make it overwriteable + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(INSERT VCPKG_CXX_FLAGS 0 /arch:SSE2) + list(INSERT VCPKG_C_FLAGS 0 /arch:SSE2) + endif() +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(INSERT VCPKG_CXX_FLAGS 0 /arch:SSE2) + list(INSERT VCPKG_C_FLAGS 0 /arch:SSE2) + list(APPEND OPTIONS + -Dmmx=enabled + -Dsse2=enabled + -Dssse3=enabled) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS + -Dmmx=enabled + -Dsse2=enabled + -Dssse3=enabled) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + list(APPEND OPTIONS + -Darm-simd=enabled + ) +endif() + +set(PIXMAN_VERSION 0.40.0) vcpkg_download_distfile(ARCHIVE URLS "https://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz" FILENAME "pixman-${PIXMAN_VERSION}.tar.gz" - SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af + SHA512 063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PIXMAN_VERSION} ) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/pixman) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/pixman - PREFER_NINJA -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-pixman TARGET_PATH share/unofficial-pixman) - -# Copy the appropriate header files. -file(COPY - "${SOURCE_PATH}/pixman/pixman.h" - "${SOURCE_PATH}/pixman/pixman-accessor.h" - "${SOURCE_PATH}/pixman/pixman-combine32.h" - "${SOURCE_PATH}/pixman/pixman-compiler.h" - "${SOURCE_PATH}/pixman/pixman-edge-imp.h" - "${SOURCE_PATH}/pixman/pixman-inlines.h" - "${SOURCE_PATH}/pixman/pixman-private.h" - "${SOURCE_PATH}/pixman/pixman-version.h" - DESTINATION ${CURRENT_PACKAGES_DIR}/include +# Meson install wrongly pkgconfig file! +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Dlibpng=enabled ) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pixman) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/pixman/COPYING ${CURRENT_PACKAGES_DIR}/share/pixman/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_copy_pdbs() +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From ab0a8987d0cbd23b7486f0f5e442540897e1ee63 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Jan 2021 00:15:57 +0100 Subject: [PATCH 057/182] fix cairo --- ports/cairo/CMakeLists.txt | 312 ----------------------------------- ports/cairo/build.patch | 96 +++++++++++ ports/cairo/cairo-features.h | 38 ----- ports/cairo/portfile.cmake | 6 +- 4 files changed, 99 insertions(+), 353 deletions(-) delete mode 100644 ports/cairo/CMakeLists.txt create mode 100644 ports/cairo/build.patch delete mode 100644 ports/cairo/cairo-features.h diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt deleted file mode 100644 index 23bdfdda81b619..00000000000000 --- a/ports/cairo/CMakeLists.txt +++ /dev/null @@ -1,312 +0,0 @@ -cmake_minimum_required(VERSION 3.11) -project(cairo C) - -# Add include directories -include_directories(".") -if(WIN32) - include_directories("./win32") -endif() - -set(CAIRO_HEADERS - cairo.h - cairo-deprecated.h - cairo-features.h - cairo-pdf.h - cairo-ps.h - cairo-script.h - cairo-svg.h - ../cairo-version.h - cairo-win32.h - ../util/cairo-gobject/cairo-gobject.h - cairo-ft.h -) - -set(CAIRO_X11_HEADERS - cairo-xlib.h -) - -file(GLOB SOURCES -"cairo-analysis-surface.c" -"cairo-arc.c" -"cairo-array.c" -"cairo-atomic.c" -"cairo-base64-stream.c" -"cairo-base85-stream.c" -"cairo-bentley-ottmann.c" -"cairo-bentley-ottmann-rectangular.c" -"cairo-bentley-ottmann-rectilinear.c" -"cairo-botor-scan-converter.c" -"cairo-boxes.c" -"cairo-boxes-intersect.c" -"cairo.c" -"cairo-cache.c" -"cairo-clip.c" -"cairo-clip-boxes.c" -"cairo-clip-polygon.c" -"cairo-clip-region.c" -"cairo-clip-surface.c" -"cairo-color.c" -"cairo-composite-rectangles.c" -"cairo-compositor.c" -"cairo-contour.c" -"cairo-damage.c" -"cairo-debug.c" -"cairo-default-context.c" -"cairo-device.c" -"cairo-error.c" -"cairo-fallback-compositor.c" -"cairo-fixed.c" -"cairo-font-face.c" -"cairo-font-face-twin.c" -"cairo-font-face-twin-data.c" -"cairo-font-options.c" -"cairo-freelist.c" -"cairo-freed-pool.c" -"cairo-gstate.c" -"cairo-hash.c" -"cairo-hull.c" -"cairo-image-compositor.c" -"cairo-image-info.c" -"cairo-image-source.c" -"cairo-image-surface.c" -"cairo-line.c" -"cairo-lzw.c" -"cairo-matrix.c" -"cairo-mask-compositor.c" -"cairo-mesh-pattern-rasterizer.c" -"cairo-mempool.c" -"cairo-misc.c" -"cairo-mono-scan-converter.c" -"cairo-mutex.c" -"cairo-no-compositor.c" -"cairo-observer.c" -"cairo-output-stream.c" -"cairo-paginated-surface.c" -"cairo-path-bounds.c" -"cairo-path.c" -"cairo-path-fill.c" -"cairo-path-fixed.c" -"cairo-path-in-fill.c" -"cairo-path-stroke.c" -"cairo-path-stroke-boxes.c" -"cairo-path-stroke-polygon.c" -"cairo-path-stroke-traps.c" -"cairo-path-stroke-tristrip.c" -"cairo-pattern.c" -"cairo-pen.c" -"cairo-polygon.c" -"cairo-polygon-intersect.c" -"cairo-polygon-reduce.c" -"cairo-raster-source-pattern.c" -"cairo-recording-surface.c" -"cairo-rectangle.c" -"cairo-rectangular-scan-converter.c" -"cairo-region.c" -"cairo-rtree.c" -"cairo-scaled-font.c" -"cairo-shape-mask-compositor.c" -"cairo-slope.c" -"cairo-spans.c" -"cairo-spans-compositor.c" -"cairo-spline.c" -"cairo-stroke-dash.c" -"cairo-stroke-style.c" -"cairo-surface.c" -"cairo-surface-clipper.c" -"cairo-surface-fallback.c" -"cairo-surface-observer.c" -"cairo-surface-offset.c" -"cairo-surface-snapshot.c" -"cairo-surface-subsurface.c" -"cairo-surface-wrapper.c" -"cairo-time.c" -"cairo-tor-scan-converter.c" -"cairo-tor22-scan-converter.c" -"cairo-clip-tor-scan-converter.c" -"cairo-tag-attributes.c" -"cairo-tag-stack.c" -"cairo-toy-font-face.c" -"cairo-traps.c" -"cairo-tristrip.c" -"cairo-traps-compositor.c" -"cairo-unicode.c" -"cairo-user-font.c" -"cairo-version.c" -"cairo-wideint.c" -# generic font support -"cairo-cff-subset.c" -"cairo-scaled-font-subsets.c" -"cairo-truetype-subset.c" -"cairo-type1-fallback.c" -"cairo-type1-glyph-names.c" -"cairo-type1-subset.c" -"cairo-type3-glyph-surface.c" -# pdf -"cairo-pdf-interchange.c" -"cairo-pdf-operators.c" -"cairo-pdf-shading.c" -"cairo-pdf-surface.c" -# png -"cairo-png.c" -# ps surface -"cairo-ps-surface.c" -# deflate source -"cairo-deflate-stream.c" -# svg surface -"cairo-svg-surface.c" -# script surface -"cairo-script-surface.c" -# fontconfig + freetype -"cairo-ft-font.c" -) - -# win32 -file(GLOB PLATFORM_SOURCES_WIN32 -"win32/cairo-win32-debug.c" -"win32/cairo-win32-device.c" -"win32/cairo-win32-gdi-compositor.c" -"win32/cairo-win32-system.c" -"win32/cairo-win32-surface.c" -"win32/cairo-win32-display-surface.c" -"win32/cairo-win32-printing-surface.c" -"win32/cairo-win32-font.c" -) - -if(WIN32) - list(APPEND SOURCES ${PLATFORM_SOURCES_WIN32}) -endif() - -set(CMAKE_DEBUG_POSTFIX "d") - -find_package(Threads REQUIRED) -find_package(ZLIB REQUIRED) -find_package(PNG REQUIRED) -find_package(Freetype REQUIRED) -find_package(Fontconfig REQUIRED) -find_package(unofficial-pixman CONFIG REQUIRED) - -# Cairo needs to be told which features of FreeType are availible -add_definitions( - -DHAVE_FT_GLYPHSLOT_EMBOLDEN=1 - -DHAVE_FT_LIBRARY_SETLCDFILTER=1 - -DHAVE_FT_GLYPHSLOT_OBLIQUE=1 - -DHAVE_FT_LOAD_SFNT_TABLE=1 - -DHAVE_FT_GET_X11_FONT_FORMAT=1) - -# additional features for macOS -if(UNIX OR APPLE) - add_definitions( - -DHAVE_INTTYPES_H=1 - -DHAVE_STDINT_H=1 - -DHAVE_SYS_TYPES_H=1 - -DHAVE_UINT64_T=1 - -DHAVE_UNISTD_H=1 - -DCAIRO_HAS_PTHREAD=1 - -DCAIRO_HAS_REAL_PTHREAD=1) -endif() - -add_library(cairo ${SOURCES}) - -if (WITH_X11) - target_compile_definitions(cairo PUBLIC -DCAIRO_HAS_XLIB_SURFACE=1) -endif() -target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS}) -target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 Fontconfig::Fontconfig) - -if(WIN32) - target_link_libraries(cairo PRIVATE gdi32 msimg32 user32) -endif() - -# GObject support module - -set(CAIRO_GOBJECT_SOURCES - "../util/cairo-gobject/cairo-gobject-enums.c" - "../util/cairo-gobject/cairo-gobject-structs.c") - -# GObject support sources do not include header with export macro -if(WITH_GOBJECT) - if(BUILD_SHARED_LIBS) - if(MSVC) - set_source_files_properties( - "../util/cairo-gobject/cairo-gobject-enums.c" - "../util/cairo-gobject/cairo-gobject-structs.c" - PROPERTIES COMPILE_DEFINITIONS "cairo_public=__declspec(dllexport)") - else() - set_source_files_properties( - "../util/cairo-gobject/cairo-gobject-enums.c" - "../util/cairo-gobject/cairo-gobject-structs.c" - PROPERTIES COMPILE_DEFINITIONS "cairo_public=__attribute__((visibility(\"default\")))") - endif() - endif() - - find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 IMPORTED_TARGET) - find_package(Iconv REQUIRED) - add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES}) - target_include_directories(cairo-gobject PRIVATE ${GLIB2_INCLUDE_DIRS}) - target_link_libraries(cairo-gobject PRIVATE cairo PkgConfig::GLIB2 ${Iconv_LIBRARIES}) -endif() - -if(MSVC) - # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files - # NOTE: options only available to MSVC, clang in macOS doesn't understand these flags - target_compile_options(cairo PRIVATE - "/wd4244" "/wd4146" "/wd4312" "/wd4267" "/wd4996" "/wd4311" "/wd4334" "/wd4101" - ) - if(WITH_GOBJECT) - target_compile_options(cairo-gobject PRIVATE - "/wd4244" "/wd4146" "/wd4312" "/wd4267" "/wd4996" "/wd4311" "/wd4334" "/wd4101" - ) - endif() -endif() - -if (CAIRO_HAS_XLIB_SURFACE) - file(INSTALL cairo-xlib.h DESTINATION include) -endif() - -install(FILES ${CAIRO_HEADERS} DESTINATION include) -install(FILES ${CAIRO_HEADERS} DESTINATION include/cairo) - -if (WITH_X11) - install(FILES ${CAIRO_X11_HEADERS} DESTINATION include) - install(FILES ${CAIRO_X11_HEADERS} DESTINATION include/cairo) -endif() - -install(TARGETS cairo - EXPORT cairo-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(WITH_GOBJECT) - install(TARGETS cairo-gobject - EXPORT cairo-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) -endif() - -install( - EXPORT cairo-targets - NAMESPACE unofficial::cairo:: - FILE unofficial-cairo-targets.cmake - DESTINATION share/unofficial-cairo -) - -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake " -include(CMakeFindDependencyMacro) -find_dependency(ZLIB) -find_dependency(PNG) -find_dependency(Freetype) -find_dependency(Fontconfig) -find_dependency(unofficial-pixman CONFIG) -if(WITH_GOBJECT) - find_dependency(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 IMPORTED_TARGET) -endif() - -include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-cairo-targets.cmake) -") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-cairo-config.cmake DESTINATION share/unofficial-cairo) diff --git a/ports/cairo/build.patch b/ports/cairo/build.patch new file mode 100644 index 00000000000000..54a06f288d38d0 --- /dev/null +++ b/ports/cairo/build.patch @@ -0,0 +1,96 @@ +diff --git a/Makefile.in b/Makefile.in +index e29609c2e..898576e57 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -717,7 +717,7 @@ MAINTAINERCLEANFILES = Makefile.in $(srcdir)/aclocal.m4 \ + # $(srcdir)/build/Makefile.win32.features-h \ + # $(NULL) + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} +-DIST_SUBDIRS = src doc util boilerplate test perf ++DIST_SUBDIRS = src doc util boilerplate perf + SUBDIRS = src doc util $(am__append_1) + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ +@@ -1498,14 +1498,13 @@ configure: cairo-version.h + + doc: + cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ +-test retest recheck: all +- cd test && $(MAKE) $(AM_MAKEFLAGS) $@ ++test retest recheck: ++ + perf: all + cd perf && $(MAKE) $(AM_MAKEFLAGS) $@ + check-valgrind: all +- cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind + cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind +-.PHONY: doc test retest recheck perf check-valgrind ++.PHONY: doc retest recheck perf check-valgrind + + changelogs: + @$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS) +@@ -1596,7 +1595,6 @@ release-verify-sane-changelogs: changelogs + + release-verify-sane-tests: + @echo "Checking that the test suite is sane..." +- @cd test && $(MAKE) $(AM_MAKEFLAGS) release-verify-sane-tests + + release-verify-even-micro: + @echo -n "Checking that $(VERSION) has an even micro component..." +diff --git a/configure b/configure +index de5d4e9fe..07466e506 100644 +--- a/configure ++++ b/configure +@@ -21276,7 +21276,7 @@ if ${ac_cv_lib_z_compress+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++LIBS="$LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h +index d982c101d..ad9b26ba0 100644 +--- a/src/cairo-compiler-private.h ++++ b/src/cairo-compiler-private.h +@@ -201,10 +201,10 @@ + #define hypot _hypot + #define pclose _pclose + #define popen _popen +-#define snprintf _snprintf ++//#define snprintf _snprintf + #define strdup _strdup + #define unlink _unlink +-#define vsnprintf _vsnprintf ++//#define vsnprintf _vsnprintf + #endif + + #ifdef _MSC_VER +diff --git a/test/bitmap-font.c b/test/bitmap-font.c +index 525bafb2a..69cd985c6 100644 +--- a/test/bitmap-font.c ++++ b/test/bitmap-font.c +@@ -27,7 +27,9 @@ + + #include + #include ++#if defined(HAVE_UNISTD) + #include ++#endif + + #include + #include +diff --git a/test/cairo-test.h b/test/cairo-test.h +index 7e9605f61..dcdf74f60 100644 +--- a/test/cairo-test.h ++++ b/test/cairo-test.h +@@ -58,7 +58,7 @@ typedef unsigned __int64 uint64_t; + #define _USE_MATH_DEFINES + + #include +-#define isnan(x) _isnan(x) ++//#define isnan(x) _isnan(x) + + #endif + diff --git a/ports/cairo/cairo-features.h b/ports/cairo/cairo-features.h deleted file mode 100644 index e3eb31c139ce85..00000000000000 --- a/ports/cairo/cairo-features.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef CAIRO_FEATURES_H -#define CAIRO_FEATURES_H -/* Chosen from the various possible defines in "../build/Makefile.win32.features.h"" - guided by "../build/Makefile.win32.features". Modify at your own risk. -*/ - -/* Always for Win32 */ -#ifdef _WIN32 -#define CAIRO_HAS_WIN32_SURFACE 1 -#define CAIRO_HAS_WIN32_FONT 1 -#endif - -/* Require libpng */ -#define CAIRO_HAS_PNG_FUNCTIONS 1 -#define CAIRO_HAS_PS_SURFACE 1 -#define CAIRO_HAS_PDF_SURFACE 1 - -// Likely available -#define CAIRO_HAS_SCRIPT_SURFACE 1 -#define CAIRO_HAS_SVG_SURFACE 1 - -/* Always available */ -#define CAIRO_HAS_IMAGE_SURFACE 1 -#define CAIRO_HAS_MIME_SURFACE 1 -#define CAIRO_HAS_RECORDING_SURFACE 1 -#define CAIRO_HAS_OBSERVER_SURFACE 1 -#define CAIRO_HAS_USER_FONT 1 - -/* Require GObject */ -#define CAIRO_HAS_GOBJECT_FUNCTIONS 1 - -/* Require FreeType */ -#define CAIRO_HAS_FT_FONT 1 - -/* Require FontConfig */ -#define CAIRO_HAS_FC_FONT 1 - -#endif diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 6d7d3c0e51b072..9656e803fe9e76 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( PATCHES export-only-in-shared-build.patch 0001_fix_osx_defined.patch + build.patch ) #TODO the autoconf script has a lot of additional option which use auto detection and should be disabled! @@ -34,7 +35,6 @@ else() list(APPEND OPTIONS --enable-gobject=no) endif() -set(PORT_DEBUG ON) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} #AUTOCONFIG @@ -43,13 +43,13 @@ vcpkg_configure_make( ac_cv_lib_z_compress=yes ac_cv_lib_lzo2_lzo2a_decompress=yes ) -vcpkg_install_make() +vcpkg_install_make(SUBPATH /src) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo.h" "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h") +foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h") file(READ ${FILE} CAIRO_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}") From 5dd80674c772f75587d428a41cf44a8f6abb6a15 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Jan 2021 15:34:05 +0100 Subject: [PATCH 058/182] fix cairo --- ports/cairo/build.patch | 2 +- ports/cairo/build2.patch | 251 ++++++++++++++++++ ports/cairo/portfile.cmake | 11 +- .../buildsystems/make_wrapper/cl_cpp_wrapper | 104 ++++++++ 4 files changed, 365 insertions(+), 3 deletions(-) create mode 100644 ports/cairo/build2.patch create mode 100644 scripts/buildsystems/make_wrapper/cl_cpp_wrapper diff --git a/ports/cairo/build.patch b/ports/cairo/build.patch index 54a06f288d38d0..0cae102ec383cd 100644 --- a/ports/cairo/build.patch +++ b/ports/cairo/build.patch @@ -75,7 +75,7 @@ index 525bafb2a..69cd985c6 100644 #include #include -+#if defined(HAVE_UNISTD) ++#if defined(HAVE_UNISTD_H) #include +#endif diff --git a/ports/cairo/build2.patch b/ports/cairo/build2.patch new file mode 100644 index 00000000000000..6e7af3fc50ce2b --- /dev/null +++ b/ports/cairo/build2.patch @@ -0,0 +1,251 @@ +diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common +index 7d7e9735f..f39ea1991 100644 +--- a/build/Makefile.win32.common ++++ b/build/Makefile.win32.common +@@ -44,13 +44,13 @@ else + ifeq ($(ZLIB_PATH),) + ZLIB_PATH := $(top_builddir)/../zlib + endif +-ZLIB_CFLAGS += -I$(ZLIB_PATH)/ +-CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib ++# ZLIB_CFLAGS += -I$(ZLIB_PATH)/ ++# CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib + endif + + DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS) + DEFAULT_CFLAGS += -I. -I$(top_srcdir) -I$(top_srcdir)/src +-DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) ++DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) + + CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) + +diff --git a/configure b/configure +index 59582f14b..da5c4d61d 100644 +--- a/configure ++++ b/configure +@@ -21240,13 +21240,12 @@ fi + rm -f confcache + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 +-$as_echo_n "checking for compress in -lz... " >&6; } +-if ${ac_cv_lib_z_compress+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing compress" >&5 ++$as_echo_n "checking for library containing compress... " >&6; } ++if ${ac_cv_search_compress+:} false; then : + $as_echo_n "(cached) " >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++ ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -21265,18 +21264,35 @@ return compress (); + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_z_compress=yes +-else +- ac_cv_lib_z_compress=no ++for ac_lib in '' z zlib zlibd; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_compress=$ac_res + fi + rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++ conftest$ac_exeext ++ if ${ac_cv_search_compress+:} false; then : ++ break ++fi ++done ++if ${ac_cv_search_compress+:} false; then : ++ ++else ++ ac_cv_search_compress=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 +-$as_echo "$ac_cv_lib_z_compress" >&6; } +-if test "x$ac_cv_lib_z_compress" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_compress" >&5 ++$as_echo "$ac_cv_search_compress" >&6; } ++ac_res=$ac_cv_search_compress ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" + if test "x$ac_cv_header_zlib_h" = xyes; then : + +@@ -30406,7 +30422,7 @@ script_NONPKGCONFIG_EXTRA_LIBS="$ac_env_script_NONPKGCONFIG_EXTRA_LIBS_value" + any2ppm_cs=yes + # The script backend requires zlib. + use_script=$have_libz +- script_NONPKGCONFIG_LIBS=-lz ++ script_NONPKGCONFIG_LIBS=$ac_cv_search_compress + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's script surface backend feature could be enabled" >&5 +@@ -31479,7 +31495,7 @@ ps_NONPKGCONFIG_EXTRA_LIBS="$ac_env_ps_NONPKGCONFIG_EXTRA_LIBS_value" + + # The ps backend requires zlib. + use_ps=$have_libz +- ps_NONPKGCONFIG_LIBS=-lz ++ ps_NONPKGCONFIG_LIBS=$ac_cv_search_compress + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PostScript surface backend feature could be enabled" >&5 +@@ -31875,7 +31891,7 @@ pdf_NONPKGCONFIG_EXTRA_LIBS="$ac_env_pdf_NONPKGCONFIG_EXTRA_LIBS_value" + + # The pdf backend requires zlib. + use_pdf=$have_libz +- pdf_NONPKGCONFIG_LIBS=-lz ++ pdf_NONPKGCONFIG_LIBS=$ac_cv_search_compress + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PDF surface backend feature could be enabled" >&5 +@@ -33766,7 +33782,7 @@ xml_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xml_NONPKGCONFIG_EXTRA_LIBS_value" + + + use_xml=$have_libz +- xml_NONPKGCONFIG_LIBS=-lz ++ xml_NONPKGCONFIG_LIBS=$ac_cv_search_compress + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's xml surface backend feature could be enabled" >&5 +diff --git a/configure.ac b/configure.ac +index 5e33c96ea..c9e9cfaa9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,7 +43,7 @@ AC_CACHE_SAVE + + dnl =========================================================================== + +-AC_CHECK_LIB(z, compress, ++AC_SEARCH_LIBS(compress, z zlib zlibd, + [AC_CHECK_HEADER(zlib.h, [ + have_libz=yes + AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available]) +@@ -481,7 +481,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(script, script, yes, [ + any2ppm_cs=yes + # The script backend requires zlib. + use_script=$have_libz +- script_NONPKGCONFIG_LIBS=-lz ++ script_NONPKGCONFIG_LIBS=$ac_cv_search_compress + ]) + + dnl =========================================================================== +@@ -582,7 +582,7 @@ dnl =========================================================================== + CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [ + # The ps backend requires zlib. + use_ps=$have_libz +- ps_NONPKGCONFIG_LIBS=-lz ++ ps_NONPKGCONFIG_LIBS=$ac_cv_search_compress + ]) + + dnl =========================================================================== +@@ -619,7 +619,7 @@ dnl =========================================================================== + CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [ + # The pdf backend requires zlib. + use_pdf=$have_libz +- pdf_NONPKGCONFIG_LIBS=-lz ++ pdf_NONPKGCONFIG_LIBS=$ac_cv_search_compress + ]) + + dnl =========================================================================== +@@ -706,7 +706,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(observer, observer, always) + CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no) + CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [ + use_xml=$have_libz +- xml_NONPKGCONFIG_LIBS=-lz ++ xml_NONPKGCONFIG_LIBS=$ac_cv_search_compress + ]) + + dnl =========================================================================== +diff --git a/src/Makefile.am b/src/Makefile.am +index acf0a8281..fe339a3cf 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -68,7 +68,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers) + @(echo EXPORTS; \ + (cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \ + $(EGREP) -v '^# *include' | \ +- ( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ ++ ( cat cairo-features.h - | $(CPP) $(CPP_FLAGS) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ + $(EGREP) '^cairo_.* \(' | \ + sed -e 's/[ ].*//' | \ + sort; \ +diff --git a/src/Makefile.in b/src/Makefile.in +index 4e94feb09..42a1b236d 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -3680,7 +3680,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers) + @(echo EXPORTS; \ + (cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \ + $(EGREP) -v '^# *include' | \ +- ( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ ++ ( cat cairo-features.h - | $(CPP) $(CPP_FLAGS) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ + $(EGREP) '^cairo_.* \(' | \ + sed -e 's/[ ].*//' | \ + sort; \ +diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am +index d5c2998ac..e6e23b2ed 100644 +--- a/util/cairo-script/Makefile.am ++++ b/util/cairo-script/Makefile.am +@@ -15,7 +15,7 @@ libcairo_script_interpreter_la_SOURCES = \ + $(NULL) + libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS) + libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) +-libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz ++libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) + + csi_replay_SOURCES = csi-replay.c + csi_replay_CFLAGS = $(CAIRO_CFLAGS) +diff --git a/util/cairo-script/Makefile.in b/util/cairo-script/Makefile.in +index 6b86c86c5..13630cd55 100644 +--- a/util/cairo-script/Makefile.in ++++ b/util/cairo-script/Makefile.in +@@ -561,7 +561,7 @@ libcairo_script_interpreter_la_SOURCES = \ + + libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS) + libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) +-libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz ++libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) + csi_replay_SOURCES = csi-replay.c + csi_replay_CFLAGS = $(CAIRO_CFLAGS) + csi_replay_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) +diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am +index a0091f882..64d86184f 100644 +--- a/util/cairo-trace/Makefile.am ++++ b/util/cairo-trace/Makefile.am +@@ -13,7 +13,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \ + libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) + libcairo_trace_la_LDFLAGS = -module -no-undefined -avoid-version + +-libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz ++libcairo_trace_la_LIBADD = $(real_pthread_LIBS) + if CAIRO_HAS_DL + libcairo_trace_la_LIBADD += -ldl + endif +diff --git a/util/cairo-trace/Makefile.in b/util/cairo-trace/Makefile.in +index a35c501a2..780af44ba 100644 +--- a/util/cairo-trace/Makefile.in ++++ b/util/cairo-trace/Makefile.in +@@ -470,7 +470,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \ + + libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) + libcairo_trace_la_LDFLAGS = -module -no-undefined -avoid-version +-libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz $(am__append_1) \ ++libcairo_trace_la_LIBADD = $(real_pthread_LIBS) $(am__append_1) \ + $(am__append_3) + EXTRA_DIST = \ + COPYING \ diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 9656e803fe9e76..258360d91b3443 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -12,7 +12,8 @@ vcpkg_extract_source_archive_ex( PATCHES export-only-in-shared-build.patch 0001_fix_osx_defined.patch - build.patch + #build.patch + build2.patch ) #TODO the autoconf script has a lot of additional option which use auto detection and should be disabled! @@ -35,14 +36,20 @@ else() list(APPEND OPTIONS --enable-gobject=no) endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CPP} "cl_cpp_wrapper") +endif() + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} - #AUTOCONFIG + AUTOCONFIG OPTIONS ${OPTIONS} ax_cv_c_float_words_bigendian=no ac_cv_lib_z_compress=yes ac_cv_lib_lzo2_lzo2a_decompress=yes + lt_cv_deplibs_check_method=pass_all ) +#vcpkg_install_make() vcpkg_install_make(SUBPATH /src) vcpkg_fixup_pkgconfig() diff --git a/scripts/buildsystems/make_wrapper/cl_cpp_wrapper b/scripts/buildsystems/make_wrapper/cl_cpp_wrapper new file mode 100644 index 00000000000000..32fde518f580a4 --- /dev/null +++ b/scripts/buildsystems/make_wrapper/cl_cpp_wrapper @@ -0,0 +1,104 @@ +#!/usr/bin/bash +# cl_cpp_wrapper +# Wrapper around MS's cl.exe to make it act more like Unix cpp + +PATH="$PATH:/usr/bin" + +case $MACHTYPE in + *-msys) + slash="-" + ;; + *) + slash="/" + ;; +esac + +# prog specifies the program that should be run cl.exe +prog=cl.exe +debug= +cppopt=("${slash}nologo") +cppopt+=("${slash}E") +verbose= +shared_index=-1 + +processargs() +{ +### Run through every option and convert it to the proper MS one +while test $# -gt 0; do + case "$1" in + -D*) optarg= ;; + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + gotparam=1 + case "$1" in + --help) + usage + exit 0 + ;; + --verbose) + verbose=1 + ;; + -*) + # Remaining '-' options are passed to the compiler + if test x$optarg != x ; then + cppopt+=("${slash}${1:1}=$optarg") + else + cppopt+=("${slash}${1:1}") + fi + ;; + + /*) + # All '/' options are assumed to be for cpp and are passed through + cppopt+=("${slash}${1:1}") + ;; + + *) + file=$1 + #cppopt+=("$1") + ;; + esac + shift +done +} + +# Whitespace in paths is dealt with by setting IFS and using bash arrays + +# processargs $CPP_FLAGS +IFS="" +processargs $@ + +if test x$V = x1 ; then + verbose=1 +fi + +if test -n "$verbose" ; then + echo -n "$prog" + for opt in "${cppopt[@]}" ; do + echo -n " \"$opt\"" + done + echo "" +fi + +[ $# -ge 1 -a -f "$1" ] && input="$file" || input="-" + +input_file="${file:-/proc/self/fd/0}" +if [ "$input_file" == "/proc/self/fd/0" ]; then + #echo "STDIN" + # CL does not support reading from STDIN so it is wrapped here. + tmpout=cpp_wrapper_$RANDOM.h + /usr/bin/cp $input_file $tmpout + # from https://stackoverflow.com/questions/36313562/how-to-redirect-stdin-to-file-in-bash + #exec 3> cppstdtmp.h + #while IFS= read -r line; do + # printf '%s' "$line" + #done + #exec 3<&- + #echo "$( cppstdtmp.h + exec $prog ${cppopt[@]} $tmpout + rm -f $tmpout +else + #echo "FILE" + exec $prog ${cppopt[@]} $input_file +fi + From fc45106d1855ded3413edd9f20f1523075b7fd01 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Jan 2021 22:13:01 +0100 Subject: [PATCH 059/182] some fixes --- ports/cairomm/portfile.cmake | 17 +++++++++++++---- ports/pixman/CONTROL | 3 ++- ports/pixman/portfile.cmake | 12 +++++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index 9806ebd14d4c22..9b81dacac89646 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - set(CAIROMM_VERSION 1.16.0) set(CAIROMM_HASH 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3) @@ -28,9 +26,20 @@ vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +if(VCPKG_LIBRARY_LINAKGE STREQUAL "static") + set(_file "${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h") + if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1") + endif() + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h") + if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1") + endif() +endif() # option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], # value: 'if-git-build', description: 'Let mm-common-get copy some files to untracked/') diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index b80738e2629e4e..b1b2e79f13be3d 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -2,4 +2,5 @@ Source: pixman Version: 0.40.0 Homepage: https://www.cairographics.org/releases Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. -Build-Depends: libpng, tool-meson \ No newline at end of file +Build-Depends: libpng, tool-meson +Supports: !arm&!uwp \ No newline at end of file diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index db82ff89828ee6..4f0d0c23683161 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -7,22 +7,24 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_IS_UWP) list(INSERT VCPKG_CXX_FLAGS 0 /arch:SSE2) list(INSERT VCPKG_C_FLAGS 0 /arch:SSE2) list(APPEND OPTIONS -Dmmx=enabled -Dsse2=enabled -Dssse3=enabled) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS -Dmmx=enabled -Dsse2=enabled -Dssse3=enabled) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") - list(APPEND OPTIONS - -Darm-simd=enabled - ) +# If somebody teaches meson to actually do the test correctly.... +# Currently pixman-x86 is included unconditionally in builds as such arm support is disabled. +# list(APPEND OPTIONS +# -Darm-simd=enabled +# ) endif() set(PIXMAN_VERSION 0.40.0) From d493189eb073c55ad0a885b063af684cfb5fcd04 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Jan 2021 22:13:13 +0100 Subject: [PATCH 060/182] reorder meson a bit --- scripts/cmake/vcpkg_configure_meson.cmake | 35 ++++++++++++----------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 0bc181c41ae59b..605c2ca3b570b5 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -249,7 +249,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ endforeach() string(APPEND CROSS "[properties]\n") - string(APPEND CROSS "skip_sanity_check = true\n") + #string(APPEND CROSS "skip_sanity_check = true\n") string(APPEND CROSS "[host_machine]\n") string(APPEND CROSS "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME) @@ -273,7 +273,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "cpu_family = '${BUILD_CPU_FAM}'\n") string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") - if(NOT BUILD_CPU_FAM STREQUAL HOST_CPU_FAM) + if(NOT BUILD_CPU_FAM STREQUAL HOST_CPU_FAM OR VCPKG_TARGET_IS_UWP) set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) file(WRITE "${_file}" "${CROSS}") @@ -370,19 +370,6 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) - if(NOT VCPKG_MESON_NATIVE_FILE) - vcpkg_internal_meson_generate_native_file("_vcm_ADDITIONAL_NATIVE_BINARIES") - endif() - if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG) - vcpkg_internal_meson_generate_native_file_config(DEBUG) - endif() - if(NOT VCPKG_MESON_NATIVE_FILE_RELEASE) - vcpkg_internal_meson_generate_native_file_config(RELEASE) - endif() - list(APPEND _vcm_OPTIONS --native "${VCPKG_MESON_NATIVE_FILE}") - list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") - list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") - if(NOT VCPKG_MESON_CROSS_FILE) vcpkg_internal_meson_generate_cross_file("_vcm_ADDITIONAL_CROSS_BINARIES") endif() @@ -395,7 +382,6 @@ function(vcpkg_configure_meson) if(VCPKG_MESON_CROSS_FILE) list(APPEND _vcm_OPTIONS --cross "${VCPKG_MESON_CROSS_FILE}") endif() - if(VCPKG_MESON_CROSS_FILE_DEBUG) list(APPEND _vcm_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") endif() @@ -403,6 +389,23 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") endif() + + if(NOT VCPKG_MESON_NATIVE_FILE AND NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_native_file("_vcm_ADDITIONAL_NATIVE_BINARIES") + endif() + if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG AND NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_native_file_config(DEBUG) + endif() + if(NOT VCPKG_MESON_NATIVE_FILE_RELEASE AND NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_native_file_config(RELEASE) + endif() + if(VCPKG_MESON_NATIVE_FILE AND NOT VCPKG_MESON_CROSS_FILE) + list(APPEND _vcm_OPTIONS --native "${VCPKG_MESON_NATIVE_FILE}") + list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") + list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") + else() + list(APPEND _vcm_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _vcm_OPTIONS --default-library shared) else() From 8b7c90658584fa2104888bb861bf37343bcdfd34 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 Jan 2021 22:13:37 +0100 Subject: [PATCH 061/182] add none.txt for meson --- scripts/buildsystems/meson/none.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 scripts/buildsystems/meson/none.txt diff --git a/scripts/buildsystems/meson/none.txt b/scripts/buildsystems/meson/none.txt new file mode 100644 index 00000000000000..6dafc80904f97d --- /dev/null +++ b/scripts/buildsystems/meson/none.txt @@ -0,0 +1,19 @@ +# native file used to make the build machine compiler unusable + +[host_machine] +system = 'none' +cpu_family = 'none' +cpu = 'none' +endian = 'little' + +[properties] + +[binaries] +c = ['false'] +cpp = ['false'] +objc = ['false'] +objcpp = ['false'] +ar = ['false'] +pkgconfig = ['false'] +cmake = ['false'] +ninja = ['false'] \ No newline at end of file From f15040b819c8b7b11410cf5f7dd51be8b851b0e3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 09:28:05 +0100 Subject: [PATCH 062/182] fix x86_x64 to x86 "cross" builds --- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 605c2ca3b570b5..2d5fe7df642f80 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -273,7 +273,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "cpu_family = '${BUILD_CPU_FAM}'\n") string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") - if(NOT BUILD_CPU_FAM STREQUAL HOST_CPU_FAM OR VCPKG_TARGET_IS_UWP) + if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_UWP) set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) file(WRITE "${_file}" "${CROSS}") From 0e7cb97e578fc58c6a80ead11ce3d6dc5ac2efa0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 10:46:15 +0100 Subject: [PATCH 063/182] add tiff pkgconfig --- ports/tiff/CONTROL | 1 + ports/tiff/portfile.cmake | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index f37049768efb92..1eb69723c6a77b 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,5 +1,6 @@ Source: tiff Version: 4.1.0 +Port-Version: 1 Build-Depends: zlib, libjpeg-turbo, liblzma Homepage: https://download.osgeo.org/libtiff Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index ab610d3287484b..8f3a3794a25fab 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -41,7 +41,11 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS ${file}) + vcpkg_replace_string(${file} "-ltiff" "-ltiffd") +endif() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share From 68a4331a9d463e0b9d0897d8d7def53ac240d11a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 10:46:42 +0100 Subject: [PATCH 064/182] update gdk-pixbuf --- ports/gdk-pixbuf/CMakeLists.txt | 147 ----------------------------- ports/gdk-pixbuf/CONTROL | 6 +- ports/gdk-pixbuf/config.h.linux | 158 -------------------------------- ports/gdk-pixbuf/portfile.cmake | 93 +++++++++++++++---- 4 files changed, 77 insertions(+), 327 deletions(-) delete mode 100644 ports/gdk-pixbuf/CMakeLists.txt delete mode 100644 ports/gdk-pixbuf/config.h.linux diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt deleted file mode 100644 index 8f7a054f4f7c4f..00000000000000 --- a/ports/gdk-pixbuf/CMakeLists.txt +++ /dev/null @@ -1,147 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(gdk-pixbuf C) - -set(GDK_PIXBUF_LIB_SUFFIX 2.0) -set(GDK_PIXBUF_DLL_SUFFIX 2) -set(GDK_PIXBUF_BINARY_VERSION 2.10.0) -set(GLIB_LIB_VERSION 2.0) - -find_package(ZLIB REQUIRED) -find_package(PNG REQUIRED) - - -find_path(GLIB_INCLUDE_DIR glib.h) - -find_package(Intl REQUIRED) -find_path(LIBINTL_INCLUDE_DIR libintl.h) - -if(WIN32) - configure_file(${CMAKE_SOURCE_DIR}/config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY) -else() - configure_file(${CMAKE_SOURCE_DIR}/config.h.linux ${CMAKE_SOURCE_DIR}/config.h COPYONLY) -endif() -include_directories(. ./gdk-pixbuf) - -set(SOURCES - gdk-pixbuf/gdk-pixbuf.c - gdk-pixbuf/gdk-pixbuf-animation.c - gdk-pixbuf/gdk-pixbuf-data.c - gdk-pixbuf/gdk-pixbuf-io.c - gdk-pixbuf/gdk-pixbuf-loader.c - gdk-pixbuf/gdk-pixbuf-scale.c - gdk-pixbuf/gdk-pixbuf-simple-anim.c - gdk-pixbuf/gdk-pixbuf-scaled-anim.c - gdk-pixbuf/gdk-pixbuf-util.c - gdk-pixbuf/gdk-pixdata.c - gdk-pixbuf/gdk-pixbuf-enum-types.c - gdk-pixbuf/gdk-pixbuf-marshal.c - gdk-pixbuf/io-ani.c - gdk-pixbuf/io-ani-animation.c - gdk-pixbuf/io-icns.c - gdk-pixbuf/io-pnm.c - gdk-pixbuf/io-png.c - gdk-pixbuf/io-qtif.c - gdk-pixbuf/io-tga.c - gdk-pixbuf/gdk-pixbuf-buffer-queue.c - gdk-pixbuf/io-xpm.c - gdk-pixbuf/io-xbm.c - gdk-pixbuf/pixops/pixops.c -) -if(WIN32) - list(APPEND SOURCES - gdk-pixbuf/io-gdip-animation.c - gdk-pixbuf/io-gdip-bmp.c - gdk-pixbuf/io-gdip-emf.c - gdk-pixbuf/io-gdip-gif.c - gdk-pixbuf/io-gdip-ico.c - gdk-pixbuf/io-gdip-jpeg.c - gdk-pixbuf/io-gdip-tiff.c - gdk-pixbuf/io-gdip-utils.c - gdk-pixbuf/io-gdip-wmf.c -) -endif() -add_library(gdk-pixbuf ${SOURCES}) - -find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) - -target_include_directories(gdk-pixbuf PRIVATE - ${GLIB2_INCLUDE_DIRS} - ${PNG_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} - ${Intl_INCLUDE_DIR}) - -set(LIBS - PkgConfig::GLIB2 ${Intl_LIBRARIES} - ${ZLIB_LIBRARIES} - ${PNG_LIBRARIES} -) -if(WIN32) - list(APPEND LIBS Gdiplus ole32) -else() - list(APPEND LIBS m) -endif() - -target_link_libraries(gdk-pixbuf ${LIBS}) - -set(DEFS - HAVE_CONFIG_H - GDK_PIXBUF_COMPILATION - GDK_PIXBUF_ENABLE_BACKEND - DLL_EXPORT - GDK_PIXBUF_RELOCATABLE - GDK_PIXBUF_PREFIX="/dummy" - GDK_PIXBUF_BINARY_VERSION="${GDK_PIXBUF_BINARY_VERSION}" - INCLUDE_ani - INCLUDE_tga - INCLUDE_xbm - INCLUDE_png - INCLUDE_qtif - INCLUDE_pnm - INCLUDE_icns - INCLUDE_xpm - G_DISABLE_SINGLE_INCLUDES - GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) -if(WIN32) - list(APPEND DEFS INCLUDE_gdiplus) -endif() -target_compile_definitions(gdk-pixbuf PRIVATE ${DEFS}) - -set_target_properties(gdk-pixbuf PROPERTIES - OUTPUT_NAME gdk_pixbuf-${GDK_PIXBUF_DLL_SUFFIX} - ARCHIVE_OUTPUT_NAME gdk_pixbuf-${GDK_PIXBUF_LIB_SUFFIX}) - -install(TARGETS gdk-pixbuf - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -macro(gdk_add_tool TOOL_NAME) - add_executable(${TOOL_NAME} ${ARGN}) - target_include_directories(${TOOL_NAME} PRIVATE ${GLIB2_INCLUDE_DIRS}) - target_link_libraries(${TOOL_NAME} gdk-pixbuf PkgConfig::GLIB2) - install(TARGETS ${TOOL_NAME} RUNTIME DESTINATION tools/gdk-pixbuf) -endmacro() - -if(NOT GDK_SKIP_TOOLS) - gdk_add_tool(gdk-pixbuf-csource gdk-pixbuf/gdk-pixbuf-csource.c) - gdk_add_tool(gdk-pixbuf-pixdata gdk-pixbuf/gdk-pixbuf-pixdata.c) -endif() - -if(NOT GDK_SKIP_HEADERS) - INSTALL(FILES - gdk-pixbuf/gdk-pixbuf.h - gdk-pixbuf/gdk-pixbuf-autocleanups.h - gdk-pixbuf/gdk-pixbuf-core.h - gdk-pixbuf/gdk-pixbuf-transform.h - gdk-pixbuf/gdk-pixbuf-io.h - gdk-pixbuf/gdk-pixbuf-animation.h - gdk-pixbuf/gdk-pixbuf-simple-anim.h - gdk-pixbuf/gdk-pixbuf-loader.h - gdk-pixbuf/gdk-pixbuf-enum-types.h - gdk-pixbuf/gdk-pixbuf-marshal.h - gdk-pixbuf/gdk-pixbuf-features.h - gdk-pixbuf/gdk-pixdata.h - gdk-pixbuf/gdk-pixbuf-macros.h - DESTINATION include/gdk-pixbuf) -endif() diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL index a654c570ecf7b6..cbcc6ffff4dcc2 100644 --- a/ports/gdk-pixbuf/CONTROL +++ b/ports/gdk-pixbuf/CONTROL @@ -1,6 +1,6 @@ Source: gdk-pixbuf -Version: 2.36.9 -Port-Version: 8 +Version: 2.42.2 +Port-Version: 0 Homepage: https://developer.gnome.org/gdk-pixbuf/ Description: Image loading library. -Build-Depends: gettext, zlib, libpng, glib +Build-Depends: gettext, zlib, libpng, glib, tiff diff --git a/ports/gdk-pixbuf/config.h.linux b/ports/gdk-pixbuf/config.h.linux deleted file mode 100644 index f6738732821365..00000000000000 --- a/ports/gdk-pixbuf/config.h.linux +++ /dev/null @@ -1,158 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#define ENABLE_NLS 1 - -/* Define to 1 to replace the build-time prefix in modules */ -/* #undef GDK_PIXBUF_RELOCATABLE */ - -/* Define if gio can sniff image data */ -#define GDK_PIXBUF_USE_GIO_MIME 1 - -/* The prefix for our gettext translation domains. */ -#define GETTEXT_PACKAGE "gdk-pixbuf" - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 - -/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if libm has lrint */ -#define HAVE_LRINT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 is libjpeg supports progressive JPEG */ -#define HAVE_PROGRESSIVE_JPEG 1 - -/* Define to 1 if libm has round */ -#define HAVE_ROUND 1 - -/* Define to 1 if you have the `setrlimit' function. */ -#define HAVE_SETRLIMIT 1 - -/* Define to 1 if sigsetjmp is available */ -#define HAVE_SIGSETJMP 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if sys/sysinfo.h is available */ -#define HAVE_SYS_SYSINFO_H 1 - -/* Define to 1 if sys/systeminfo.h is available */ -/* #undef HAVE_SYS_SYSTEMINFO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Define to 1 if it's a darwin platform */ -/* #undef OS_DARWIN */ - -/* Define to 1 if it's a Linux platform */ -#define OS_LINUX 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "gdk-pixbuf" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gdk-pixbuf 2.36.9" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "gdk-pixbuf" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.36.9" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if gmodule works and should be used */ -#define USE_GMODULE 1 - -/* Whether to load modules via .la files rather than directly */ -/* #undef USE_LA_MODULES */ - -/* Define to 1 if medialib is available and should be used */ -/* #undef USE_MEDIALIB */ - -/* Define to 1 if medialib 2.5 is available */ -/* #undef USE_MEDIALIB25 */ - -/* Define to 1 if MMX is available and should be used */ -/* #undef USE_MMX */ - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* defines how to decorate public symbols while building */ -#define _GDK_PIXBUF_EXTERN __attribute__((visibility("default"))) extern - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 66def89e4360aa..7a120d1c72651e 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,36 +1,91 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -set(GDK_PIXBUF_VERSION 2.36) -set(GDK_PIXBUF_PATCH 9) +set(GDK_PIXBUF_VERSION 2.42) +set(GDK_PIXBUF_PATCH 2) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" - SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 + SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} ) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.linux ${SOURCE_PATH}/config.h.linux) - -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( +if(VCPKG_TARGET_IS_WINDOWS) + #list(APPEND OPTIONS -Dnative_windows_loaders=true) +endif() +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - OPTIONS_DEBUG - -DGDK_SKIP_HEADERS=ON - -DGDK_SKIP_TOOLS=ON + -Dman=false + -Dgtk_doc=false + -Ddocs=false + -Dpng=true + -Dtiff=true + -Djpeg=true + -Dintrospection=disabled + -Drelocatable=true + -Dinstalled_tests=false + -Dgio_sniffing=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ) - -vcpkg_install_cmake() +vcpkg_install_meson(ADD_BIN_TO_PATH) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/gdk-pixbuf) +vcpkg_copy_tools(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer AUTO_CLEAN) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/COPYING ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/copyright) + +# option('png', + # description: 'Enable PNG loader (requires libpng)', + # type: 'boolean', + # value: true) +# option('tiff', + # description: 'Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used', + # type: 'boolean', + # value: true) +# option('jpeg', + # description: 'Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used', + # type: 'boolean', + # value: true) +# option('builtin_loaders', + # description: 'Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf', + # type: 'string', + # value: 'none') +# option('gtk_doc', + # description: 'Whether to generate the API reference (requires GTK-Doc)', + # type: 'boolean', + # value: false) +# option('docs', + # description: 'Whether to generate the whole documentation (see: gtk_doc and man options) [Deprecated]', + # type: 'boolean', + # value: false) +# option('introspection', + # description: 'Whether to generate the API introspection data (requires GObject-Introspection)', + # type: 'feature', + # value: 'auto', + # yield: true) +# option('man', + # description: 'Whether to generate man pages (requires xlstproc)', + # type: 'boolean', + # value: true) +# option('relocatable', + # description: 'Whether to enable application bundle relocation support', + # type: 'boolean', + # value: false) +# option('native_windows_loaders', + # description: 'Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option', + # type: 'boolean', + # value: false) +# option('installed_tests', + # description: 'Install the test suite', + # type: 'boolean', + # value: true) +# option('gio_sniffing', + # description: 'Perform file type detection using GIO (Unused on MacOS and Windows)', + # type: 'boolean', + # value: true) From 625edebc9195cef8e32678911f527c4f46a5bf42 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 12:56:40 +0100 Subject: [PATCH 065/182] fix tiff and jpeg --- ports/libjpeg-turbo/CONTROL | 2 +- ports/libjpeg-turbo/portfile.cmake | 7 +++++++ ports/tiff/portfile.cmake | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 581b62dd6c05ac..1e5ad60c6f5f33 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,6 +1,6 @@ Source: libjpeg-turbo Version: 2.0.5 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index b218a5f9702c39..4ade28b9a2a583 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -72,6 +72,13 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd") +endif() + +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 8f3a3794a25fab..2b55e6b78600cc 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -42,8 +42,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") -if(EXISTS ${file}) - vcpkg_replace_string(${file} "-ltiff" "-ltiffd") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE From 244e8d8a3a86b06a86263b03e74fb42c513101a1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 12:56:47 +0100 Subject: [PATCH 066/182] add graphene --- ports/graphene/CONTROL | 6 ++++ ports/graphene/portfile.cmake | 63 +++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 ports/graphene/CONTROL create mode 100644 ports/graphene/portfile.cmake diff --git a/ports/graphene/CONTROL b/ports/graphene/CONTROL new file mode 100644 index 00000000000000..83d9e62a396bb2 --- /dev/null +++ b/ports/graphene/CONTROL @@ -0,0 +1,6 @@ +Source: graphene +Version: 1.10.2 +Port-Version: 0 +Homepage: https://www.gtk.org/ +Description: A thin layer of types for graphic libraries. +Build-Depends: glib, gettext diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake new file mode 100644 index 00000000000000..46c254676bf4e9 --- /dev/null +++ b/ports/graphene/portfile.cmake @@ -0,0 +1,63 @@ + +set(VERSION 1.10.2) + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/graphene/1.10/graphene-${VERSION}.tar.xz" + FILENAME "graphene-${VERSION}.tar.xz" + SHA512 a8a8ef1e4ccffee2313a18b9b8dda06c7ede6d49fdde8578694500634e3c90278fd30af7d88938d5ecb08c519cc3e09d21fe69d0f21cb766e056ceedbb3eafb0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgtk_doc=false + -Dgobject_types=true + -Dintrospection=false + -Dtests=false + -Dinstalled_tests=false + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) + +# option('gtk_doc', type: 'boolean', + # value: false, + # description: 'Enable generating the API reference (depends on GTK-Doc)') +# option('gobject_types', type: 'boolean', + # value: true, + # description: 'Enable GObject types (depends on GObject)') +# option('introspection', type: 'boolean', + # value: true, + # description: 'Enable GObject Introspection (depends on GObject)') +# option('gcc_vector', type: 'boolean', + # value: true, + # description: 'Enable GCC vector fast paths (requires GCC)') +# option('sse2', type: 'boolean', + # value: true, + # description: 'Enable SSE2 fast paths (requires SSE2 or later)') +# option('arm_neon', type: 'boolean', + # value: true, + # description: 'Enable ARM NEON fast paths (requires ARM)') +# option('tests', type: 'boolean', + # value: true, + # description: 'Build the test suite (requires GObject)') +# option('installed_tests', type: 'boolean', + # value: true, + # description: 'Install tests') + + From f515bb4cabaa36fefc0044684a534c6c64678aae Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 12:56:57 +0100 Subject: [PATCH 067/182] fix gdk-pixbuf --- ports/gdk-pixbuf/fix_build.patch | 67 ++++++++++++++++++++++++++++++++ ports/gdk-pixbuf/portfile.cmake | 24 ++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 ports/gdk-pixbuf/fix_build.patch diff --git a/ports/gdk-pixbuf/fix_build.patch b/ports/gdk-pixbuf/fix_build.patch new file mode 100644 index 00000000000000..2afdd9c86c4741 --- /dev/null +++ b/ports/gdk-pixbuf/fix_build.patch @@ -0,0 +1,67 @@ +diff --git a/build-aux/post-install.bat b/build-aux/post-install.bat +index 6994d49e1..b4789dd62 100644 +--- a/build-aux/post-install.bat ++++ b/build-aux/post-install.bat +@@ -7,8 +7,8 @@ set binary_version=%3 + set libdir_windows=%libdir:/=\% + + if not "%DESTDIR%" == "" goto warn_msg +-if not exist %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\gdk-pixbuf-2.0\%binary_version% +-%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache ++if not exist %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version% ++%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache + + goto end + +@@ -18,7 +18,7 @@ echo *** Warning: loaders.cache not built + echo *** + echo *** You should generate this file manually on the host system + echo *** using: +-echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache ++echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache + echo *** + + :end +diff --git a/build-aux/post-install.sh b/build-aux/post-install.sh +index 661bceeef..0b1a46527 100644 +--- a/build-aux/post-install.sh ++++ b/build-aux/post-install.sh +@@ -5,14 +5,14 @@ libdir="$2" + binary_version="$3" + + if [ -z "$DESTDIR" ]; then +- mkdir -p "$libdir/gdk-pixbuf-2.0/$binary_version" +- $bindir/gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache" ++ mkdir -p "$libdir/../gdk-pixbuf-2.0/$binary_version" ++ $bindir/gdk-pixbuf-query-loaders > "$libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache" + else + echo "***" + echo "*** Warning: loaders.cache not built" + echo "***" + echo "*** You should generate this file manually on the host system" + echo "*** using:" +- echo "*** gdk-pixbuf-query-loaders > $libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache" ++ echo "*** gdk-pixbuf-query-loaders > $libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache" + echo "***" + fi +diff --git a/meson.build b/meson.build +index c38607029..4b5df91ae 100644 +--- a/meson.build ++++ b/meson.build +@@ -308,12 +310,12 @@ endif + # Don't check and build the jpeg loader if native_windows_loaders is true + if get_option('jpeg') and not native_windows_loaders + if cc.has_header('jpeglib.h') +- jpeg_dep = cc.find_library('jpeg', required: false) +- if cc.get_id() == 'msvc' and not jpeg_dep.found() ++ jpeg_dep = dependency('libjpeg', required: false) ++ #if cc.get_id() == 'msvc' and not jpeg_dep.found() + # The IJG JPEG library builds the .lib file as libjpeg.lib in its MSVC build system, + # so look for it as well when jpeg.lib cannot be found +- jpeg_dep = cc.find_library('libjpeg', required: false) +- endif ++ # jpeg_dep = cc.find_library('libjpeg', required: false) ++ #endif + if jpeg_dep.found() and cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep) + enabled_loaders += 'jpeg' + loaders_deps += jpeg_dep diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 7a120d1c72651e..504bae6f346ca8 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES fix_build.patch ) if(VCPKG_TARGET_IS_WINDOWS) #list(APPEND OPTIONS -Dnative_windows_loaders=true) @@ -27,19 +28,42 @@ vcpkg_configure_meson( -Drelocatable=true -Dinstalled_tests=false -Dgio_sniffing=false + -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson(ADD_BIN_TO_PATH) + + + +# FIx paths in pc file. +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[${bindir}]] "\${bindir}/../../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gdk-pixbuf-2.0.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[${bindir}]] "\${bindir}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer AUTO_CLEAN) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/COPYING ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + # option('png', # description: 'Enable PNG loader (requires libpng)', # type: 'boolean', From cfbc8cdd2c0374853f27e3993926fae062b2d763 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 14:29:10 +0100 Subject: [PATCH 068/182] add sassc --- ports/libsass/CONTROL | 7 +++++ ports/libsass/portfile.cmake | 22 +++++++++++++++ ports/libsass/remove_compiler_flags.patch | 24 +++++++++++++++++ ports/sassc/CONTROL | 6 +++++ ports/sassc/portfile.cmake | 33 +++++++++++++++++++++++ ports/sassc/remove_compiler_flags.patch | 12 +++++++++ 6 files changed, 104 insertions(+) create mode 100644 ports/libsass/CONTROL create mode 100644 ports/libsass/portfile.cmake create mode 100644 ports/libsass/remove_compiler_flags.patch create mode 100644 ports/sassc/CONTROL create mode 100644 ports/sassc/portfile.cmake create mode 100644 ports/sassc/remove_compiler_flags.patch diff --git a/ports/libsass/CONTROL b/ports/libsass/CONTROL new file mode 100644 index 00000000000000..bec1ec4b5ed2be --- /dev/null +++ b/ports/libsass/CONTROL @@ -0,0 +1,7 @@ +Source: libsass +Version: 3.6.4 +Port-Version: 0 +Description: LibSass - Sass compiler written in C++ +Homepage: https://github.com/sass/libsass +Build-Depends: + diff --git a/ports/libsass/portfile.cmake b/ports/libsass/portfile.cmake new file mode 100644 index 00000000000000..09b2282371fc74 --- /dev/null +++ b/ports/libsass/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sass/libsass + REF 8d312a1c91bb7dd22883ebdfc829003f75a82396 # 3.6.4 + SHA512 41e532c081804c889c3e7f9169bd90d7fc944d13817d5e3a4f8c19608ebb630db2b2b0e9c61a59a2446076f4093d5ec4cb4f767aa06fa0bf0f0687094e1a2913 + HEAD_REF master + PATCHES remove_compiler_flags.patch +) + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + +) +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libsass/remove_compiler_flags.patch b/ports/libsass/remove_compiler_flags.patch new file mode 100644 index 00000000000000..8a697ee4b4f5a9 --- /dev/null +++ b/ports/libsass/remove_compiler_flags.patch @@ -0,0 +1,24 @@ +diff --git a/GNUmakefile.am b/GNUmakefile.am +index 06a1d0c1e..6e7a15485 100644 +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE +diff --git a/src/GNUmakefile.am b/src/GNUmakefile.am +index 9b0e6a99b..00404a017 100644 +--- a/src/GNUmakefile.am ++++ b/src/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE diff --git a/ports/sassc/CONTROL b/ports/sassc/CONTROL new file mode 100644 index 00000000000000..b2fc8e63f7baa4 --- /dev/null +++ b/ports/sassc/CONTROL @@ -0,0 +1,6 @@ +Source: sassc +Version: 3.6.1 +Port-Version: 0 +Description: SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems. +Homepage: https://github.com/sass/sassc +Build-Depends: libsass, getopt diff --git a/ports/sassc/portfile.cmake b/ports/sassc/portfile.cmake new file mode 100644 index 00000000000000..9d541e996f2f30 --- /dev/null +++ b/ports/sassc/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sass/sassc + REF 46748216ba0b60545e814c07846ca10c9fefc5b6 # 3.6.1 + SHA512 98c5943ec485251fd5e3f41bcfe80dbbc6e2f334d4b6947895d3821b30009c40fb7cb944403304cede70360a5dd0ac103262644ef37a56e0fa76163657fbcc32 + HEAD_REF master + PATCHES remove_compiler_flags.patch +) + +find_library(LIBSASS_DEBUG sass PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) +find_library(LIBSASS_RELEASE sass PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) + +set(ENV{LIBS} "$ENV{LIBS} -lgetopt") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + --with-libsass-include='${CURRENT_INSTALLED_DIR}/include' + OPTIONS_DEBUG + --with-libsass-lib='${LIBSASS_DEBUG}' + OPTIONS_RELEASE + --with-libsass-lib='${LIBSASS_RELEASE}' +) +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) \ No newline at end of file diff --git a/ports/sassc/remove_compiler_flags.patch b/ports/sassc/remove_compiler_flags.patch new file mode 100644 index 00000000000000..c5f644276bbdf1 --- /dev/null +++ b/ports/sassc/remove_compiler_flags.patch @@ -0,0 +1,12 @@ +diff --git a/GNUmakefile.am b/GNUmakefile.am +index 58e8aecd1..da6a7db98 100644 +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -I script + +-AM_COPT = -Wall -O2 ++AM_COPT = + AM_COVLDFLAGS = + + if ENABLE_COVERAGE From db3352ad91b59f9778ad5feddb0231c90d2abbc1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 14:29:19 +0100 Subject: [PATCH 069/182] update gtk --- ports/gtk/CONTROL | 6 +- ports/gtk/portfile.cmake | 144 ++++++++++++++++++++++++++++++++------- 2 files changed, 122 insertions(+), 28 deletions(-) diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL index a03595a932bf0f..374801c8a1f2ae 100644 --- a/ports/gtk/CONTROL +++ b/ports/gtk/CONTROL @@ -1,6 +1,6 @@ Source: gtk -Version: 3.22.19 -Port-Version: 5 +Version: 4.0.1 +Port-Version: 0 Homepage: https://www.gtk.org/ Description: Portable library for creating graphical user interfaces. -Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext +Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext, graphene, sassc diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index f9517575f1d339..65a2be38d0bb06 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -2,9 +2,9 @@ set(GTK_VERSION 4.0.1) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/4.0.1/gtk+-${GTK_VERSION}.tar.xz" - FILENAME "gtk+-${GTK_VERSION}.tar.xz" - SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 + URLS "https://download.gnome.org/sources/gtk/4.0/gtk-4.0.1.tar.xz" + FILENAME "gtk-${GTK_VERSION}.tar.xz" + SHA512 cab50b5bcf1a6bfdd5245c908e813330b9173531c49fdd63f9b5618f5329ddf2560f0a3548f61bba55dea6d816e57681d4e59941cfc50cf430544d3ebcd90aad ) vcpkg_extract_source_archive_ex( @@ -12,32 +12,126 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}) - -# generate sources using python script installed with glib -if(NOT EXISTS ${SOURCE_PATH}/gtk/gtkdbusgenerated.h OR NOT EXISTS ${SOURCE_PATH}/gtk/gtkdbusgenerated.c) - vcpkg_find_acquire_program(PYTHON3) - set(GLIB_TOOL_DIR ${CURRENT_INSTALLED_DIR}/tools/glib) - - vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${GLIB_TOOL_DIR}/gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml - WORKING_DIRECTORY ${SOURCE_PATH}/gtk - LOGNAME source-gen) -endif() -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE OPTIONS - -DGTK_VERSION=${GTK_VERSION} - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - OPTIONS_DEBUG - -DGTK_SKIP_HEADERS=ON) + -Ddemos=false + -Dbuild-examples=false + -Dbuild-tests=false + -Dinstall-tests=false + -Dgtk_doc=false + -Dman-pages=false + -Dintrospection=disabled + -Dsassc=enabled + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' +) + +vcpkg_install_meson() -vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtk) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gtk/COPYING ${CURRENT_PACKAGES_DIR}/share/gtk/copyright) + + +# GDK backends + +# option('x11-backend', + # type: 'boolean', + # value: true, + # description : 'Enable the X11 gdk backend (only when building on Unix)') + +# option('wayland-backend', + # type: 'boolean', + # value: true, + # description : 'Enable the wayland gdk backend (only when building on Unix except for macOS)') + +# option('broadway-backend', + # type: 'boolean', + # value: false, + # description : 'Enable the broadway (HTML5) gdk backend') + +# option('win32-backend', + # type: 'boolean', + # value: true, + # description : 'Enable the Windows gdk backend (only when building on Windows)') + +# option('macos-backend', + # type: 'boolean', + # value: true, + # description : 'Enable the macOS gdk backend (only when building on macOS)') + +# # Media backends + +# option('media-ffmpeg', + # type: 'feature', + # value: 'auto', + # description : 'Build the ffmpeg media backend') + +# option('media-gstreamer', + # type: 'feature', + # value: 'auto', + # description : 'Build the gstreamer media backend') + +# # Print backends + +# option('print-cups', + # type: 'feature', + # value: 'auto', + # description : 'Build the cups print backend') + +# option('print-cloudprint', + # type: 'feature', + # value: 'auto', + # description : 'Build the cloudprint print backend') + +# # Optional features + +# option('vulkan', + # type: 'feature', + # value: 'auto', + # description : 'Enable support for the Vulkan graphics API') + +# option('xinerama', + # type: 'feature', + # value: 'auto', + # description : 'Enable support for the X11 Xinerama extension') + +# option('cloudproviders', + # type: 'feature', + # value: 'disabled', + # description : 'Enable the cloudproviders support') + +# option('sysprof', + # type: 'feature', + # value: 'disabled', + # description : 'include tracing support for sysprof') + +# option('tracker', + # type: 'feature', + # value: 'disabled', + # description : 'Enable Tracker3 filechooser search') + +# option('colord', + # type: 'feature', + # value: 'disabled', + # description : 'Build colord support for the CUPS printing backend') + +# option('sassc', + # type: 'feature', + # value: 'auto', + # description: 'Rebuild themes using sassc') + From a993f1d354fec49aa6f995019bd00f84d89b969f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 16:14:16 +0100 Subject: [PATCH 070/182] fix cairo complete build --- ports/cairo/CONTROL | 2 +- ports/cairo/build.patch | 96 ------------------- ports/cairo/build2.patch | 142 ----------------------------- ports/cairo/portfile.cmake | 28 +++--- ports/cairo/remove_test_perf.patch | 122 +++++++++++++++++++++++++ 5 files changed, 139 insertions(+), 251 deletions(-) delete mode 100644 ports/cairo/build.patch create mode 100644 ports/cairo/remove_test_perf.patch diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index 10d4349cf72ead..517b7c9d042833 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -3,7 +3,7 @@ Version: 1.16.0 Port-Version: 9 Homepage: https://cairographics.org Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. -Build-Depends: zlib, lzo, libpng, pixman, freetype, fontconfig +Build-Depends: zlib, lzo, libpng, pixman, freetype, fontconfig, dirent Feature: x11 Description: build with x11 support diff --git a/ports/cairo/build.patch b/ports/cairo/build.patch deleted file mode 100644 index 0cae102ec383cd..00000000000000 --- a/ports/cairo/build.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index e29609c2e..898576e57 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -717,7 +717,7 @@ MAINTAINERCLEANFILES = Makefile.in $(srcdir)/aclocal.m4 \ - # $(srcdir)/build/Makefile.win32.features-h \ - # $(NULL) - ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} --DIST_SUBDIRS = src doc util boilerplate test perf -+DIST_SUBDIRS = src doc util boilerplate perf - SUBDIRS = src doc util $(am__append_1) - DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ -@@ -1498,14 +1498,13 @@ configure: cairo-version.h - - doc: - cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ --test retest recheck: all -- cd test && $(MAKE) $(AM_MAKEFLAGS) $@ -+test retest recheck: -+ - perf: all - cd perf && $(MAKE) $(AM_MAKEFLAGS) $@ - check-valgrind: all -- cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind - cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind --.PHONY: doc test retest recheck perf check-valgrind -+.PHONY: doc retest recheck perf check-valgrind - - changelogs: - @$(MAKE) $(AM_MAKEFLAGS) $(CHANGELOGS) -@@ -1596,7 +1595,6 @@ release-verify-sane-changelogs: changelogs - - release-verify-sane-tests: - @echo "Checking that the test suite is sane..." -- @cd test && $(MAKE) $(AM_MAKEFLAGS) release-verify-sane-tests - - release-verify-even-micro: - @echo -n "Checking that $(VERSION) has an even micro component..." -diff --git a/configure b/configure -index de5d4e9fe..07466e506 100644 ---- a/configure -+++ b/configure -@@ -21276,7 +21276,7 @@ if ${ac_cv_lib_z_compress+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lz $LIBS" -+LIBS="$LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h -index d982c101d..ad9b26ba0 100644 ---- a/src/cairo-compiler-private.h -+++ b/src/cairo-compiler-private.h -@@ -201,10 +201,10 @@ - #define hypot _hypot - #define pclose _pclose - #define popen _popen --#define snprintf _snprintf -+//#define snprintf _snprintf - #define strdup _strdup - #define unlink _unlink --#define vsnprintf _vsnprintf -+//#define vsnprintf _vsnprintf - #endif - - #ifdef _MSC_VER -diff --git a/test/bitmap-font.c b/test/bitmap-font.c -index 525bafb2a..69cd985c6 100644 ---- a/test/bitmap-font.c -+++ b/test/bitmap-font.c -@@ -27,7 +27,9 @@ - - #include - #include -+#if defined(HAVE_UNISTD_H) - #include -+#endif - - #include - #include -diff --git a/test/cairo-test.h b/test/cairo-test.h -index 7e9605f61..dcdf74f60 100644 ---- a/test/cairo-test.h -+++ b/test/cairo-test.h -@@ -58,7 +58,7 @@ typedef unsigned __int64 uint64_t; - #define _USE_MATH_DEFINES - - #include --#define isnan(x) _isnan(x) -+//#define isnan(x) _isnan(x) - - #endif - diff --git a/ports/cairo/build2.patch b/ports/cairo/build2.patch index 6e7af3fc50ce2b..6fd7dcd7591353 100644 --- a/ports/cairo/build2.patch +++ b/ports/cairo/build2.patch @@ -19,109 +19,6 @@ index 7d7e9735f..f39ea1991 100644 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS) -diff --git a/configure b/configure -index 59582f14b..da5c4d61d 100644 ---- a/configure -+++ b/configure -@@ -21240,13 +21240,12 @@ fi - rm -f confcache - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 --$as_echo_n "checking for compress in -lz... " >&6; } --if ${ac_cv_lib_z_compress+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing compress" >&5 -+$as_echo_n "checking for library containing compress... " >&6; } -+if ${ac_cv_search_compress+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lz $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -21265,18 +21264,35 @@ return compress (); - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_z_compress=yes --else -- ac_cv_lib_z_compress=no -+for ac_lib in '' z zlib zlibd; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_compress=$ac_res - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ conftest$ac_exeext -+ if ${ac_cv_search_compress+:} false; then : -+ break -+fi -+done -+if ${ac_cv_search_compress+:} false; then : -+ -+else -+ ac_cv_search_compress=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 --$as_echo "$ac_cv_lib_z_compress" >&6; } --if test "x$ac_cv_lib_z_compress" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_compress" >&5 -+$as_echo "$ac_cv_search_compress" >&6; } -+ac_res=$ac_cv_search_compress -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" - if test "x$ac_cv_header_zlib_h" = xyes; then : - -@@ -30406,7 +30422,7 @@ script_NONPKGCONFIG_EXTRA_LIBS="$ac_env_script_NONPKGCONFIG_EXTRA_LIBS_value" - any2ppm_cs=yes - # The script backend requires zlib. - use_script=$have_libz -- script_NONPKGCONFIG_LIBS=-lz -+ script_NONPKGCONFIG_LIBS=$ac_cv_search_compress - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's script surface backend feature could be enabled" >&5 -@@ -31479,7 +31495,7 @@ ps_NONPKGCONFIG_EXTRA_LIBS="$ac_env_ps_NONPKGCONFIG_EXTRA_LIBS_value" - - # The ps backend requires zlib. - use_ps=$have_libz -- ps_NONPKGCONFIG_LIBS=-lz -+ ps_NONPKGCONFIG_LIBS=$ac_cv_search_compress - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PostScript surface backend feature could be enabled" >&5 -@@ -31875,7 +31891,7 @@ pdf_NONPKGCONFIG_EXTRA_LIBS="$ac_env_pdf_NONPKGCONFIG_EXTRA_LIBS_value" - - # The pdf backend requires zlib. - use_pdf=$have_libz -- pdf_NONPKGCONFIG_LIBS=-lz -+ pdf_NONPKGCONFIG_LIBS=$ac_cv_search_compress - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's PDF surface backend feature could be enabled" >&5 -@@ -33766,7 +33782,7 @@ xml_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xml_NONPKGCONFIG_EXTRA_LIBS_value" - - - use_xml=$have_libz -- xml_NONPKGCONFIG_LIBS=-lz -+ xml_NONPKGCONFIG_LIBS=$ac_cv_search_compress - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cairo's xml surface backend feature could be enabled" >&5 diff --git a/configure.ac b/configure.ac index 5e33c96ea..c9e9cfaa9 100644 --- a/configure.ac @@ -180,19 +77,6 @@ index acf0a8281..fe339a3cf 100644 (cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \ $(EGREP) -v '^# *include' | \ - ( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ -+ ( cat cairo-features.h - | $(CPP) $(CPP_FLAGS) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ - $(EGREP) '^cairo_.* \(' | \ - sed -e 's/[ ].*//' | \ - sort; \ -diff --git a/src/Makefile.in b/src/Makefile.in -index 4e94feb09..42a1b236d 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -3680,7 +3680,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers) - @(echo EXPORTS; \ - (cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \ - $(EGREP) -v '^# *include' | \ -- ( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ + ( cat cairo-features.h - | $(CPP) $(CPP_FLAGS) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \ $(EGREP) '^cairo_.* \(' | \ sed -e 's/[ ].*//' | \ @@ -210,19 +94,6 @@ index d5c2998ac..e6e23b2ed 100644 csi_replay_SOURCES = csi-replay.c csi_replay_CFLAGS = $(CAIRO_CFLAGS) -diff --git a/util/cairo-script/Makefile.in b/util/cairo-script/Makefile.in -index 6b86c86c5..13630cd55 100644 ---- a/util/cairo-script/Makefile.in -+++ b/util/cairo-script/Makefile.in -@@ -561,7 +561,7 @@ libcairo_script_interpreter_la_SOURCES = \ - - libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS) - libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) --libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz -+libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) - csi_replay_SOURCES = csi-replay.c - csi_replay_CFLAGS = $(CAIRO_CFLAGS) - csi_replay_LDADD = libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am index a0091f882..64d86184f 100644 --- a/util/cairo-trace/Makefile.am @@ -236,16 +107,3 @@ index a0091f882..64d86184f 100644 if CAIRO_HAS_DL libcairo_trace_la_LIBADD += -ldl endif -diff --git a/util/cairo-trace/Makefile.in b/util/cairo-trace/Makefile.in -index a35c501a2..780af44ba 100644 ---- a/util/cairo-trace/Makefile.in -+++ b/util/cairo-trace/Makefile.in -@@ -470,7 +470,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \ - - libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) - libcairo_trace_la_LDFLAGS = -module -no-undefined -avoid-version --libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz $(am__append_1) \ -+libcairo_trace_la_LIBADD = $(real_pthread_LIBS) $(am__append_1) \ - $(am__append_3) - EXTRA_DIST = \ - COPYING \ diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 258360d91b3443..0962303bc5d514 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( 0001_fix_osx_defined.patch #build.patch build2.patch + remove_test_perf.patch ) #TODO the autoconf script has a lot of additional option which use auto detection and should be disabled! @@ -49,22 +50,25 @@ vcpkg_configure_make( ac_cv_lib_lzo2_lzo2a_decompress=yes lt_cv_deplibs_check_method=pass_all ) -#vcpkg_install_make() -vcpkg_install_make(SUBPATH /src) - +vcpkg_install_make() +# vcpkg_install_make(SUBPATH /src) +# if("gobject" IN_LIST FEATURES) + # This deletes the previous build + # vcpkg_install_make(SUBPATH /util/cairo-gobject) +# endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h") - file(READ ${FILE} CAIRO_H) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}") - else() - string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "0" CAIRO_H "${CAIRO_H}") - endif() - file(WRITE ${FILE} "${CAIRO_H}") -endforeach() +set(_file "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h") +file(READ ${_file} CAIRO_H) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}") +else() + string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "0" CAIRO_H "${CAIRO_H}") +endif() +file(WRITE ${_file} "${CAIRO_H}") + # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/cairo/remove_test_perf.patch b/ports/cairo/remove_test_perf.patch new file mode 100644 index 00000000000000..8ae4a3e23f9c4d --- /dev/null +++ b/ports/cairo/remove_test_perf.patch @@ -0,0 +1,122 @@ +diff --git a/Makefile.am b/Makefile.am +index 03fa35236..94a7a263a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,11 +16,11 @@ EXTRA_DIST += \ + + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} + +-DIST_SUBDIRS = src doc util boilerplate test perf +-SUBDIRS = src doc util ++DIST_SUBDIRS = src util boilerplate ++SUBDIRS = src util + # libpng is required for our test programs + if CAIRO_HAS_PNG_FUNCTIONS +-SUBDIRS += boilerplate test perf ++SUBDIRS += boilerplate + endif + + configure: cairo-version.h +@@ -28,12 +28,11 @@ configure: cairo-version.h + doc: + cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ + test retest recheck: all +- cd test && $(MAKE) $(AM_MAKEFLAGS) $@ ++ echo "do nothing" + perf: all + cd perf && $(MAKE) $(AM_MAKEFLAGS) $@ + check-valgrind: all +- cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind +- cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind ++ echo "do nothing" + .PHONY: doc test retest recheck perf check-valgrind + + +diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am +index 29ad015ac..9234014ed 100644 +--- a/boilerplate/Makefile.am ++++ b/boilerplate/Makefile.am +@@ -69,7 +69,7 @@ test: check + + if CROSS_COMPILING + else +-TESTS += check-link$(EXEEXT) ++#TESTS += check-link$(EXEEXT) + endif + + check_PROGRAMS += check-link +diff --git a/perf/cairo-analyse-trace.c b/perf/cairo-analyse-trace.c +index 994148660..5d2dceaec 100644 +--- a/perf/cairo-analyse-trace.c ++++ b/perf/cairo-analyse-trace.c +@@ -53,7 +53,7 @@ + #include + + #ifdef _MSC_VER +-#include "dirent-win32.h" ++#include "dirent.h" + + static char * + basename_no_ext (char *path) +diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c +index 02e0e29f9..36daf3fd6 100644 +--- a/perf/cairo-perf-trace.c ++++ b/perf/cairo-perf-trace.c +@@ -54,7 +54,7 @@ + #include + + #ifdef _MSC_VER +-#include "dirent-win32.h" ++#include "dirent.h" + + static char * + basename_no_ext (char *path) +diff --git a/src/Makefile.am b/src/Makefile.am +index fe339a3cf..df6de0136 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -100,8 +100,8 @@ else + TESTS += check-link$(EXEEXT) + endif + +-EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c check-doc-syntax.awk +-check_PROGRAMS += check-link ++# EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c check-doc-syntax.awk ++# check_PROGRAMS += check-link + check_link_LDADD = libcairo.la + + check: headers-standalone +diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h +index d982c101d..ad9b26ba0 100644 +--- a/src/cairo-compiler-private.h ++++ b/src/cairo-compiler-private.h +@@ -201,10 +201,10 @@ + #define hypot _hypot + #define pclose _pclose + #define popen _popen +-#define snprintf _snprintf ++//#define snprintf _snprintf + #define strdup _strdup + #define unlink _unlink +-#define vsnprintf _vsnprintf ++//#define vsnprintf _vsnprintf + #endif + + #ifdef _MSC_VER +diff --git a/test/Makefile.am b/test/Makefile.am +index e3c42ea88..099ca8b22 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -351,9 +351,9 @@ FAILED_TESTS = `grep -l '\' $(test_sources:.c=.log) 2>/dev/null | tr '\n' + recheck = check CAIRO_TESTS="$(FAILED_TESTS)" + + # Re-checks all failed tests, i.e. tests with a log file that has a failure +-recheck: +- @echo Re-checking failed tests +- @$(MAKE) $(AM_MAKEFLAGS) $(recheck) ++# recheck: ++# @echo Re-checking failed tests ++# @$(MAKE) $(AM_MAKEFLAGS) $(recheck) + + # Checks tests. + # Target doesn't fail if tests fail. From d9b5d2cf2f309c82fffb5b4318ef795b4ed17b9a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 16:14:37 +0100 Subject: [PATCH 071/182] add harfbuzz inlcude in pango since meson does not add it into pkgconfig. --- ports/pango/portfile.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 3c087482347d05..af582494937253 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -36,6 +36,14 @@ 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() # option('gtk_doc', # description: 'Build API reference for Pango using GTK-Doc', # type: 'boolean', From 4ab5960cbff1391ff578383bd6de33cc5269eb74 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 16:15:01 +0100 Subject: [PATCH 072/182] fix gtk build. Remaining issue fix install script. --- ports/gtk/CONTROL | 2 +- ports/gtk/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL index 374801c8a1f2ae..9677acb9f03725 100644 --- a/ports/gtk/CONTROL +++ b/ports/gtk/CONTROL @@ -3,4 +3,4 @@ Version: 4.0.1 Port-Version: 0 Homepage: https://www.gtk.org/ Description: Portable library for creating graphical user interfaces. -Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext, graphene, sassc +Build-Depends: glib, atk, gdk-pixbuf, pango, cairo[gobject], libepoxy, gettext, graphene, sassc diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 65a2be38d0bb06..eefdf114ef1e64 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -46,6 +46,7 @@ vcpkg_fixup_pkgconfig() file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtk) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gtk/COPYING ${CURRENT_PACKAGES_DIR}/share/gtk/copyright) +vcpkg_copy_tools(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg qtk4-query-settings gtk4-update-icon-cache AUTO_CLEAN) # GDK backends From ede049be8b27989ad07b691c8530b44af9219d9f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 20:51:01 +0100 Subject: [PATCH 073/182] fix gtk build --- ports/gtk/CMakeLists.txt | 174 ------------ ports/gtk/build.patch | 31 +++ ports/gtk/cmake/install_headers.cmake | 376 -------------------------- ports/gtk/portfile.cmake | 44 ++- 4 files changed, 73 insertions(+), 552 deletions(-) delete mode 100644 ports/gtk/CMakeLists.txt create mode 100644 ports/gtk/build.patch delete mode 100644 ports/gtk/cmake/install_headers.cmake diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt deleted file mode 100644 index 4853e3d207d64a..00000000000000 --- a/ports/gtk/CMakeLists.txt +++ /dev/null @@ -1,174 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(gtk+ C) - -configure_file(config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) -configure_file(gdk/gdkconfig.h.win32_broadway ${CMAKE_CURRENT_SOURCE_DIR}/gdk/gdkconfig.h COPYONLY) - -set(GLIB_LIB_SUFFIX 2.0) -set(PANGO_LIB_SUFFIX 1.0) -set(ATK_LIB_SUFFIX 1.0) -set(GDK_PIXBUF_LIB_SUFFIX 2.0) -if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(CAIRO_LIB_SUFFIX d) -endif() - -if (WIN32) - # Set utf-8 charset to avoid compile error C2001 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") -endif() - -# find dependencies -# glib -find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) -set(GLIB_LIBRARIES PkgConfig::GLIB2) - -# pango -find_path(PANGO_INCLUDE_DIR pango/pango.h) -find_library(PANGO_LIBRARY pango-${PANGO_LIB_SUFFIX}) -find_library(PANGO_CAIRO_LIBRARY pangocairo-${PANGO_LIB_SUFFIX}) -find_library(PANGO_WIN32_LIBRARY pangowin32-${PANGO_LIB_SUFFIX}) -set(PANGO_LIBRARIES ${PANGO_LIBRARY} ${PANGO_CAIRO_LIBRARY} ${PANGO_WIN32_LIBRARY}) -# cairo -find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) -find_library(CAIRO_GOBJECT_LIBRARY cairo-gobject${CAIRO_LIB_SUFFIX}) -set(CAIRO_LIBRARIES ${CAIRO_LIBRARY} ${CAIRO_GOBJECT_LIBRARY}) -find_path(CAIRO_INCLUDE_DIR cairo.h) - -# atk -find_path(ATK_INCLUDE_DIR atk/atk.h) -find_library(ATK_LIBRARY atk-${ATK_LIB_SUFFIX}) - -# gdk-pixbuf -find_path(GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) -find_library(GDK_PIXBUF_LIBRARY gdk_pixbuf-${GDK_PIXBUF_LIB_SUFFIX}) - -# epoxy -find_path(EPOXY_INCLUDE_DIR epoxy/common.h) -find_library(EPOXY_LIBRARY epoxy) - -# gettext -find_path(LIBINTL_INCLUDE_DIR libintl.h) -find_library(LIBINTL_LIBRARY NAMES intl libintl) - -set(GTK_REQUIRED_LIBRARIES - ${LIBINTL_LIBRARY} - ${EPOXY_LIBRARY} - ${GLIB_LIBRARIES} - ${CAIRO_LIBRARIES} - ${PANGO_LIBRARIES} - ${GDK_PIXBUF_LIBRARY} - ${ATK_LIBRARY}) - -set(GTK_REQUIRED_INCLUDE_DIR - ${LIBINTL_INCLUDE_DIR} - ${EPOXY_INCLUDE_DIR} - ${GLIB_INCLUDE_DIRS} - ${GDK_PIXBUF_INCLUDE_DIR} - ${CAIRO_INCLUDE_DIR} - ${PANGO_INCLUDE_DIR} - ${ATK_INCLUDE_DIR}) - -# defines expected by all modules -add_definitions( - -DHAVE_CONFIG_H - -DG_DISABLE_SINGLE_INCLUDES - -DATK_DISABLE_SINGLE_INCLUDES - -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES - -DGTK_DISABLE_SINGLE_INCLUDES - -D_USE_MATH_DEFINES) - -add_definitions(-DG_ENABLE_DEBUG) -if(CMAKE_BUILD_TYPE STREQUAL Debug) - add_definitions(-DG_ENABLE_CONSISTENCY_CHECKS) -else() - add_definitions(-DG_DISABLE_CAST_CHECKS) -endif() - -macro(extract_vcproj_sources VC_PROJECT OUT_VAR) - file(READ ${VC_PROJECT} ${VC_PROJECT}-CONTENTS) - STRING(REPLACE "\n" ";" ${VC_PROJECT}-CONTENTS "${${VC_PROJECT}-CONTENTS}") # split by lines - foreach(LINE ${${VC_PROJECT}-CONTENTS}) - if(LINE MATCHES "") - string(REPLACE "" "" LINE ${LINE}) - string(STRIP ${LINE} LINE) - file(TO_CMAKE_PATH ${LINE} LINE) - list(APPEND ${OUT_VAR} ${LINE}) - endif() - endforeach() -endmacro() - -# build 'win32' gdk backend -extract_vcproj_sources(build/win32/vs14/gdk3-win32.vcxproj GDK_WIN32_SOURCES) -add_library(gdk-3-win32 STATIC ${GDK_WIN32_SOURCES}) -target_compile_definitions(gdk-3-win32 PRIVATE - GDK_COMPILATION G_LOG_DOMAIN="Gdk" INSIDE_GDK_WIN32) -target_include_directories(gdk-3-win32 PRIVATE . ./gdk ./gdk/win32 ${GTK_REQUIRED_INCLUDE_DIR}) - -# build 'broadway' gdk backend -extract_vcproj_sources(build/win32/vs14/gdk3-broadway.vcxproj GDK_BROADWAY_SOURCES) -add_library(gdk-3-broadway STATIC ${GDK_BROADWAY_SOURCES}) -target_compile_definitions(gdk-3-broadway PRIVATE - GDK_COMPILATION G_LOG_DOMAIN="Gdk") -target_include_directories(gdk-3-broadway PRIVATE . ./gdk ./gdk/broadway ${GTK_REQUIRED_INCLUDE_DIR}) - -macro(gtk_add_module MODULE_NAME) - add_library(${MODULE_NAME} ${ARGN}) - target_include_directories(${MODULE_NAME} PRIVATE . ./gdk ./gtk ${GTK_REQUIRED_INCLUDE_DIR}) - target_link_libraries(${MODULE_NAME} ${GTK_REQUIRED_LIBRARIES}) - set_target_properties(${MODULE_NAME} PROPERTIES - ARCHIVE_OUTPUT_NAME ${MODULE_NAME}.0) - install(TARGETS ${MODULE_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -endmacro() - -extract_vcproj_sources(build/win32/vs14/gdk-3.vcxproj GDK_SOURCES) -gtk_add_module(gdk-3 ${GDK_SOURCES}) -target_compile_definitions(gdk-3 PRIVATE GDK_COMPILATION) -target_include_directories(gdk-3 PRIVATE ./gdk/win32 ./gdk/broadway) -target_link_libraries(gdk-3 gdk-3-win32 gdk-3-broadway winmm dwmapi setupapi imm32 ws2_32) - -extract_vcproj_sources(build/win32/vs14/gtk-3.vcxproj GTK_SOURCES) -set_source_files_properties(gtk/inspector/visual.c PROPERTIES COMPILE_FLAGS "/FImath.h") -gtk_add_module(gtk-3 ${GTK_SOURCES}) -target_compile_definitions(gtk-3 PRIVATE - GTK_COMPILATION - G_LOG_DOMAIN="Gtk" - GTK_HOST="i686-pc" - GTK_PRINT_BACKENDS="file" - GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED - INCLUDE_IM_am_et - INCLUDE_IM_cedilla - INCLUDE_IM_cyrillic_translit - INCLUDE_IM_ime - INCLUDE_IM_inuktitut - INCLUDE_IM_ipa - INCLUDE_IM_multipress - INCLUDE_IM_thai - INCLUDE_IM_ti_er - INCLUDE_IM_ti_et - INCLUDE_IM_viqr - GTK_LIBDIR="/dummy/lib" - GTK_DATADIR="/dummy/share" - GTK_DATA_PREFIX="/dummy" - GTK_SYSCONFDIR="/dummy/etc" - MULTIPRESS_CONFDIR="/dummy/etc/gtk-3.0" - MULTIPRESS_LOCALEDIR="/dummy/share/locale" - GTK_VERSION="${GTK_VERSION}/etc" - GTK_BINARY_VERSION="3.0.0/etc" - GDK_DISABLE_DEPRECATED - ISOLATION_AWARE_ENABLED) -target_link_libraries(gtk-3 gdk-3 winspool comctl32 imm32) -target_compile_options(gtk-3 PRIVATE "/wd4828" PRIVATE "/wd4244" PRIVATE "/wd4305" PRIVATE "/wd4018") - -extract_vcproj_sources(build/win32/vs14/gailutil-3.vcxproj GAILUTIL_SOURCES) -gtk_add_module(gailutil-3 ${GAILUTIL_SOURCES}) -target_compile_definitions(gailutil-3 PRIVATE GTK_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED) -target_link_libraries(gailutil-3 gtk-3 gdk-3) -set_target_properties(gailutil-3 PROPERTIES - LINK_FLAGS \"/DEF:${CMAKE_CURRENT_SOURCE_DIR}/libgail-util/gailutil.def\") - -if(NOT GTK_SKIP_HEADERS) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - include(install_headers) -endif() diff --git a/ports/gtk/build.patch b/ports/gtk/build.patch new file mode 100644 index 00000000000000..b39ceba82b0b68 --- /dev/null +++ b/ports/gtk/build.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 9fe9cd5ac..19a19e5c6 100644 +--- a/meson.build ++++ b/meson.build +@@ -792,16 +792,16 @@ subdir('docs/tools') + subdir('docs/reference') + + # Keep this in sync with post-install.sh expected arguments +-if not meson.is_cross_build() +- meson.add_install_script('build-aux/meson/post-install.py', +- gtk_api_version, +- gtk_binary_version, +- gtk_libdir, +- gtk_datadir, +- gtk_bindir) +-else +- message('Not executing post-install steps automatically when cross compiling') +-endif ++#if not meson.is_cross_build() ++# meson.add_install_script('build-aux/meson/post-install.py', ++# gtk_api_version, ++# gtk_binary_version, ++# gtk_libdir, ++# gtk_datadir, ++# gtk_bindir) ++#else ++# message('Not executing post-install steps automatically when cross compiling') ++#endif + + if host_machine.system() != 'windows' + # Install Valgrind suppression files (except on Windows, diff --git a/ports/gtk/cmake/install_headers.cmake b/ports/gtk/cmake/install_headers.cmake deleted file mode 100644 index ca2a273e44473e..00000000000000 --- a/ports/gtk/cmake/install_headers.cmake +++ /dev/null @@ -1,376 +0,0 @@ -install(FILES gdk/win32/gdkwin32.h DESTINATION include/gdk) -install(FILES gdk/gdk.h DESTINATION include/gdk) -install(FILES gdk/gdk-autocleanup.h DESTINATION include/gdk) -install(FILES gdk/gdkapplaunchcontext.h DESTINATION include/gdk) -install(FILES gdk/gdkcairo.h DESTINATION include/gdk) -install(FILES gdk/gdkcursor.h DESTINATION include/gdk) -install(FILES gdk/gdkdevice.h DESTINATION include/gdk) -install(FILES gdk/gdkdevicepad.h DESTINATION include/gdk) -install(FILES gdk/gdkdevicetool.h DESTINATION include/gdk) -install(FILES gdk/gdkdevicemanager.h DESTINATION include/gdk) -install(FILES gdk/gdkdisplay.h DESTINATION include/gdk) -install(FILES gdk/gdkdisplaymanager.h DESTINATION include/gdk) -install(FILES gdk/gdkdnd.h DESTINATION include/gdk) -install(FILES gdk/gdkdrawingcontext.h DESTINATION include/gdk) -install(FILES gdk/gdkevents.h DESTINATION include/gdk) -install(FILES gdk/gdkframetimings.h DESTINATION include/gdk) -install(FILES gdk/gdkglcontext.h DESTINATION include/gdk) -install(FILES gdk/gdkkeys.h DESTINATION include/gdk) -install(FILES gdk/gdkkeysyms.h DESTINATION include/gdk) -install(FILES gdk/gdkkeysyms-compat.h DESTINATION include/gdk) -install(FILES gdk/gdkmain.h DESTINATION include/gdk) -install(FILES gdk/gdkmonitor.h DESTINATION include/gdk) -install(FILES gdk/gdkpango.h DESTINATION include/gdk) -install(FILES gdk/gdkframeclock.h DESTINATION include/gdk) -install(FILES gdk/gdkpixbuf.h DESTINATION include/gdk) -install(FILES gdk/gdkprivate.h DESTINATION include/gdk) -install(FILES gdk/gdkproperty.h DESTINATION include/gdk) -install(FILES gdk/gdkrectangle.h DESTINATION include/gdk) -install(FILES gdk/gdkrgba.h DESTINATION include/gdk) -install(FILES gdk/gdkscreen.h DESTINATION include/gdk) -install(FILES gdk/gdkseat.h DESTINATION include/gdk) -install(FILES gdk/gdkselection.h DESTINATION include/gdk) -install(FILES gdk/gdktestutils.h DESTINATION include/gdk) -install(FILES gdk/gdkthreads.h DESTINATION include/gdk) -install(FILES gdk/gdktypes.h DESTINATION include/gdk) -install(FILES gdk/gdkvisual.h DESTINATION include/gdk) -install(FILES gdk/gdkwindow.h DESTINATION include/gdk) -install(FILES gdk/deprecated/gdkcolor.h DESTINATION include/gdk/deprecated) -install(FILES gdk/gdkconfig.h DESTINATION include/gdk) -install(FILES gdk/gdkenumtypes.h DESTINATION include/gdk) -install(FILES gdk/gdkversionmacros.h DESTINATION include/gdk) -install(FILES gdk/win32/gdkwin32cursor.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32display.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32displaymanager.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32dnd.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32glcontext.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32keys.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32misc.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32monitor.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32screen.h DESTINATION include/gdk/win32) -install(FILES gdk/win32/gdkwin32window.h DESTINATION include/gdk/win32) -install(FILES gtk/gtk.h DESTINATION include/gtk) -install(FILES gtk/gtk-autocleanups.h DESTINATION include/gtk) -install(FILES gtk/gtkx.h DESTINATION include/gtk) -install(FILES gtk/gtkx-autocleanups.h DESTINATION include/gtk) -install(FILES gtk/gtk-a11y.h DESTINATION include/gtk) -install(FILES gtk/gtkaboutdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkaccelgroup.h DESTINATION include/gtk) -install(FILES gtk/gtkaccellabel.h DESTINATION include/gtk) -install(FILES gtk/gtkaccelmap.h DESTINATION include/gtk) -install(FILES gtk/gtkaccessible.h DESTINATION include/gtk) -install(FILES gtk/gtkactionable.h DESTINATION include/gtk) -install(FILES gtk/gtkactionbar.h DESTINATION include/gtk) -install(FILES gtk/gtkadjustment.h DESTINATION include/gtk) -install(FILES gtk/gtkappchooser.h DESTINATION include/gtk) -install(FILES gtk/gtkappchooserbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkappchooserdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkappchooserwidget.h DESTINATION include/gtk) -install(FILES gtk/gtkapplication.h DESTINATION include/gtk) -install(FILES gtk/gtkapplicationwindow.h DESTINATION include/gtk) -install(FILES gtk/gtkaspectframe.h DESTINATION include/gtk) -install(FILES gtk/gtkassistant.h DESTINATION include/gtk) -install(FILES gtk/gtkbbox.h DESTINATION include/gtk) -install(FILES gtk/gtkbin.h DESTINATION include/gtk) -install(FILES gtk/gtkbindings.h DESTINATION include/gtk) -install(FILES gtk/gtkborder.h DESTINATION include/gtk) -install(FILES gtk/gtkbox.h DESTINATION include/gtk) -install(FILES gtk/gtkbuilder.h DESTINATION include/gtk) -install(FILES gtk/gtkbuildable.h DESTINATION include/gtk) -install(FILES gtk/gtkbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkcalendar.h DESTINATION include/gtk) -install(FILES gtk/gtkcellarea.h DESTINATION include/gtk) -install(FILES gtk/gtkcellareacontext.h DESTINATION include/gtk) -install(FILES gtk/gtkcellareabox.h DESTINATION include/gtk) -install(FILES gtk/gtkcelleditable.h DESTINATION include/gtk) -install(FILES gtk/gtkcelllayout.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrenderer.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrendereraccel.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrenderercombo.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrendererpixbuf.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrendererprogress.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrendererspin.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrendererspinner.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrenderertext.h DESTINATION include/gtk) -install(FILES gtk/gtkcellrenderertoggle.h DESTINATION include/gtk) -install(FILES gtk/gtkcellview.h DESTINATION include/gtk) -install(FILES gtk/gtkcheckbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkcheckmenuitem.h DESTINATION include/gtk) -install(FILES gtk/gtkclipboard.h DESTINATION include/gtk) -install(FILES gtk/gtkcolorbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkcolorchooser.h DESTINATION include/gtk) -install(FILES gtk/gtkcolorchooserwidget.h DESTINATION include/gtk) -install(FILES gtk/gtkcolorchooserdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkcolorutils.h DESTINATION include/gtk) -install(FILES gtk/gtkcombobox.h DESTINATION include/gtk) -install(FILES gtk/gtkcomboboxtext.h DESTINATION include/gtk) -install(FILES gtk/gtkcontainer.h DESTINATION include/gtk) -install(FILES gtk/gtkcssprovider.h DESTINATION include/gtk) -install(FILES gtk/gtkcsssection.h DESTINATION include/gtk) -install(FILES gtk/gtkdebug.h DESTINATION include/gtk) -install(FILES gtk/gtkdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkdnd.h DESTINATION include/gtk) -install(FILES gtk/gtkdragdest.h DESTINATION include/gtk) -install(FILES gtk/gtkdragsource.h DESTINATION include/gtk) -install(FILES gtk/gtkdrawingarea.h DESTINATION include/gtk) -install(FILES gtk/gtkeditable.h DESTINATION include/gtk) -install(FILES gtk/gtkentry.h DESTINATION include/gtk) -install(FILES gtk/gtkentrybuffer.h DESTINATION include/gtk) -install(FILES gtk/gtkentrycompletion.h DESTINATION include/gtk) -install(FILES gtk/gtkenums.h DESTINATION include/gtk) -install(FILES gtk/gtkeventbox.h DESTINATION include/gtk) -install(FILES gtk/gtkeventcontroller.h DESTINATION include/gtk) -install(FILES gtk/gtkexpander.h DESTINATION include/gtk) -install(FILES gtk/gtkfilechooser.h DESTINATION include/gtk) -install(FILES gtk/gtkfilechooserbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkfilechooserdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkfilechoosernative.h DESTINATION include/gtk) -install(FILES gtk/gtkfilechooserwidget.h DESTINATION include/gtk) -install(FILES gtk/gtkfilefilter.h DESTINATION include/gtk) -install(FILES gtk/gtkfixed.h DESTINATION include/gtk) -install(FILES gtk/gtkflowbox.h DESTINATION include/gtk) -install(FILES gtk/gtkfontbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkfontchooser.h DESTINATION include/gtk) -install(FILES gtk/gtkfontchooserdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkfontchooserwidget.h DESTINATION include/gtk) -install(FILES gtk/gtkframe.h DESTINATION include/gtk) -install(FILES gtk/gtkgesture.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturedrag.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturelongpress.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturemultipress.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturepan.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturerotate.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturesingle.h DESTINATION include/gtk) -install(FILES gtk/gtkgestureswipe.h DESTINATION include/gtk) -install(FILES gtk/gtkgesturezoom.h DESTINATION include/gtk) -install(FILES gtk/gtkglarea.h DESTINATION include/gtk) -install(FILES gtk/gtkgrid.h DESTINATION include/gtk) -install(FILES gtk/gtkheaderbar.h DESTINATION include/gtk) -install(FILES gtk/gtkicontheme.h DESTINATION include/gtk) -install(FILES gtk/gtkiconview.h DESTINATION include/gtk) -install(FILES gtk/gtkimage.h DESTINATION include/gtk) -install(FILES gtk/gtkimcontext.h DESTINATION include/gtk) -install(FILES gtk/gtkimcontextinfo.h DESTINATION include/gtk) -install(FILES gtk/gtkimcontextsimple.h DESTINATION include/gtk) -install(FILES gtk/gtkimmodule.h DESTINATION include/gtk) -install(FILES gtk/gtkimmulticontext.h DESTINATION include/gtk) -install(FILES gtk/gtkinfobar.h DESTINATION include/gtk) -install(FILES gtk/gtkinvisible.h DESTINATION include/gtk) -install(FILES gtk/gtklabel.h DESTINATION include/gtk) -install(FILES gtk/gtklayout.h DESTINATION include/gtk) -install(FILES gtk/gtklevelbar.h DESTINATION include/gtk) -install(FILES gtk/gtklinkbutton.h DESTINATION include/gtk) -install(FILES gtk/gtklistbox.h DESTINATION include/gtk) -install(FILES gtk/gtkliststore.h DESTINATION include/gtk) -install(FILES gtk/gtklockbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkmain.h DESTINATION include/gtk) -install(FILES gtk/gtkmenu.h DESTINATION include/gtk) -install(FILES gtk/gtkmenubar.h DESTINATION include/gtk) -install(FILES gtk/gtkmenubutton.h DESTINATION include/gtk) -install(FILES gtk/gtkmenuitem.h DESTINATION include/gtk) -install(FILES gtk/gtkmenushell.h DESTINATION include/gtk) -install(FILES gtk/gtkmenutoolbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkmessagedialog.h DESTINATION include/gtk) -install(FILES gtk/gtkmodelbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkmodules.h DESTINATION include/gtk) -install(FILES gtk/gtkmountoperation.h DESTINATION include/gtk) -install(FILES gtk/gtknativedialog.h DESTINATION include/gtk) -install(FILES gtk/gtknotebook.h DESTINATION include/gtk) -install(FILES gtk/gtkoffscreenwindow.h DESTINATION include/gtk) -install(FILES gtk/gtkorientable.h DESTINATION include/gtk) -install(FILES gtk/gtkoverlay.h DESTINATION include/gtk) -install(FILES gtk/gtkpadcontroller.h DESTINATION include/gtk) -install(FILES gtk/gtkpagesetup.h DESTINATION include/gtk) -install(FILES gtk/gtkpaned.h DESTINATION include/gtk) -install(FILES gtk/gtkpapersize.h DESTINATION include/gtk) -install(FILES gtk/gtkplacessidebar.h DESTINATION include/gtk) -install(FILES gtk/gtkplug.h DESTINATION include/gtk) -install(FILES gtk/gtkpopover.h DESTINATION include/gtk) -install(FILES gtk/gtkpopovermenu.h DESTINATION include/gtk) -install(FILES gtk/gtkprintcontext.h DESTINATION include/gtk) -install(FILES gtk/gtkprintoperation.h DESTINATION include/gtk) -install(FILES gtk/gtkprintoperationpreview.h DESTINATION include/gtk) -install(FILES gtk/gtkprintsettings.h DESTINATION include/gtk) -install(FILES gtk/gtkprogressbar.h DESTINATION include/gtk) -install(FILES gtk/gtkradiobutton.h DESTINATION include/gtk) -install(FILES gtk/gtkradiomenuitem.h DESTINATION include/gtk) -install(FILES gtk/gtkradiotoolbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkrange.h DESTINATION include/gtk) -install(FILES gtk/gtkrecentchooser.h DESTINATION include/gtk) -install(FILES gtk/gtkrecentchooserdialog.h DESTINATION include/gtk) -install(FILES gtk/gtkrecentchoosermenu.h DESTINATION include/gtk) -install(FILES gtk/gtkrecentchooserwidget.h DESTINATION include/gtk) -install(FILES gtk/gtkrecentfilter.h DESTINATION include/gtk) -install(FILES gtk/gtkrecentmanager.h DESTINATION include/gtk) -install(FILES gtk/gtkrender.h DESTINATION include/gtk) -install(FILES gtk/gtkrevealer.h DESTINATION include/gtk) -install(FILES gtk/gtkscale.h DESTINATION include/gtk) -install(FILES gtk/gtkscalebutton.h DESTINATION include/gtk) -install(FILES gtk/gtkscrollable.h DESTINATION include/gtk) -install(FILES gtk/gtkscrollbar.h DESTINATION include/gtk) -install(FILES gtk/gtkscrolledwindow.h DESTINATION include/gtk) -install(FILES gtk/gtksearchbar.h DESTINATION include/gtk) -install(FILES gtk/gtksearchentry.h DESTINATION include/gtk) -install(FILES gtk/gtkselection.h DESTINATION include/gtk) -install(FILES gtk/gtkseparator.h DESTINATION include/gtk) -install(FILES gtk/gtkseparatormenuitem.h DESTINATION include/gtk) -install(FILES gtk/gtkseparatortoolitem.h DESTINATION include/gtk) -install(FILES gtk/gtksettings.h DESTINATION include/gtk) -install(FILES gtk/gtkshortcutlabel.h DESTINATION include/gtk) -install(FILES gtk/gtkshortcutsgroup.h DESTINATION include/gtk) -install(FILES gtk/gtkshortcutssection.h DESTINATION include/gtk) -install(FILES gtk/gtkshortcutsshortcut.h DESTINATION include/gtk) -install(FILES gtk/gtkshortcutswindow.h DESTINATION include/gtk) -install(FILES gtk/gtkshow.h DESTINATION include/gtk) -install(FILES gtk/gtkstacksidebar.h DESTINATION include/gtk) -install(FILES gtk/gtksizegroup.h DESTINATION include/gtk) -install(FILES gtk/gtksizerequest.h DESTINATION include/gtk) -install(FILES gtk/gtksocket.h DESTINATION include/gtk) -install(FILES gtk/gtkspinbutton.h DESTINATION include/gtk) -install(FILES gtk/gtkspinner.h DESTINATION include/gtk) -install(FILES gtk/gtkstack.h DESTINATION include/gtk) -install(FILES gtk/gtkstackswitcher.h DESTINATION include/gtk) -install(FILES gtk/gtkstatusbar.h DESTINATION include/gtk) -install(FILES gtk/gtkstylecontext.h DESTINATION include/gtk) -install(FILES gtk/gtkstyleprovider.h DESTINATION include/gtk) -install(FILES gtk/gtkswitch.h DESTINATION include/gtk) -install(FILES gtk/gtktestutils.h DESTINATION include/gtk) -install(FILES gtk/gtktextattributes.h DESTINATION include/gtk) -install(FILES gtk/gtktextbuffer.h DESTINATION include/gtk) -install(FILES gtk/gtktextbufferrichtext.h DESTINATION include/gtk) -install(FILES gtk/gtktextchild.h DESTINATION include/gtk) -install(FILES gtk/gtktextdisplay.h DESTINATION include/gtk) -install(FILES gtk/gtktextiter.h DESTINATION include/gtk) -install(FILES gtk/gtktextmark.h DESTINATION include/gtk) -install(FILES gtk/gtktexttag.h DESTINATION include/gtk) -install(FILES gtk/gtktexttagtable.h DESTINATION include/gtk) -install(FILES gtk/gtktextview.h DESTINATION include/gtk) -install(FILES gtk/gtktogglebutton.h DESTINATION include/gtk) -install(FILES gtk/gtktoggletoolbutton.h DESTINATION include/gtk) -install(FILES gtk/gtktoolbar.h DESTINATION include/gtk) -install(FILES gtk/gtktoolbutton.h DESTINATION include/gtk) -install(FILES gtk/gtktoolitem.h DESTINATION include/gtk) -install(FILES gtk/gtktoolitemgroup.h DESTINATION include/gtk) -install(FILES gtk/gtktoolpalette.h DESTINATION include/gtk) -install(FILES gtk/gtktoolshell.h DESTINATION include/gtk) -install(FILES gtk/gtktooltip.h DESTINATION include/gtk) -install(FILES gtk/gtktreednd.h DESTINATION include/gtk) -install(FILES gtk/gtktreemodel.h DESTINATION include/gtk) -install(FILES gtk/gtktreemodelfilter.h DESTINATION include/gtk) -install(FILES gtk/gtktreemodelsort.h DESTINATION include/gtk) -install(FILES gtk/gtktreeselection.h DESTINATION include/gtk) -install(FILES gtk/gtktreesortable.h DESTINATION include/gtk) -install(FILES gtk/gtktreestore.h DESTINATION include/gtk) -install(FILES gtk/gtktreeview.h DESTINATION include/gtk) -install(FILES gtk/gtktreeviewcolumn.h DESTINATION include/gtk) -install(FILES gtk/gtktypes.h DESTINATION include/gtk) -install(FILES gtk/gtkviewport.h DESTINATION include/gtk) -install(FILES gtk/gtkvolumebutton.h DESTINATION include/gtk) -install(FILES gtk/gtkwidget.h DESTINATION include/gtk) -install(FILES gtk/gtkwidgetpath.h DESTINATION include/gtk) -install(FILES gtk/gtkwindow.h DESTINATION include/gtk) -install(FILES gtk/gtkwindowgroup.h DESTINATION include/gtk) -install(FILES gtk/gtktextlayout.h DESTINATION include/gtk) -install(FILES gtk/gtktypebuiltins.h DESTINATION include/gtk) -install(FILES gtk/gtkversion.h DESTINATION include/gtk) -install(FILES gtk/a11y/gtk-a11y-autocleanups.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkarrowaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkbooleancellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkbuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkcellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkcellaccessibleparent.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkcheckmenuitemaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkcomboboxaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkcontaineraccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkcontainercellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkentryaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkexpanderaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkflowboxaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkflowboxchildaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkframeaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkiconviewaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkimageaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkimagecellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtklabelaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtklevelbaraccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtklinkbuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtklistboxaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtklistboxrowaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtklockbuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkmenuaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkmenubuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkmenuitemaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkmenushellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtknotebookaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtknotebookpageaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkpanedaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkpopoveraccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkprogressbaraccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkradiobuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkradiomenuitemaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkrangeaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkrenderercellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkscaleaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkscalebuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkscrolledwindowaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkspinbuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkspinneraccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkstatusbaraccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkstackaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkswitchaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtktextcellaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtktextviewaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtktogglebuttonaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtktoplevelaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtktreeviewaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkwidgetaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/a11y/gtkwindowaccessible.h DESTINATION include/gtk/a11y) -install(FILES gtk/deprecated/gtkactivatable.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkaction.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkactiongroup.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkalignment.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkarrow.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkcolorsel.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkcolorseldialog.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkfontsel.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkgradient.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhandlebox.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhbbox.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhbox.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhpaned.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhscale.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhscrollbar.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhseparator.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkhsv.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkiconfactory.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkimagemenuitem.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkmisc.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtknumerableicon.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkradioaction.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkrc.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkrecentaction.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkstatusicon.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkstock.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkstyle.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkstyleproperties.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtksymboliccolor.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtktable.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtktearoffmenuitem.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkthemingengine.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtktoggleaction.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkuimanager.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkvbbox.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkvbox.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkvscale.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkvscrollbar.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkvseparator.h DESTINATION include/gtk/deprecated) -install(FILES gtk/deprecated/gtkvpaned.h DESTINATION include/gtk/deprecated) -install(FILES libgail-util/gailmisc.h DESTINATION include/libgail-util) -install(FILES libgail-util/gailtextutil.h DESTINATION include/libgail-util) -install(FILES libgail-util/gail-util.h DESTINATION include/libgail-util) -install(FILES gdk/broadway/gdkbroadway.h DESTINATION include/gdk) -install(FILES gdk/broadway/gdkbroadwaydisplay.h DESTINATION include/gdk/broadway) -install(FILES gdk/broadway/gdkbroadwaywindow.h DESTINATION include/gdk/broadway) -install(FILES gdk/broadway/gdkbroadwaycursor.h DESTINATION include/gdk/broadway) -install(FILES gdk/broadway/gdkbroadwaymonitor.h DESTINATION include/gdk/broadway) -install(FILES gdk/broadway/gdkbroadwayvisual.h DESTINATION include/gdk/broadway) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index eefdf114ef1e64..223bae50d40b88 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -10,8 +10,12 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES build.patch ) - +vcpkg_find_acquire_program(PKGCONFIG) +get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) +vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be an PATH +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/glib/") vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -39,6 +43,40 @@ vcpkg_configure_meson( vcpkg_install_meson() +# If somebody finds out how to access and forward env variables to +# the meson install script be my guest. Nevertheless the script still +# needs manual execution in the crosscompiling case. +vcpkg_find_acquire_program(PYTHON3) +foreach(_config release debug) + if(_config STREQUAL "release") + set(_short rel) + set(_path_suffix /debug) + else() + set(_short dbg) + set(_path_suffix /debug) + endif() + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib") + continue() + endif() + message(STATUS "Running post install script: ${TARGET_TRIPLET}-${_short}") + + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix}/lib/pkgconfig/") + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/media") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") + vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/build-aux/meson/post-install.py" 4.0 4.0.0 "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib" "${CURRENT_PACKAGES_DIR}${_path_suffix}/share" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME post-install-${TARGET_TRIPLET}-${_short} + ) + unset(ENV{PKG_CONFIG_PATH}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") + file(RENAME "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0/") + message(STATUS "Post install ${TARGET_TRIPLET}-${_short} done") +endforeach() + vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() @@ -46,7 +84,9 @@ vcpkg_fixup_pkgconfig() file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtk) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gtk/COPYING ${CURRENT_PACKAGES_DIR}/share/gtk/copyright) -vcpkg_copy_tools(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg qtk4-query-settings gtk4-update-icon-cache AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg gtk4-query-settings gtk4-update-icon-cache AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # GDK backends From ed1e4be80eab827f5ff76e89059ed11cbf51bf35 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 21:13:29 +0100 Subject: [PATCH 074/182] fix io2d --- ports/io2d/CONTROL | 2 +- ports/io2d/cmake.dep.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL index 59ff0c23cf183d..aea8aa7daa4aa3 100644 --- a/ports/io2d/CONTROL +++ b/ports/io2d/CONTROL @@ -1,5 +1,5 @@ Source: io2d Version: 2020-09-14 -Port-Version: 1 +Port-Version: 2 Description: a lightweight, cross platform drawing library Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx) diff --git a/ports/io2d/cmake.dep.patch b/ports/io2d/cmake.dep.patch index baad3634137cb8..bcc7ea2a2580db 100644 --- a/ports/io2d/cmake.dep.patch +++ b/ports/io2d/cmake.dep.patch @@ -8,7 +8,7 @@ index 5ebeb6afa..702864667 100644 -find_package(Cairo REQUIRED) -find_package(GraphicsMagick REQUIRED) -+find_package(unofficial-Cairo REQUIRED) ++find_package(Cairo REQUIRED) +find_package(unofficial-GraphicsMagick REQUIRED) add_library(io2d_cairo @@ -18,7 +18,7 @@ index 5ebeb6afa..702864667 100644 target_compile_features(io2d_cairo PUBLIC cxx_std_17) -target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick) -+target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick) ++target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) install( TARGETS io2d_cairo EXPORT io2d_targets From c4943d0e2b0d258d12b9a7dcb5125253d177001f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 21:13:36 +0100 Subject: [PATCH 075/182] add supports field --- ports/libsass/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libsass/CONTROL b/ports/libsass/CONTROL index bec1ec4b5ed2be..e29f5b9279e201 100644 --- a/ports/libsass/CONTROL +++ b/ports/libsass/CONTROL @@ -3,5 +3,5 @@ Version: 3.6.4 Port-Version: 0 Description: LibSass - Sass compiler written in C++ Homepage: https://github.com/sass/libsass -Build-Depends: +Supports: !uwp From 988cfff72e65cef5c42e22da5e6efd680e35e9d0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 21:13:52 +0100 Subject: [PATCH 076/182] fix cartographer? --- ports/cartographer/CONTROL | 3 ++- ports/cartographer/fix-find-packages.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL index 50d324a9475752..964d3a9e092933 100644 --- a/ports/cartographer/CONTROL +++ b/ports/cartographer/CONTROL @@ -1,5 +1,6 @@ Source: cartographer -Version: 1.0.0-3 +Version: 1.0.0 +Port-Version: 4 Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf Homepage: https://github.com/googlecartographer/cartographer Description: Google 2D & 3D SLAM package diff --git a/ports/cartographer/fix-find-packages.patch b/ports/cartographer/fix-find-packages.patch index 3ab53bff96de6b..691e1b00148283 100644 --- a/ports/cartographer/fix-find-packages.patch +++ b/ports/cartographer/fix-find-packages.patch @@ -26,12 +26,12 @@ index 2e3a686..f36f15a 100644 -include(FindPkgConfig) -PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) -+#include(FindPkgConfig) -+#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) -+if(CMAKE_BUILD_TYPE STREQUAL Debug) -+ set(CAIRO_LIB_SUFFIX d) -+endif() -+find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) ++include(FindPkgConfig) ++PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) ++#if(CMAKE_BUILD_TYPE STREQUAL Debug) ++# set(CAIRO_LIB_SUFFIX d) ++#endif() ++#find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) # Only build the documentation if we can find Sphinx. -find_package(Sphinx) @@ -88,7 +88,7 @@ index 2e3a686..f36f15a 100644 -target_link_libraries(${PROJECT_NAME} PUBLIC gflags) +#target_link_libraries(${PROJECT_NAME} PUBLIC glog) +#target_link_libraries(${PROJECT_NAME} PUBLIC gflags) -+target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY}) ++#target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY}) target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC "${CAIRO_INCLUDE_DIRS}") From d6c5521ebbbfa4fd604b5a86e508b59fe8db6085 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 18 Jan 2021 22:22:43 +0100 Subject: [PATCH 077/182] fix librsvg build --- ports/librsvg/CMakeLists.txt | 39 +++++++++++++++--------------------- ports/librsvg/portfile.cmake | 2 ++ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index 862d4f8d303dc6..ea788c1d02d69e 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -1,31 +1,22 @@ cmake_minimum_required(VERSION 3.11) project(librsvg C) -find_package(unofficial-cairo CONFIG REQUIRED) find_package(unofficial-libcroco CONFIG REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGETS) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET) +pkg_check_modules(CAIRO cairo IMPORTED_TARGET) +pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0 IMPORTED_TARGET) +pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET) find_package(LibXml2 REQUIRED) if(CMAKE_SYSTEM_NAME MATCHES "Windows") - find_library(PANGO_LIB pango-1.0) - find_library(PANGO_CAIRO_LIB pangocairo-1.0) - find_library(GDK_PIXBUF_LIB gdk_pixbuf-2.0) elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") - find_library(PANGO_LIB pango-1.0) - find_library(PANGO_CAIRO_LIB pangocairo-1.0) - find_library(GDK_PIXBUF_LIB gdk_pixbuf-2) else() - find_library(PANGO_LIB pango-1) - find_library(PANGO_CAIRO_LIB pangocairo-1) find_library(PANGO_FT2_LIB pangoft2-1) find_library(FONTCONFIG_LIB fontconfig) - find_library(GDK_PIXBUF_LIB gdk_pixbuf-2) endif() -find_path(CAIRO_INCLUDE_DIR cairo/cairo.h) - # Add include directories -include_directories(${CAIRO_INCLUDE_DIR} ${GDK_PIXBUF_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}) +include_directories(${CAIRO_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}) set(LIBRSVG_SOURCES librsvg-features.c @@ -111,18 +102,18 @@ target_compile_definitions(pixbufloader-svg PRIVATE -DG_LOG_DOMAIN="libpixbufloader-svg") target_link_libraries(rsvg-2.40 PRIVATE - ${GLIB2_LIBRARIES_STATIC} + PkgConfig::GLIB2 ${LIBXML2_LIBRARIES} - ${PANGO_LIB} - ${PANGO_CAIRO_LIB} - ${GDK_PIXBUF_LIB} + PkgConfig::PANGO + PkgConfig::GDK_PIXBUF ${PANGO_FT2_LIB} ${FONTCONFIG_LIB} + unofficial::libcroco::croco-0.6 ) target_link_libraries(pixbufloader-svg PRIVATE rsvg-2.40 - ${GLIB2_LIBRARIES_STATIC} - ${GDK_PIXBUF_LIB} + PkgConfig::GLIB2 + PkgConfig::GDK_PIXBUF ) install(TARGETS rsvg-2.40 pixbufloader-svg @@ -149,10 +140,12 @@ install(FILES file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-librsvg-config.cmake " include(CMakeFindDependencyMacro) -find_dependency(unofficial-cairo CONFIG) +find_dependency(PkgConfig) +pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2 gio-2 IMPORTED_TARGET) +pkg_check_modules(CAIRO cairo IMPORTED_TARGET) +pkg_check_modules(GDK_PIXBUF gdk-pixbuf IMPORTED_TARGET) +pkg_check_modules(PANGO pango pangocairo IMPORTED_TARGET) find_dependency(unofficial-libcroco CONFIG) -find_dependency(gdk-pixbuf CONFIG) -find_dependency(pango CONFIG) include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-librsvg-targets.cmake) ") diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index b100d22965156f..19b86ff4740df8 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -1,3 +1,5 @@ +# port update requires rust/cargo + vcpkg_download_distfile(ARCHIVE URLS "https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz" FILENAME "librsvg-2.40.20.tar.xz" From 45cddcd264171d4ac974cc8da61aaa5ac7088729 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 00:09:25 +0100 Subject: [PATCH 078/182] fix gtk build --- ports/gtk/portfile.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 223bae50d40b88..011d3286b4c52e 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -27,6 +27,7 @@ vcpkg_configure_meson( -Dman-pages=false -Dintrospection=disabled -Dsassc=enabled + -Dmedia-ffmpeg=disabled ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' @@ -50,7 +51,7 @@ vcpkg_find_acquire_program(PYTHON3) foreach(_config release debug) if(_config STREQUAL "release") set(_short rel) - set(_path_suffix /debug) + set(_path_suffix) else() set(_short dbg) set(_path_suffix /debug) @@ -62,18 +63,18 @@ foreach(_config release debug) set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${_path_suffix}/lib/pkgconfig/") set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/media") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/media") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") vcpkg_execute_required_process( COMMAND "${PYTHON3}" "${SOURCE_PATH}/build-aux/meson/post-install.py" 4.0 4.0.0 "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib" "${CURRENT_PACKAGES_DIR}${_path_suffix}/share" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin" WORKING_DIRECTORY ${SOURCE_PATH} LOGNAME post-install-${TARGET_TRIPLET}-${_short} ) unset(ENV{PKG_CONFIG_PATH}) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/immodules") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/4.0.0/printbackends") - file(RENAME "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0") + #file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0") + #file(RENAME "${CURRENT_PACKAGES_DIR}${_path_suffix}/lib/gtk-4.0/" "${CURRENT_PACKAGES_DIR}${_path_suffix}/bin/gtk-4.0") message(STATUS "Post install ${TARGET_TRIPLET}-${_short} done") endforeach() From b0876dd63b0ef71476970af18f85be995217107f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 09:11:19 +0100 Subject: [PATCH 079/182] fix cartographer --- ports/cartographer/fix-find-packages.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cartographer/fix-find-packages.patch b/ports/cartographer/fix-find-packages.patch index 691e1b00148283..59e433c5fff55b 100644 --- a/ports/cartographer/fix-find-packages.patch +++ b/ports/cartographer/fix-find-packages.patch @@ -26,12 +26,12 @@ index 2e3a686..f36f15a 100644 -include(FindPkgConfig) -PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) -+include(FindPkgConfig) -+PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) ++#include(FindPkgConfig) ++#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) +#if(CMAKE_BUILD_TYPE STREQUAL Debug) +# set(CAIRO_LIB_SUFFIX d) +#endif() -+#find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) ++find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) # Only build the documentation if we can find Sphinx. -find_package(Sphinx) From 7d387e9e70b5317563fcc34ca25e77917a8362a6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 09:38:58 +0100 Subject: [PATCH 080/182] fix sassc on linux --- ports/sassc/portfile.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/sassc/portfile.cmake b/ports/sassc/portfile.cmake index 9d541e996f2f30..764873d043e629 100644 --- a/ports/sassc/portfile.cmake +++ b/ports/sassc/portfile.cmake @@ -9,8 +9,9 @@ vcpkg_from_github( find_library(LIBSASS_DEBUG sass PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) find_library(LIBSASS_RELEASE sass PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) - -set(ENV{LIBS} "$ENV{LIBS} -lgetopt") +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "$ENV{LIBS} -lgetopt") +endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG From 97ded1d0384bf3d360d4f492c22a3270f8eed1a8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 10:32:10 +0100 Subject: [PATCH 081/182] fix tiff and libjpeg pc files --- ports/libjpeg-turbo/portfile.cmake | 2 +- ports/tiff/portfile.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 4ade28b9a2a583..208d3ff6d40a73 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -73,7 +73,7 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc") -if(EXISTS "${_file}") +if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd") endif() diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 2b55e6b78600cc..5f9d7d67709888 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -45,6 +45,17 @@ set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") if(EXISTS "${_file}") vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") endif() + +# FIx dependencies: +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libtiff-4.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg") +endif() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include From 8f255306da8db15ad7fe5fb0ff1fa1ff03f5e9bb Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 10:42:33 +0100 Subject: [PATCH 082/182] fix pixman x86 --- ports/pixman/portfile.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 4f0d0c23683161..15419b498be117 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -1,15 +1,10 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs - # Insert in the beginning to make it overwriteable - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - list(INSERT VCPKG_CXX_FLAGS 0 /arch:SSE2) - list(INSERT VCPKG_C_FLAGS 0 /arch:SSE2) - endif() endif() if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_IS_UWP) - list(INSERT VCPKG_CXX_FLAGS 0 /arch:SSE2) - list(INSERT VCPKG_C_FLAGS 0 /arch:SSE2) + set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/arch:SSE2 ${VCPKG_C_FLAGS}") list(APPEND OPTIONS -Dmmx=enabled -Dsse2=enabled From ac4a277514b16e27bc8ec7a20900c8f41b34fb2a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 11:06:35 +0100 Subject: [PATCH 083/182] _isnanf is undefined on arm- --- ports/graphene/CONTROL | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/graphene/CONTROL b/ports/graphene/CONTROL index 83d9e62a396bb2..d4796f804e79ba 100644 --- a/ports/graphene/CONTROL +++ b/ports/graphene/CONTROL @@ -4,3 +4,4 @@ Port-Version: 0 Homepage: https://www.gtk.org/ Description: A thin layer of types for graphic libraries. Build-Depends: glib, gettext +Supports: !(arm&windows) \ No newline at end of file From 41c4ad5f1dc32ecce8cc71fcd0694fa842d833d1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 11:06:55 +0100 Subject: [PATCH 084/182] merge fix for make on arm64 --- scripts/cmake/vcpkg_configure_make.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index e7af4713c8b616..4385197c08f516 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -394,6 +394,8 @@ function(vcpkg_configure_make) #list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no) + # Currently needed for arm64 because objdump yields: "unrecognised machine type (0xaa64) in Import Library Format archive" + list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) endif() else() string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR}) From fefb913501d528f6dfcbb1eb59ae2f1f7ca8c3fd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 11:23:45 +0100 Subject: [PATCH 085/182] fix gdk-pixbuf on arm64-windows --- ports/gdk-pixbuf/portfile.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 504bae6f346ca8..9f91f5a8a03b93 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -56,8 +56,14 @@ endif() vcpkg_fixup_pkgconfig() +set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer) + +if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_TARGET_IS_WINDOWS) + list(REMOVE_ITEM TOOL_NAMES gdk-pixbuf-thumbnailer) +endif() + vcpkg_copy_pdbs() -vcpkg_copy_tools(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/COPYING ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/copyright) From d6e19c76cc531d66f95690c2aaffc02ac6e60a6e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 11:29:44 +0100 Subject: [PATCH 086/182] pixman remove test/demos. should fix it on osx. --- ports/pixman/portfile.cmake | 1 + ports/pixman/remove_test_demos.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 ports/pixman/remove_test_demos.patch diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 15419b498be117..5bdb6827dc8801 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PIXMAN_VERSION} + PATCHES remove_test_demos.patch ) # Meson install wrongly pkgconfig file! vcpkg_configure_meson( diff --git a/ports/pixman/remove_test_demos.patch b/ports/pixman/remove_test_demos.patch new file mode 100644 index 00000000000000..18efbdc2f9b47d --- /dev/null +++ b/ports/pixman/remove_test_demos.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index 1cec22728..fa6199ed0 100644 +--- a/meson.build ++++ b/meson.build +@@ -528,8 +528,8 @@ version_conf.set('PIXMAN_VERSION_MICRO', split[2]) + add_project_arguments('-DHAVE_CONFIG_H', language : ['c']) + + subdir('pixman') +-subdir('test') +-subdir('demos') ++# subdir('test') ++# subdir('demos') + + pkg = import('pkgconfig') + pkg.generate( From 1415cf477bc041a6cdab05764bb6169d7f3ad149 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 13:06:37 +0100 Subject: [PATCH 087/182] [vcpkg_install_meson] add bin to path to run code generators --- docs/maintainers/vcpkg_install_meson.md | 6 +++- scripts/cmake/vcpkg_install_meson.cmake | 48 ++++++++++++++++++------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/docs/maintainers/vcpkg_install_meson.md b/docs/maintainers/vcpkg_install_meson.md index 5d1ffb398c2658..f4bd04990446f2 100644 --- a/docs/maintainers/vcpkg_install_meson.md +++ b/docs/maintainers/vcpkg_install_meson.md @@ -4,9 +4,13 @@ Builds a meson project previously configured with `vcpkg_configure_meson()`. ## Usage ```cmake -vcpkg_install_meson() +vcpkg_install_meson([ADD_BIN_TO_PATH]) ``` +## Parameters: +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + ## Examples * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 2162029180222c..ad2933595788e7 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -5,9 +5,13 @@ Builds a meson project previously configured with `vcpkg_configure_meson()`. ## Usage ```cmake -vcpkg_install_meson() +vcpkg_install_meson([ADD_BIN_TO_PATH]) ``` +## Parameters: +### ADD_BIN_TO_PATH +Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. + ## Examples * [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) @@ -17,6 +21,7 @@ vcpkg_install_meson() function(vcpkg_install_meson) vcpkg_find_acquire_program(NINJA) unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option + cmake_parse_arguments(PARSE_ARGV 0 _im "ADD_BIN_TO_PATH" "" "") if(VCPKG_TARGET_IS_OSX) if(DEFINED ENV{SDKROOT}) @@ -30,19 +35,35 @@ function(vcpkg_install_meson) set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") endif() - message(STATUS "Package ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME package-${TARGET_TRIPLET}-rel - ) + foreach(BUILDTYPE "debug" "release") + if(DEFINED VCPKG_BUILD_TYPE AND NOT VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) + continue() + endif() + + if(BUILDTYPE STREQUAL "debug") + set(SHORT_BUILDTYPE "dbg") + else() + set(SHORT_BUILDTYPE "rel") + endif() - message(STATUS "Package ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME package-${TARGET_TRIPLET}-dbg - ) + message(STATUS "Package ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") + if(_im_ADD_BIN_TO_PATH) + set(_BACKUP_ENV_PATH "$ENV{PATH}") + if(BUILDTYPE STREQUAL "debug") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") + endif() + endif() + vcpkg_execute_required_process( + COMMAND ${NINJA} install -v + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + LOGNAME package-${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + ) + if(_im_ADD_BIN_TO_PATH) + set(ENV{PATH} "${_BACKUP_ENV_PATH}") + endif() + endforeach() set(RENAMED_LIBS) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -81,4 +102,5 @@ function(vcpkg_install_meson) unset(ENV{MACOSX_DEPLOYMENT_TARGET}) endif() endif() + endfunction() From 0e414ba83295eb6208027576edd4d368e2580212 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 13:08:26 +0100 Subject: [PATCH 088/182] [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) --- scripts/buildsystems/meson/none.txt | 19 ++++++++++++ scripts/cmake/vcpkg_configure_meson.cmake | 35 ++++++++++++----------- 2 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 scripts/buildsystems/meson/none.txt diff --git a/scripts/buildsystems/meson/none.txt b/scripts/buildsystems/meson/none.txt new file mode 100644 index 00000000000000..6dafc80904f97d --- /dev/null +++ b/scripts/buildsystems/meson/none.txt @@ -0,0 +1,19 @@ +# native file used to make the build machine compiler unusable + +[host_machine] +system = 'none' +cpu_family = 'none' +cpu = 'none' +endian = 'little' + +[properties] + +[binaries] +c = ['false'] +cpp = ['false'] +objc = ['false'] +objcpp = ['false'] +ar = ['false'] +pkgconfig = ['false'] +cmake = ['false'] +ninja = ['false'] \ No newline at end of file diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 0bc181c41ae59b..2d5fe7df642f80 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -249,7 +249,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ endforeach() string(APPEND CROSS "[properties]\n") - string(APPEND CROSS "skip_sanity_check = true\n") + #string(APPEND CROSS "skip_sanity_check = true\n") string(APPEND CROSS "[host_machine]\n") string(APPEND CROSS "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME) @@ -273,7 +273,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "cpu_family = '${BUILD_CPU_FAM}'\n") string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") - if(NOT BUILD_CPU_FAM STREQUAL HOST_CPU_FAM) + if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_UWP) set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) file(WRITE "${_file}" "${CROSS}") @@ -370,19 +370,6 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) - if(NOT VCPKG_MESON_NATIVE_FILE) - vcpkg_internal_meson_generate_native_file("_vcm_ADDITIONAL_NATIVE_BINARIES") - endif() - if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG) - vcpkg_internal_meson_generate_native_file_config(DEBUG) - endif() - if(NOT VCPKG_MESON_NATIVE_FILE_RELEASE) - vcpkg_internal_meson_generate_native_file_config(RELEASE) - endif() - list(APPEND _vcm_OPTIONS --native "${VCPKG_MESON_NATIVE_FILE}") - list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") - list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") - if(NOT VCPKG_MESON_CROSS_FILE) vcpkg_internal_meson_generate_cross_file("_vcm_ADDITIONAL_CROSS_BINARIES") endif() @@ -395,7 +382,6 @@ function(vcpkg_configure_meson) if(VCPKG_MESON_CROSS_FILE) list(APPEND _vcm_OPTIONS --cross "${VCPKG_MESON_CROSS_FILE}") endif() - if(VCPKG_MESON_CROSS_FILE_DEBUG) list(APPEND _vcm_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") endif() @@ -403,6 +389,23 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") endif() + + if(NOT VCPKG_MESON_NATIVE_FILE AND NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_native_file("_vcm_ADDITIONAL_NATIVE_BINARIES") + endif() + if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG AND NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_native_file_config(DEBUG) + endif() + if(NOT VCPKG_MESON_NATIVE_FILE_RELEASE AND NOT VCPKG_MESON_CROSS_FILE) + vcpkg_internal_meson_generate_native_file_config(RELEASE) + endif() + if(VCPKG_MESON_NATIVE_FILE AND NOT VCPKG_MESON_CROSS_FILE) + list(APPEND _vcm_OPTIONS --native "${VCPKG_MESON_NATIVE_FILE}") + list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") + list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") + else() + list(APPEND _vcm_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _vcm_OPTIONS --default-library shared) else() From 86e4fdc3aca946c205a5f94086e6f669225f59ab Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 16:43:20 +0100 Subject: [PATCH 089/182] pixman reenable UWP support. --- ports/pixman/CONTROL | 2 +- ports/pixman/portfile.cmake | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index b1b2e79f13be3d..0048e1c2684753 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -3,4 +3,4 @@ Version: 0.40.0 Homepage: https://www.cairographics.org/releases Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. Build-Depends: libpng, tool-meson -Supports: !arm&!uwp \ No newline at end of file +Supports: !arm \ No newline at end of file diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 5bdb6827dc8801..ebcf70fd34f8a0 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -2,14 +2,20 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_IS_UWP) +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPTIONS + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}") set(VCPKG_C_FLAGS "/arch:SSE2 ${VCPKG_C_FLAGS}") list(APPEND OPTIONS -Dmmx=enabled -Dsse2=enabled -Dssse3=enabled) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_IS_UWP) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + #x64 in general has all those intrinsics. (except for UWP for some reason) list(APPEND OPTIONS -Dmmx=enabled -Dsse2=enabled From eaf5658824d2e91513f66bceba5e1125045cb3c9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 17:03:06 +0100 Subject: [PATCH 090/182] pixman reenable arm support --- ports/pixman/CONTROL | 1 - ports/pixman/portfile.cmake | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index 0048e1c2684753..6dbd573ffccfaa 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -3,4 +3,3 @@ Version: 0.40.0 Homepage: https://www.cairographics.org/releases Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. Build-Depends: libpng, tool-meson -Supports: !arm \ No newline at end of file diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index ebcf70fd34f8a0..298912f041e203 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -21,11 +21,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") -Dsse2=enabled -Dssse3=enabled) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") -# If somebody teaches meson to actually do the test correctly.... -# Currently pixman-x86 is included unconditionally in builds as such arm support is disabled. -# list(APPEND OPTIONS -# -Darm-simd=enabled -# ) + list(APPEND OPTIONS + #-Darm-simd=enabled does not work with arm64-windows + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled + ) endif() set(PIXMAN_VERSION 0.40.0) From 668130d0eb56f9ddeb1f0a874ec8fced8886c572 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 17:19:40 +0100 Subject: [PATCH 091/182] add pixman:arm-uwp=fail to baseline --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 95241f5e70cc9e..9dd29de42b6c7a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1250,6 +1250,7 @@ pixel:x64-windows=fail pixel:x64-windows-static=fail pixel:x64-windows-static-md=fail pixel:x86-windows=fail +pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail plib:arm-uwp=fail From 118cab8ad90e824ac1bf9883bddfdb20f3ee2213 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 19:07:59 +0100 Subject: [PATCH 092/182] update gtkmm --- ports/gtkmm/CONTROL | 4 +- ports/gtkmm/COPYING | 502 ----- ports/gtkmm/build.patch | 40 + ports/gtkmm/fix_properties.patch | 2423 ------------------------ ports/gtkmm/fix_treeviewcolumn.patch | 15 - ports/gtkmm/msvc_recommended_pragmas.h | 34 - ports/gtkmm/portfile.cmake | 114 +- 7 files changed, 77 insertions(+), 3055 deletions(-) delete mode 100644 ports/gtkmm/COPYING create mode 100644 ports/gtkmm/build.patch delete mode 100644 ports/gtkmm/fix_properties.patch delete mode 100644 ports/gtkmm/fix_treeviewcolumn.patch delete mode 100644 ports/gtkmm/msvc_recommended_pragmas.h diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL index 42ff1167b90b98..953cd7a9fdd37b 100644 --- a/ports/gtkmm/CONTROL +++ b/ports/gtkmm/CONTROL @@ -1,6 +1,6 @@ Source: gtkmm -Version: 3.22.2 -Port-Version: 5 +Version: 4.0.0 +Port-Version: 0 Homepage: https://www.gtkmm.org/ Description: gtkmm is the official C++ interface for the popular GUI library GTK+. Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm diff --git a/ports/gtkmm/COPYING b/ports/gtkmm/COPYING deleted file mode 100644 index 4362b49151d7b3..00000000000000 --- a/ports/gtkmm/COPYING +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/ports/gtkmm/build.patch b/ports/gtkmm/build.patch new file mode 100644 index 00000000000000..d5d795c49ee200 --- /dev/null +++ b/ports/gtkmm/build.patch @@ -0,0 +1,40 @@ +diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build +index bf6c5804d..3b2ae866d 100644 +--- a/gtk/gtkmm/meson.build ++++ b/gtk/gtkmm/meson.build +@@ -489,6 +489,10 @@ if is_host_windows + extra_gtkmm_objects += gtkmm_res + endif + ++if meson.get_compiler('cpp').get_id() == 'msvc' ++ gtkmm_cpp_args += ['-std:c++17'] ++endif ++ + gtkmm_library = library(gtkmm_libname, extra_gtkmm_objects, + gtk_gen_sources, built_dummy_h_file_target, gtkmm_extra_used_cc_files, + include_directories: extra_include_dirs, +diff --git a/gtk/src/expressionwatch.hg b/gtk/src/expressionwatch.hg +index 78308d221..04e593f8b 100644 +--- a/gtk/src/expressionwatch.hg ++++ b/gtk/src/expressionwatch.hg +@@ -16,6 +16,7 @@ + + _CONFIGINCLUDE(gtkmmconfig.h) + ++#include + #include + #include + +diff --git a/untracked/gtk/gtkmm/expressionwatch.h b/untracked/gtk/gtkmm/expressionwatch.h +index 3a80efd64..279870ed7 100644 +--- a/untracked/gtk/gtkmm/expressionwatch.h ++++ b/untracked/gtk/gtkmm/expressionwatch.h +@@ -4,7 +4,7 @@ + + #include + +- ++#include + #include + #include + diff --git a/ports/gtkmm/fix_properties.patch b/ports/gtkmm/fix_properties.patch deleted file mode 100644 index 3db0a30e5719d4..00000000000000 --- a/ports/gtkmm/fix_properties.patch +++ /dev/null @@ -1,2423 +0,0 @@ -diff --git a/MSVC_Net2013/gdkmm.vcxproj b/MSVC_Net2013/gdkmm.vcxproj -index dd495a0..94c6396 100644 ---- a/MSVC_Net2013/gdkmm.vcxproj -+++ b/MSVC_Net2013/gdkmm.vcxproj -@@ -93,7 +93,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- $(CPPDepLibsDebug);%(AdditionalDependencies) -+ %(AdditionalDependencies) - $(OutDir)$(ProjectName)$(DebugDllSuffix).dll - $(IntDir)\$(ProjectName).def - true -@@ -118,7 +118,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- $(CPPDepLibsRelease);%(AdditionalDependencies) -+ %(AdditionalDependencies) - $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll - $(IntDir)\$(ProjectName).def - true -@@ -150,7 +150,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- $(CPPDepLibsDebug);%(AdditionalDependencies) -+ %(AdditionalDependencies) - $(OutDir)$(ProjectName)$(DebugDllSuffix).dll - $(IntDir)\$(ProjectName).def - true -@@ -179,7 +179,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- $(CPPDepLibsRelease);%(AdditionalDependencies) -+ %(AdditionalDependencies) - $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll - $(IntDir)\$(ProjectName).def - false -@@ -263,4 +263,4 @@ - - - -- -+ -\ No newline at end of file -diff --git a/MSVC_Net2013/gdkmm.vcxproj.filters b/MSVC_Net2013/gdkmm.vcxproj.filters -index 826f785..da390e5 100644 ---- a/MSVC_Net2013/gdkmm.vcxproj.filters -+++ b/MSVC_Net2013/gdkmm.vcxproj.filters -@@ -15,71 +15,183 @@ - - - -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ - - -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ - - - - Resource Files - - -- -+ -\ No newline at end of file -diff --git a/MSVC_Net2013/gtkmm-build-defines.props b/MSVC_Net2013/gtkmm-build-defines.props -index 880cbf7..2cb24a3 100644 ---- a/MSVC_Net2013/gtkmm-build-defines.props -+++ b/MSVC_Net2013/gtkmm-build-defines.props -@@ -4,10 +4,8 @@ - - - -- GDKMM_BUILD -- GTKMM_BUILD -- pangomm-vc$(VSVer)0-1_4.lib;giomm-vc$(VSVer)0-2_4.lib;glibmm-vc$(VSVer)0-2_4.lib;cairomm-vc$(VSVer)0-1_0.lib;sigc-vc$(VSVer)0-2_0.lib -- pangomm-vc$(VSVer)0-d-1_4.lib;giomm-vc$(VSVer)0-d-2_4.lib;glibmm-vc$(VSVer)0-d-2_4.lib;cairomm-vc$(VSVer)0-d-1_0.lib;sigc-vc$(VSVer)0-d-2_0.lib -+ GDKMM_BUILD;_WINDLL -+ GTKMM_BUILD;_WINDLL - - - <_PropertySheetDisplayName>glibmmbuilddefinesprops -@@ -16,15 +14,15 @@ - - - -- .\gdkmm;..;..\gdk;$(GlibEtcInstallRoot)\include\pangomm-1.4;$(GlibEtcInstallRoot)\lib\pangomm-1.4\include;$(GlibEtcInstallRoot)\include\giomm-2.4;$(GlibEtcInstallRoot)\lib\giomm-2.4\include;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\cairomm-1.0;$(GlibEtcInstallRoot)\lib\cairomm-1.0\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) -+ .\gdkmm;..;..\gdk;.;%(AdditionalIncludeDirectories) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - 4250;%(DisableSpecificWarnings) - true - /d2Zi+ %(AdditionalOptions) - - -- gtk-3.0.lib;gdk-3.0.lib;gdk_pixbuf-2.0.lib;gobject-2.0.lib;gio-2.0.lib;glib-2.0.lib;epoxy.lib;%(AdditionalDependencies) -- $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) -+ %(AdditionalDependencies) -+ %(AdditionalLibraryDirectories) - - - -@@ -34,11 +32,5 @@ - - $(GtkMMBuildDefs) - -- -- $(CPPDepLibsRelease) -- -- -- $(CPPDepLibsDebug) -- - -- -+ -\ No newline at end of file -diff --git a/MSVC_Net2013/gtkmm-version-paths.props b/MSVC_Net2013/gtkmm-version-paths.props -index f0c2834..968562a 100644 ---- a/MSVC_Net2013/gtkmm-version-paths.props -+++ b/MSVC_Net2013/gtkmm-version-paths.props -@@ -2,13 +2,9 @@ - - - 12 -- $(SolutionDir)\..\..\vs$(VSVer)\$(Platform) -- $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\ - 3 - 0 -- -vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion) -- -vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion) - - - <_PropertySheetDisplayName>glibmmversionpathsprops -@@ -17,12 +13,6 @@ - - $(VSVer) - -- -- $(GlibEtcInstallRoot) -- -- -- $(CopyDir) -- - - $(DefDir) - -@@ -32,11 +22,5 @@ - - $(ApiMinorVersion) - -- -- $(ReleaseDllSuffix) -- -- -- $(DebugDllSuffix) -- - - -\ No newline at end of file -diff --git a/MSVC_Net2013/gtkmm.vcxproj b/MSVC_Net2013/gtkmm.vcxproj -index 8093886..ec56ed1 100644 ---- a/MSVC_Net2013/gtkmm.vcxproj -+++ b/MSVC_Net2013/gtkmm.vcxproj -@@ -80,7 +80,7 @@ - %(AdditionalOptions) - Disabled - .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) -- _DEBUG;$(GtkMMBuildDefs);%(PreprocessorDefinitions) -+ _DEBUG;_NO_CRT_STDIO_INLINE;$(GtkMMBuildDefs);_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -95,7 +95,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- atkmm-vc$(VSVer)0-d-1_6.lib;$(CPPDepLibsDebug);%(AdditionalDependencies) -+ legacy_stdio_definitions.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)$(DebugDllSuffix).dll - $(IntDir)\$(ProjectName).def - true -@@ -108,7 +108,7 @@ - - %(AdditionalOptions) - .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) -- $(GtkMMBuildDefs);%(PreprocessorDefinitions) -+ $(GtkMMBuildDefs);_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -121,7 +121,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- atkmm-vc$(VSVer)0-1_6.lib;$(CPPDepLibsRelease);%(AdditionalDependencies) -+ legacy_stdio_definitions.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll - $(IntDir)\$(ProjectName).def - false -@@ -139,7 +139,7 @@ - %(AdditionalOptions) - Disabled - .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) -- _DEBUG;$(GtkMMBuildDefs);%(PreprocessorDefinitions) -+ _DEBUG;_NO_CRT_STDIO_INLINE;$(GtkMMBuildDefs);) - true - EnableFastChecks - MultiThreadedDebugDLL -@@ -154,7 +154,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- atkmm-vc$(VSVer)0-d-1_6.lib;$(CPPDepLibsDebug);%(AdditionalDependencies) -+ legacy_stdio_definitions.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)$(DebugDllSuffix).dll - $(IntDir)\$(ProjectName).def - true -@@ -171,7 +171,7 @@ - - %(AdditionalOptions) - .\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories) -- $(GtkMMBuildDefs);%(PreprocessorDefinitions) -+ $(GtkMMBuildDefs);_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - -@@ -184,7 +184,7 @@ - $(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj - - -- atkmm-vc$(VSVer)0-1_6.lib;$(CPPDepLibsRelease);%(AdditionalDependencies) -+ legacy_stdio_definitions.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll - $(IntDir)\$(ProjectName).def - true -@@ -697,4 +697,4 @@ - - - -- -+ -\ No newline at end of file -diff --git a/MSVC_Net2013/gtkmm.vcxproj.filters b/MSVC_Net2013/gtkmm.vcxproj.filters -index 5237502..5e8bd36 100644 ---- a/MSVC_Net2013/gtkmm.vcxproj.filters -+++ b/MSVC_Net2013/gtkmm.vcxproj.filters -@@ -14,496 +14,1459 @@ - - - -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Header Files -- Header Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Header Files -- Header Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -- Source Files -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ - - -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Source Files -- Source Files -- Source Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Source Files -- Source Files -- Source Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -- Header Files -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Source Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ -+ -+ Header Files -+ - - - - Resource Files - - -- -+ -\ No newline at end of file diff --git a/ports/gtkmm/fix_treeviewcolumn.patch b/ports/gtkmm/fix_treeviewcolumn.patch deleted file mode 100644 index 8daf91afbd00a9..00000000000000 --- a/ports/gtkmm/fix_treeviewcolumn.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/gtk/gtkmm/treeviewcolumn.h b/gtk/gtkmm/treeviewcolumn.h -index f2a77c1..c66302a 100644 ---- a/gtk/gtkmm/treeviewcolumn.h -+++ b/gtk/gtkmm/treeviewcolumn.h -@@ -1026,9 +1026,7 @@ void TreeViewColumn::pack_end(const TreeModelColumn& column, - template inline - TreeViewColumn::TreeViewColumn(const Glib::ustring& title, - const TreeModelColumn& column) --: -- Glib::ObjectBase(nullptr), // not (yet) a custom class -- Gtk::Object(Glib::ConstructParams(class_init_(), "title", title.c_str(), nullptr)) -+: TreeViewColumn (title) - { - pack_start(column, true /* expand */); - } diff --git a/ports/gtkmm/msvc_recommended_pragmas.h b/ports/gtkmm/msvc_recommended_pragmas.h deleted file mode 100644 index c0eb1d5edf4cd5..00000000000000 --- a/ports/gtkmm/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/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 96add947bab078..73d8539c2a184e 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -2,96 +2,52 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "Error: UWP builds are currently not supported.") endif() -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz" - FILENAME "gtkmm-3.22.2.tar.xz" - SHA512 6e96b543e459481145ee0f56f31a7ad2466bd8ccdd2abf3205998aecede73d235149ca6e5ba6e8d20a4fd5345e310870d81ac2a716d4f78d1460ed685badbdc2 + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.0/gtkmm-4.0.0.tar.xz" + FILENAME "gtkmm-4.0.0.tar.xz" + SHA512 16893b6caa39f1b65a4140296d8d25c0d5e5f8a6ab808086783e7222bc1f5e8b94d17d48e4b718a12f0e0291010d445f4da9f88b7f494ec36adb22752d932743 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES - fix_properties.patch - fix_treeviewcolumn.patch + PATCHES build.patch ) -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) +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/gtkmm.sln - TARGET gtkmm - PLATFORM ${VS_PLATFORM} - USE_VCPKG_INTEGRATION +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dmsvc14x-parallel-installable=false + -Dbuild-tests=false + -Dbuild-demos=false + ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) -# Handle headers -file(COPY ${SOURCE_PATH}/MSVC_Net2013/gdkmm/gdkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/gdk/gdkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file( - COPY - ${SOURCE_PATH}/gdk/gdkmm - DESTINATION ${CURRENT_PACKAGES_DIR}/include - FILES_MATCHING PATTERN *.h -) -file(COPY ${SOURCE_PATH}/MSVC_Net2013/gtkmm/gtkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/gtk/gtkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file( - COPY - ${SOURCE_PATH}/gtk/gtkmm - DESTINATION ${CURRENT_PACKAGES_DIR}/include - FILES_MATCHING PATTERN *.h -) - -# Handle libraries -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/gdkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/gdkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/gtkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/gtkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/gdkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/gdkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/gtkmm.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin -) -file( - COPY - ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/gtkmm.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib -) +vcpkg_install_meson() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtkmm RENAME copyright) +vcpkg_fixup_pkgconfig() + + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gtkmm" RENAME copyright) + + +# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], + # value: 'if-git-build', description: 'Generate source code from .hg and .ccg files') +# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'min', + # description: 'Compiler warning level') +# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'fatal', + # description: 'Compiler warning level when a tarball is created') +# option('build-deprecated-api', type: 'boolean', value: true, + # description: 'Build deprecated API and include it in the library') +# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], + # value: 'if-maintainer-mode', description: 'Build and install the documentation') +# option('build-demos', type: 'boolean', value: true, description: 'Build demo programs') +# option('build-tests', type: 'boolean', value: true, description: 'Build test programs') +# option('msvc14x-parallel-installable', type: 'boolean', value: true, + # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') From 2e2337f10425bc7711b8c385259fe860f586f75a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 19:08:14 +0100 Subject: [PATCH 093/182] remove double whitespaces --- scripts/cmake/vcpkg_configure_meson.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 2d5fe7df642f80..c0cdde578efb6e 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -101,7 +101,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso set(LIBPATH_${_config} "'${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CFLAGS_${_config} "${LIBPATH_${_config}}") @@ -109,7 +109,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CXXFLAGS_${_config} "${LIBPATH_${_config}}") @@ -291,14 +291,14 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") list(APPEND MESON_CFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") list(APPEND MESON_CXXFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") From c7e0834824c07eb50cd405c2ad89e9f32c2e3639 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 21:13:25 +0100 Subject: [PATCH 094/182] gtk baseline gtk dependency on cairo x11 remove double spaces in flags --- ports/gtk/CONTROL | 2 +- scripts/ci.baseline.txt | 2 -- scripts/cmake/vcpkg_configure_meson.cmake | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL index 9677acb9f03725..f766038db90e7d 100644 --- a/ports/gtk/CONTROL +++ b/ports/gtk/CONTROL @@ -3,4 +3,4 @@ Version: 4.0.1 Port-Version: 0 Homepage: https://www.gtk.org/ Description: Portable library for creating graphical user interfaces. -Build-Depends: glib, atk, gdk-pixbuf, pango, cairo[gobject], libepoxy, gettext, graphene, sassc +Build-Depends: glib, atk, gdk-pixbuf, pango, cairo[core,gobject], cairo[core,x11] (linux), libepoxy, gettext, graphene, sassc diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9dd29de42b6c7a..b7bb39cf677b66 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -430,8 +430,6 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail -# https://github.com/microsoft/vcpkg/pull/11048 -gtk:x64-linux=fail guetzli:x64-osx=fail h3:arm64-windows=fail h3:arm-uwp=fail diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index c0cdde578efb6e..356a8e02d8bc5e 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -123,7 +123,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso else() set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") endif() - string(REGEX REPLACE "( |^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") @@ -311,7 +311,7 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson else() set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") endif() - string(REGEX REPLACE "( |^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") @@ -404,7 +404,7 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") else() - list(APPEND _vcm_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + list(APPEND _vcm_OPTIONS --cross-only) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _vcm_OPTIONS --default-library shared) From 21e3de337fd6630f51a15464e97aa53980d4ea1e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 23:52:51 +0100 Subject: [PATCH 095/182] fix linux build --- ports/gtk/link_fix_static.patch | 27 +++++++++++++++++++++++ ports/gtk/portfile.cmake | 14 +++++++++++- ports/gtkmm/portfile.cmake | 6 +++-- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 ports/gtk/link_fix_static.patch diff --git a/ports/gtk/link_fix_static.patch b/ports/gtk/link_fix_static.patch new file mode 100644 index 00000000000000..4e72a95cb1fde7 --- /dev/null +++ b/ports/gtk/link_fix_static.patch @@ -0,0 +1,27 @@ +diff --git a/gsk/meson.build b/gsk/meson.build +index 748f4738a..6d6247343 100644 +--- a/gsk/meson.build ++++ b/gsk/meson.build +@@ -165,6 +165,7 @@ gsk_deps = [ + pango_dep, + cairo_dep, + cairo_csi_dep, ++ lzo_dep, + pixbuf_dep, + libgdk_dep, + ] +diff --git a/meson.build b/meson.build +index 19c3fa942..cd57128b2 100644 +--- a/meson.build ++++ b/meson.build +@@ -451,7 +451,9 @@ cairo_csi_dep = dependency('cairo-script-interpreter', required: false) + if not cairo_csi_dep.found() + cairo_csi_dep = cc.find_library('cairo-script-interpreter', required: get_option('build-tests')) + endif +- ++if cairo_csi_dep.found() ++ lzo_dep = dependency('lzo2') ++endif + cdata.set('HAVE_CAIRO_SCRIPT_INTERPRETER', cairo_csi_dep.found()) + cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found()) + cdata.set('HAVE_PANGOFT', pangoft_dep.found()) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 011d3286b4c52e..294b8c5732bdcb 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES build.patch + link_fix_static.patch ) vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) @@ -85,10 +86,21 @@ vcpkg_fixup_pkgconfig() file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtk) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gtk/COPYING ${CURRENT_PACKAGES_DIR}/share/gtk/copyright) -vcpkg_copy_tools(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg gtk4-query-settings gtk4-update-icon-cache AUTO_CLEAN) +set(TOOL_NAMES gtk4-builder-tool + gtk4-encode-symbolic-svg + gtk4-query-settings + gtk4-update-icon-cache) +if(VCPKG_TARGET_IS_LINUX) + list(APPEND TOOL_NAMES gtk4-launch) +endif() + +vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() # GDK backends # option('x11-backend', diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 73d8539c2a184e..2c3099325ae752 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -14,8 +14,10 @@ vcpkg_extract_source_archive_ex( PATCHES build.patch ) -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") +endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 356a8e02d8bc5e..6cb0eea63426e3 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -249,7 +249,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ endforeach() string(APPEND CROSS "[properties]\n") - #string(APPEND CROSS "skip_sanity_check = true\n") + string(APPEND CROSS "[host_machine]\n") string(APPEND CROSS "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME) From ae7e8c83c3ebdebb5723f84b555f1f86c55d96e9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 19 Jan 2021 23:58:26 +0100 Subject: [PATCH 096/182] native none again --- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 6cb0eea63426e3..b5a3ac99bdda57 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -404,7 +404,7 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") else() - list(APPEND _vcm_OPTIONS --cross-only) + list(APPEND _vcm_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND _vcm_OPTIONS --default-library shared) From c183334920eef9609700e684229f30335e92676d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 00:19:16 +0100 Subject: [PATCH 097/182] cairo fix cairo-script.pc --- ports/cairo/portfile.cmake | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 0962303bc5d514..df859562ae4e03 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_install_make() # This deletes the previous build # vcpkg_install_make(SUBPATH /util/cairo-gobject) # endif() -vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -75,14 +75,22 @@ file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ vcpkg_copy_pdbs() -# This is required so that meson can find cairo since there is no *.pc file installed for cairo! -# file(WRITE "${CURRENT_PACKAGES_DIR}/share/cairo/cairo-config.cmake" -# " \ -# find_package(unofficial-cairo REQUIRED)\n \ -# add_library(cairo::cairo INTERFACE IMPORTED)\n \ -# target_link_libraries(cairo::cairo INTERFACE unofficial::cairo::cairo)\n \ -# if(TARGET unofficial::cairo::cairo-gobject)\n \ - # target_link_libraries(cairo::cairo INTERFACE unofficial::cairo::cairo-gobject)\n \ -# endif()\n \ -# set(cairo_FOUND TRUE)" -# ) +if(VCPKG_TARGET_IS_WINDOWS) + set(ZLINK "-lzlibd") +else() + set(ZLINK "-lz") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cairo-script.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Libs: -l${ZLINK}" "Requires.private: lzo2 zlib\nLibs: -L\${libdir} -lcairo-script-interpreter") + file(INSTALL "${_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/" RENAME cairo-script-interpreter.pc) #normally the *.pc file is named like the library +endif() +if(VCPKG_TARGET_IS_WINDOWS) + set(ZLINK "-lzlib") +endif() +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cairo-script.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "Libs: -l${ZLINK}" "Requires.private: lzo2 zlib\nLibs: -L\${libdir} -lcairo-script-interpreter") + file(INSTALL "${_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/" RENAME cairo-script-interpreter.pc) #normally the *.pc file is named like the library +endif() +vcpkg_fixup_pkgconfig() \ No newline at end of file From 1aedbcd1bd7e861740e3e3481f54badaba045004 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 10:58:26 +0100 Subject: [PATCH 098/182] comment out patch since the cairo changes should have fixed it. --- ports/gtk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 294b8c5732bdcb..44c4eea23fa237 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES build.patch - link_fix_static.patch + #link_fix_static.patch ) vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) From 1f4313010e66f3afa8a2a959f3117177e1fe981f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 11:33:53 +0100 Subject: [PATCH 099/182] disable wayland backend in GTK since CI is missing system packages --- ports/gtk/portfile.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 44c4eea23fa237..5b8beeb754323f 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -15,8 +15,13 @@ vcpkg_extract_source_archive_ex( ) vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) -vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be an PATH +vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/glib/") + +if(VCPKG_TARGET_IS_LINUX) + set(OPTIONS -Dwayland-backend=disabled) # CI missing at least wayland-protocols +endif() + vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS From 9888a02e8f8633bec92bbb0ce22fca058b671532 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 13:47:48 +0100 Subject: [PATCH 100/182] silly typo in cairo pc file correction install lzo pc on windows --- ports/cairo/portfile.cmake | 4 ++-- ports/lzo/CONTROL | 3 ++- ports/lzo/always_install_pc.patch | 13 +++++++++++++ ports/lzo/portfile.cmake | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 ports/lzo/always_install_pc.patch diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index df859562ae4e03..84e8fe37fdb849 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -82,7 +82,7 @@ else() endif() set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cairo-script.pc") if(EXISTS "${_file}") - vcpkg_replace_string("${_file}" "Libs: -l${ZLINK}" "Requires.private: lzo2 zlib\nLibs: -L\${libdir} -lcairo-script-interpreter") + vcpkg_replace_string("${_file}" "Libs: ${ZLINK}" "Requires.private: lzo2 zlib\nLibs: -L\${libdir} -lcairo-script-interpreter") file(INSTALL "${_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/" RENAME cairo-script-interpreter.pc) #normally the *.pc file is named like the library endif() if(VCPKG_TARGET_IS_WINDOWS) @@ -90,7 +90,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cairo-script.pc") if(EXISTS "${_file}") - vcpkg_replace_string("${_file}" "Libs: -l${ZLINK}" "Requires.private: lzo2 zlib\nLibs: -L\${libdir} -lcairo-script-interpreter") + vcpkg_replace_string("${_file}" "Libs: ${ZLINK}" "Requires.private: lzo2 zlib\nLibs: -L\${libdir} -lcairo-script-interpreter") file(INSTALL "${_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/" RENAME cairo-script-interpreter.pc) #normally the *.pc file is named like the library endif() vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL index 4548ae9bb2a089..fa904083ab12a7 100644 --- a/ports/lzo/CONTROL +++ b/ports/lzo/CONTROL @@ -1,4 +1,5 @@ Source: lzo -Version: 2.10-5 +Version: 2.10 +Port-Version: 6 Homepage: https://www.oberhumer.com/opensource/lzo/ Description: Lossless data compression library diff --git a/ports/lzo/always_install_pc.patch b/ports/lzo/always_install_pc.patch new file mode 100644 index 00000000000000..6750eb681b7826 --- /dev/null +++ b/ports/lzo/always_install_pc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98c0a1ad0..85690209c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ if(1) + install(TARGETS ${f} DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/lzo/examples") + endif() + +-if(PKG_CONFIG_FOUND) ++if(1) + configure_file(lzo2.pc.cmakein lzo2.pc @ONLY) + #if(EXISTS "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lzo2.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake index 7c09aaf0c504f3..514c8555a490fa 100644 --- a/ports/lzo/portfile.cmake +++ b/ports/lzo/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES always_install_pc.patch ) set(LZO_STATIC OFF) @@ -26,6 +27,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) From ea7474027604bd24fca5ea90c452ef638b751ae9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 17:33:43 +0100 Subject: [PATCH 101/182] remove double spaces in _FLAGS remove unnecessary comments --- scripts/cmake/vcpkg_configure_meson.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 2d5fe7df642f80..b5a3ac99bdda57 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -101,7 +101,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso set(LIBPATH_${_config} "'${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CFLAGS_${_config} "${LIBPATH_${_config}}") @@ -109,7 +109,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CXXFLAGS_${_config} "${LIBPATH_${_config}}") @@ -123,7 +123,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso else() set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") endif() - string(REGEX REPLACE "( |^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") @@ -249,7 +249,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ endforeach() string(APPEND CROSS "[properties]\n") - #string(APPEND CROSS "skip_sanity_check = true\n") + string(APPEND CROSS "[host_machine]\n") string(APPEND CROSS "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME) @@ -291,14 +291,14 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") list(APPEND MESON_CFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( |^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") list(APPEND MESON_CXXFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") @@ -311,7 +311,7 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson else() set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") endif() - string(REGEX REPLACE "( |^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") From bc243790feb218d837edc7ecb51e9b639d494468 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 21:33:34 +0100 Subject: [PATCH 102/182] actually disabling wayland backend --- ports/gtk/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 5b8beeb754323f..7b377d2db0bdf9 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -19,12 +19,13 @@ vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so i vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/glib/") if(VCPKG_TARGET_IS_LINUX) - set(OPTIONS -Dwayland-backend=disabled) # CI missing at least wayland-protocols + set(OPTIONS -Dwayland-backend=false) # CI missing at least wayland-protocols endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS + ${OPTIONS} -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false From 24c28958554d72af477c2be93d3d1ac992319ee9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 20 Jan 2021 23:13:59 +0100 Subject: [PATCH 103/182] fix glib codegen issue having the wrong path --- ports/glib/portfile.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index cfaadb1ac16089..5dbacdb58528c9 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -108,4 +108,10 @@ vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - +# Fix python scripts +set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") +file(READ "${_file}" _contents) +string(REPLACE "elif os.path.basename(filedir) == 'bin':" "elif os.path.basename(filedir) == 'tools/glib':" _contents "${_contents}") +string(REPLACE "path = os.path.join(filedir, '..', 'share', 'glib-2.0')" "path = os.path.join(filedir, '../..', 'share', 'glib-2.0')" _contents "${_contents}") +string(REPLACE "path = os.path.join('${CURRENT_PACKAGES_DIR}/share', 'glib-2.0')" "path = os.path.join('unuseable/share', 'glib-2.0')" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") \ No newline at end of file From a6b1b65b04505c48bba1c803c08d98b6a3804850 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 08:07:50 +0100 Subject: [PATCH 104/182] try to fix paths in glib codegen --- ports/glib/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 5dbacdb58528c9..229c7608f7aa08 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -111,7 +111,9 @@ file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ # Fix python scripts set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") file(READ "${_file}" _contents) -string(REPLACE "elif os.path.basename(filedir) == 'bin':" "elif os.path.basename(filedir) == 'tools/glib':" _contents "${_contents}") +string(REPLACE "elif os.path.basename(filedir) == 'bin':" "elif os.path.basename(filedir) == 'tools':" _contents "${_contents}") string(REPLACE "path = os.path.join(filedir, '..', 'share', 'glib-2.0')" "path = os.path.join(filedir, '../..', 'share', 'glib-2.0')" _contents "${_contents}") +string(REPLACE "path = os.path.join(filedir, '..')" "path = os.path.join(filedir, '../../share/glib-2.0')" _contents "${_contents}") string(REPLACE "path = os.path.join('${CURRENT_PACKAGES_DIR}/share', 'glib-2.0')" "path = os.path.join('unuseable/share', 'glib-2.0')" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") \ No newline at end of file From d83bf17c3f6186a8ecccdddb9f87a516ec18afcf Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 16:23:00 +0100 Subject: [PATCH 105/182] integrate changes form #12860 --- ports/harfbuzz/0002-fix-uwp-build.patch | 15 --- ports/harfbuzz/0003-remove-broken-test.patch | 26 ----- ports/harfbuzz/CMakeLists.patch | 74 ------------- ports/harfbuzz/CONTROL | 4 +- ports/harfbuzz/harfbuzzConfig.cmake.in | 46 ++++++++ ports/harfbuzz/portfile.cmake | 104 +++++++++---------- ports/pango/CONTROL | 2 +- 7 files changed, 98 insertions(+), 173 deletions(-) delete mode 100644 ports/harfbuzz/0002-fix-uwp-build.patch delete mode 100644 ports/harfbuzz/0003-remove-broken-test.patch delete mode 100644 ports/harfbuzz/CMakeLists.patch create mode 100644 ports/harfbuzz/harfbuzzConfig.cmake.in diff --git a/ports/harfbuzz/0002-fix-uwp-build.patch b/ports/harfbuzz/0002-fix-uwp-build.patch deleted file mode 100644 index beb5ce750e405a..00000000000000 --- a/ports/harfbuzz/0002-fix-uwp-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/hb-ft.cc b/src/hb-ft.cc -index 1900f30..add9917 100644 ---- a/src/hb-ft.cc -+++ b/src/hb-ft.cc -@@ -31,6 +31,10 @@ - - #include "hb-ft.h" - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+#define generic GenericFromFreeTypeLibrary -+#endif -+ - #include "hb-font.hh" - #include "hb-machinery.hh" - #include "hb-cache.hh" diff --git a/ports/harfbuzz/0003-remove-broken-test.patch b/ports/harfbuzz/0003-remove-broken-test.patch deleted file mode 100644 index 2a3b234eed27dd..00000000000000 --- a/ports/harfbuzz/0003-remove-broken-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc -index 85993d1..3e8e642 100644 ---- a/src/hb-coretext.cc -+++ b/src/hb-coretext.cc -@@ -1059,21 +1059,6 @@ resize_and_retry: - buffer->len += num_glyphs; - } - -- /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, -- * or if it does, it doesn't respect it. So we get runs with wrong -- * directions. As such, disable the assert... It wouldn't crash, but -- * cursoring will be off... -- * -- * https://crbug.com/419769 -- */ -- if (false) -- { -- /* Make sure all runs had the expected direction. */ -- HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); -- assert (bool (status_and & kCTRunStatusRightToLeft) == backward); -- assert (bool (status_or & kCTRunStatusRightToLeft) == backward); -- } -- - buffer->clear_positions (); - - unsigned int count = buffer->len; diff --git a/ports/harfbuzz/CMakeLists.patch b/ports/harfbuzz/CMakeLists.patch deleted file mode 100644 index 05d4b069ec067e..00000000000000 --- a/ports/harfbuzz/CMakeLists.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11118595f..257e7c85e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8.0) -+cmake_minimum_required(VERSION 3.7.0) # lets incerease that to something more appropiate - project(harfbuzz) - - message(WARN "HarfBuzz has a Meson port and tries to migrate all the other build systems to it, please consider using it as we might remove our cmake port soon.") -@@ -177,7 +177,7 @@ set (subset_project_headers ${HB_SUBSET_headers}) - - ## Find and include needed header folders and libraries - if (HB_HAVE_FREETYPE) -- include (FindFreetype) -+ find_package(Freetype REQUIRED) - if (NOT FREETYPE_FOUND) - message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") - endif () -@@ -210,6 +210,8 @@ if (HB_HAVE_GRAPHITE2) - mark_as_advanced(GRAPHITE2_INCLUDE_DIR GRAPHITE2_LIBRARY) - endif () - -+include(SelectLibraryConfigurations) -+ - if (HB_HAVE_GLIB) - add_definitions(-DHAVE_GLIB) - -@@ -217,7 +219,11 @@ if (HB_HAVE_GLIB) - find_package(PkgConfig) - pkg_check_modules(PC_GLIB QUIET glib-2.0) -+ find_package(Iconv REQUIRED) - -- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) -+ find_library(GLIB_LIBRARY_RELEASE NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS} ${PC_GLIB_LIBDIR}/.. ${PC_GLIB_LIBRARY_DIRS}/..) -+ find_library(GLIB_LIBRARY_DEBUG NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR}/debug ${PC_GLIB_LIBRARY_DIRS}/debug ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) -+ select_library_configurations(GLIB) -+ list(APPEND GLIB_LIBRARIES ${Iconv_LIBRARIES}) - find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) - find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) - -@@ -233,20 +237,15 @@ endif () - if (HB_HAVE_ICU) - add_definitions(-DHAVE_ICU) - -- # https://github.com/WebKit/webkit/blob/fdd7733f2f30eab7fe096a9791f98c60f62f49c0/Source/cmake/FindICU.cmake -- find_package(PkgConfig) -- pkg_check_modules(PC_ICU QUIET icu-uc) -- -- find_path(ICU_INCLUDE_DIR NAMES unicode/utypes.h HINTS ${PC_ICU_INCLUDE_DIRS} ${PC_ICU_INCLUDEDIR}) -- find_library(ICU_LIBRARY NAMES libicuuc cygicuuc cygicuuc32 icuuc HINTS ${PC_ICU_LIBRARY_DIRS} ${PC_ICU_LIBDIR}) -+ find_package(ICU COMPONENTS uc REQUIRED) - -- include_directories(${ICU_INCLUDE_DIR}) -+ include_directories(${ICU_INCLUDE_DIRS}) - - list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-icu.h) - -- list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARY}) -+ list(APPEND THIRD_PARTY_LIBS ${ICU_LIBRARIES}) - -- mark_as_advanced(ICU_INCLUDE_DIR ICU_LIBRARY) -+ mark_as_advanced(ICU_INCLUDE_DIRS ICU_LIBRARIES ) - endif () - - if (APPLE AND HB_HAVE_CORETEXT) -@@ -431,6 +431,7 @@ endif () - - ## Define harfbuzz library - add_library(harfbuzz ${project_sources} ${project_extra_sources} ${project_headers}) -+target_include_directories(harfbuzz PUBLIC $) - target_link_libraries(harfbuzz ${THIRD_PARTY_LIBS}) - - diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 317649ba8b5459..d886ac78ff786f 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -2,8 +2,8 @@ Source: harfbuzz Version: 2.7.4 Port-Version: 1 Description: HarfBuzz OpenType text shaping engine -Homepage: https://github.com/behdad/harfbuzz -Build-Depends: freetype[core], ragel, gettext (osx) +Homepage: https://github.com/harfbuzz/harfbuzz +Build-Depends: freetype[core], gettext (osx) Feature: graphite2 Build-Depends: graphite2 diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in new file mode 100644 index 00000000000000..1b8da8f7d452a8 --- /dev/null +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -0,0 +1,46 @@ +if(TARGET harfbuzz OR TARGET harfbuzz::harfbuzz) + return() +endif() + +add_library(harfbuzz INTERFACE IMPORTED GLOBAL) +add_library(harfbuzz::harfbuzz ALIAS harfbuzz) + +find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(HARFBUZZ_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${HARFBUZZ_LIBRARY_DEBUG}>) +endif() + +find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(HARFBUZZ_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) +endif() + +set(HARFBUZZ_FEATURES @FEATURES@) + +if(APPLE) + find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices) + target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) +endif() + +find_package(freetype CONFIG REQUIRED) +target_link_libraries(harfbuzz INTERFACE freetype) + +if ("graphite2" IN_LIST HARFBUZZ_FEATURES) + find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GRAPHITE2_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE $<$:${GRAPHITE2_LIBRARY_DEBUG}>) + endif() + + find_library(GRAPHITE2_LIBRARY_RELEASE NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(GRAPHITE2_LIBRARY_RELEASE) + target_link_libraries(harfbuzz INTERFACE $<$>:${GRAPHITE2_LIBRARY_RELEASE}>) + endif() +endif() + +if ("icu" IN_LIST HARFBUZZ_FEATURES) + find_package(ICU 61 COMPONENTS uc REQUIRED) + target_link_libraries(harfbuzz INTERFACE ICU::uc) +endif() + +get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) +target_include_directories(harfbuzz INTERFACE ${_INSTALL_DIR}/include/harfbuzz) \ No newline at end of file diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index e0edf88a2426b8..db715d05cbf571 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -4,75 +4,69 @@ vcpkg_from_github( REF 7236c7e29cef1c2d76c7a284c5081ff4d3aa1127 # 2.7.4 SHA512 d231a788ea4e52231d4c363c1eca76424cb82ed0952b5c24d0b082e88b3dddbda967e7fffe67fffdcb22c7ebfbf0ec923365eb4532be772f2e61fa7d29b51998 HEAD_REF master - PATCHES - 0002-fix-uwp-build.patch - 0003-remove-broken-test.patch - CMakeLists.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - icu HB_HAVE_ICU - graphite2 HB_HAVE_GRAPHITE2 - glib HB_HAVE_GLIB -) +if("icu" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dicu=enabled) +else() + list(APPEND FEATURE_OPTIONS -Dicu=disabled) +endif() +if("graphite2" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dgraphite=enabled) +else() + list(APPEND FEATURE_OPTIONS -Dgraphite=disabled) +endif() +if("glib" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dglib=enabled) + list(APPEND FEATURE_OPTIONS -Dgobject=enabled) +else() + list(APPEND FEATURE_OPTIONS -Dglib=disabled) + list(APPEND FEATURE_OPTIONS -Dgobject=disabled) +endif() +list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS -DHP_HAVE_GDI=ON) + list(APPEND FEATURE_OPTIONS -Dgdi=enabled) +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) endif() -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( + +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DHB_HAVE_FREETYPE=ON - -DHB_BUILD_TESTS=OFF - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - OPTIONS_DEBUG - -DSKIP_INSTALL_HEADERS=ON + -Dcairo=disabled + -Dfontconfig=disabled + -Dintrospection=disabled + -Ddocs=disabled + -Dtests=disabled + -Dbenchmark=disabled + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' ) -vcpkg_install_cmake() - -# if("icu" IN_LIST FEATURES) - # list(APPEND FEATURE_OPTIONS -Dicu=enabled) -# else() - # list(APPEND FEATURE_OPTIONS -Dicu=disabled) -# endif() -# if("graphite2" IN_LIST FEATURES) - # list(APPEND FEATURE_OPTIONS -Dgraphite=enabled) -# else() - # list(APPEND FEATURE_OPTIONS -Dgraphite=disabled) -# endif() -# if("glib" IN_LIST FEATURES) - # list(APPEND FEATURE_OPTIONS -Dglib=enabled) - # list(APPEND FEATURE_OPTIONS -Dgobject=enabled) -# else() - # list(APPEND FEATURE_OPTIONS -Dglib=disabled) - # list(APPEND FEATURE_OPTIONS -Dgobject=disabled) -# endif() -# list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) -# if(VCPKG_TARGET_IS_WINDOWS) - # list(APPEND FEATURE_OPTIONS -Dgdi=enabled) -# endif() -# vcpkg_configure_meson( - # SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA - # OPTIONS ${FEATURE_OPTIONS} - # -Dtests=disabled - # -Dintrospection=disabled - # -Ddocs=disabled - # -Dbenchmark=disabled - # -Dfontconfig=disabled -# ) -# vcpkg_install_meson() -vcpkg_fixup_pkgconfig() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_install_meson() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") +configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/harfbuzzConfig.cmake" @ONLY) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +if("glib" IN_LIST FEATURES) + list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure) +endif() +if(TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() # # HarfBuzz feature options # option('glib', type: 'feature', value: 'auto', # description: 'Enable GLib unicode functions') diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index b93c9eab6a5f53..0a786365eb1ed2 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -3,4 +3,4 @@ Version: 1.48.0 Port-Version: 0 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. -Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx), fribidi +Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz, fribidi From 40dbe865c7d42713b40ec20f20661aeef11ae455 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 20:17:14 +0100 Subject: [PATCH 106/182] add the uwp patch back in --- ports/harfbuzz/0002-fix-uwp-build.patch | 15 +++++++++++++++ ports/harfbuzz/portfile.cmake | 1 + 2 files changed, 16 insertions(+) create mode 100644 ports/harfbuzz/0002-fix-uwp-build.patch diff --git a/ports/harfbuzz/0002-fix-uwp-build.patch b/ports/harfbuzz/0002-fix-uwp-build.patch new file mode 100644 index 00000000000000..beb5ce750e405a --- /dev/null +++ b/ports/harfbuzz/0002-fix-uwp-build.patch @@ -0,0 +1,15 @@ +diff --git a/src/hb-ft.cc b/src/hb-ft.cc +index 1900f30..add9917 100644 +--- a/src/hb-ft.cc ++++ b/src/hb-ft.cc +@@ -31,6 +31,10 @@ + + #include "hb-ft.h" + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#define generic GenericFromFreeTypeLibrary ++#endif ++ + #include "hb-font.hh" + #include "hb-machinery.hh" + #include "hb-cache.hh" diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index db715d05cbf571..ec499a272fbb37 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF 7236c7e29cef1c2d76c7a284c5081ff4d3aa1127 # 2.7.4 SHA512 d231a788ea4e52231d4c363c1eca76424cb82ed0952b5c24d0b082e88b3dddbda967e7fffe67fffdcb22c7ebfbf0ec923365eb4532be772f2e61fa7d29b51998 HEAD_REF master + PATCHES 0002-fix-uwp-build.patch ) if("icu" IN_LIST FEATURES) From 03f9adb04d5ab32095bf98d17392524da73739b0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 20:32:58 +0100 Subject: [PATCH 107/182] deactivate extra harfbuzz shapers. --- ports/harfbuzz/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index ec499a272fbb37..2e64bdba8fcecf 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -25,11 +25,11 @@ else() list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS -Dgdi=enabled) -elseif(VCPKG_TARGET_IS_OSX) - list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) -endif() +#if(VCPKG_TARGET_IS_WINDOWS) +# list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # This breaks qt5-base:x64-windows-static due to missing libraries being link against. +#elseif(VCPKG_TARGET_IS_OSX) +# list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) +#endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} From fbfb5a8a6c61618758b52b18e8c90ab77db97c60 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 21:44:36 +0100 Subject: [PATCH 108/182] vcpkg x-add-version --all --overwrite-version --- versions/baseline.json | 40 +++++++++++++++++------------------ versions/c-/cairo.json | 2 +- versions/c-/cairomm.json | 5 +++++ versions/c-/cartographer.json | 5 +++++ versions/g-/gdk-pixbuf.json | 5 +++++ versions/g-/glib.json | 2 +- versions/g-/gtk.json | 5 +++++ versions/g-/gtkmm.json | 5 +++++ versions/h-/harfbuzz.json | 2 +- versions/i-/io2d.json | 5 +++++ versions/l-/lcm.json | 2 +- versions/l-/librsvg.json | 2 +- versions/l-/lzo.json | 5 +++++ versions/p-/pango.json | 5 +++++ versions/p-/pangomm.json | 5 +++++ versions/p-/pixman.json | 5 +++++ versions/t-/tesseract.json | 2 +- versions/t-/tiff.json | 5 +++++ 18 files changed, 81 insertions(+), 26 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6f198868b8c4e5..bf3e2524950b07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1045,8 +1045,8 @@ "port-version": 9 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 6 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1061,8 +1061,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -2077,8 +2077,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9", - "port-version": 8 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2281,12 +2281,12 @@ "port-version": 3 }, "gtk": { - "baseline": "3.22.19", - "port-version": 5 + "baseline": "4.0.1", + "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { "baseline": "0.7.6", @@ -2526,7 +2526,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -3589,8 +3589,8 @@ "port-version": 0 }, "lzo": { - "baseline": "2.10-5", - "port-version": 0 + "baseline": "2.10", + "port-version": 6 }, "lzokay": { "baseline": "2020-07-30", @@ -4393,16 +4393,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 11 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4517,8 +4517,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -5698,7 +5698,7 @@ }, "tiff": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 92dabe35d39341..e32575d0aedb6f 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "80969d5edb94c0438a56ee1d1668bea736d04655", + "git-tree": "db727462c040d7790f1e070af6878bbab3320fbe", "version-string": "1.16.0", "port-version": 9 }, diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 386779509ea098..427dc54e774921 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abe2c108111f594d51d09b16ef635ebfd6bf536d", + "version-string": "1.16.0", + "port-version": 0 + }, { "git-tree": "920d887aa5c35b9d689bba35c8bfdd8bbf8f0553", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index 71eb9875c12507..a3b9781306c18e 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8549e99573872d6850115f193c007b14a82dc030", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 2a61770197ba9c..b869ead8e6b8f8 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7276a3574cb547a27b964d17ebeb4bafa67152af", + "version-string": "2.42.2", + "port-version": 0 + }, { "git-tree": "59fe81bc77c0b43e3fbf6c6746cf8fe3e6ffe3de", "version-string": "2.36.9", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 65b12610c67460..f72325c5709d10 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a23636f1e88189934404d411e1934b697039bb3b", + "git-tree": "a975e4fd5215808d45be26b3479e314e385608b5", "version-string": "2.66.4", "port-version": 0 }, diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 44a628e39b2efd..d4e74db54766dc 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ca10958dc4c69b8a7dca3c7054b4b16329cb214", + "version-string": "4.0.1", + "port-version": 0 + }, { "git-tree": "24a30d94c1b17c18e69e6d491c364a58ceb39bf9", "version-string": "3.22.19", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 3b53b748c7077b..c777b75cd691c6 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ded62b63709a99df68db9cfebe15acf771f94cd", + "version-string": "4.0.0", + "port-version": 0 + }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 3f64480a7795cb..02d52d485a6bf4 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6bb44c602836a5aa8c83769195c3b92ff0e65e00", + "git-tree": "f2024e9bc9b0aa574715280ab30974b38ef61650", "version-string": "2.7.4", "port-version": 1 }, diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index dd9370afdbb5b8..7a5ad2e24d6536 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94959e392a3bbd476470bf973eaee57c782a6d77", + "version-string": "2020-09-14", + "port-version": 2 + }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index f4aa48345ee022..aa81f03ac60220 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6a65fd21d5b6621edf09027c51519bf46e9fb68d", + "git-tree": "4ecdb51b741d376b0ebd4fb637bd18fa8d39e264", "version-string": "1.4.0", "port-version": 2 }, diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 1ddc6108ba079b..e602d10bf093fb 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "07dcfa5a1a2cdfe38604f2383b00c0dd6a3817be", + "git-tree": "c81c496bbb86a9191a85bd740af99747a1ba6590", "version-string": "2.40.20", "port-version": 3 }, diff --git a/versions/l-/lzo.json b/versions/l-/lzo.json index a85e5642402100..186064c9b27990 100644 --- a/versions/l-/lzo.json +++ b/versions/l-/lzo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0386bfc83656abde700f2f99732a92e7fd6ac756", + "version-string": "2.10", + "port-version": 6 + }, { "git-tree": "7d19bc8d305faffeba8990d9e6c095ee95b3108d", "version-string": "2.10-5", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index a48314c4a77c7f..17a2d831ede81e 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f052e0b81aa6c93f6ba2c023d0335df1953d48ad", + "version-string": "1.48.0", + "port-version": 0 + }, { "git-tree": "fa2d9e78ba235a56564304e7116375335df202e7", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 5bca77f4691273..0af63378f930f9 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7187eb27e948fd62ea103b6b036268982bfc76dc", + "version-string": "2.48.0", + "port-version": 0 + }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 6daee6513416f1..d5f3898064d76a 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6ba934f70a6699f15abba8cff50e0dab4c28030", + "version-string": "0.40.0", + "port-version": 0 + }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 6c8124580f28a6..255a089bcc9aab 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", + "git-tree": "c6c5b498a1ab6220b6251e487da969b480d9e9ca", "version-string": "4.1.1", "port-version": 6 }, diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 0a4bb5b3c50226..a62c66ed03e165 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ddb4d59d8bcb75cfabb0ba8a51d0334f4862fd3", + "version-string": "4.1.0", + "port-version": 1 + }, { "git-tree": "c2beac2991ae6df4dfeaf0a3b158092a78128214", "version-string": "4.1.0", From 79ec6640576e0bacfd9c4b5082bc3aa959205283 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 22:32:07 +0100 Subject: [PATCH 109/182] remove patches in tesseract. --- ports/tesseract/CONTROL | 2 +- ports/tesseract/fix-text2image.patch | 105 ----------------------- ports/tesseract/fix-training-tools.patch | 40 --------- ports/tesseract/portfile.cmake | 2 - 4 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 ports/tesseract/fix-text2image.patch delete mode 100644 ports/tesseract/fix-training-tools.patch diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 021496d324392a..b43581f6bc0aae 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,6 +1,6 @@ Source: tesseract Version: 4.1.1 -Port-Version: 6 +Port-Version: 7 Homepage: https://github.com/tesseract-ocr/tesseract Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. Build-Depends: leptonica, libarchive diff --git a/ports/tesseract/fix-text2image.patch b/ports/tesseract/fix-text2image.patch deleted file mode 100644 index e9623f4ac9645d..00000000000000 --- a/ports/tesseract/fix-text2image.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt -index 8fd96a9..186341e 100644 ---- a/src/training/CMakeLists.txt -+++ b/src/training/CMakeLists.txt -@@ -52,7 +52,7 @@ endif() - # experimental - - if (NOT CPPAN_BUILD AND NOT SW_BUILD) -- find_package(ICU 52.1 COMPONENTS uc i18n) -+ find_package(ICU 52.1 REQUIRED COMPONENTS i18n uc) - endif() - - ######################################## -@@ -187,6 +187,9 @@ set(unicharset_training_src - - ) - add_library (unicharset_training ${unicharset_training_src}) -+if(UNIX) -+ list(APPEND ICU_LIBRARIES ${CMAKE_DL_LIBS}) -+endif() - if (CPPAN_BUILD) - target_link_libraries (unicharset_training common_training pvt.cppan.demo.unicode.icu.i18n) - elseif (SW_BUILD) -@@ -253,16 +256,27 @@ if (NOT CPPAN_BUILD AND NOT SW_BUILD) - find_package(PkgConfig) - endif() - --if (PKG_CONFIG_FOUND OR CPPAN_BUILD OR SW_BUILD) -- --if (PKG_CONFIG_FOUND) --pkg_check_modules(Pango REQUIRED pango>=1.22.0) --pkg_check_modules(Cairo REQUIRED cairo) --pkg_check_modules(PangoFt2 REQUIRED pangoft2) --pkg_check_modules(PangoCairo REQUIRED pangocairo) --pkg_check_modules(FontConfig REQUIRED fontconfig) -+find_package(unofficial-cairo CONFIG REQUIRED) -+find_package(unofficial-glib CONFIG REQUIRED) -+find_package(Intl CONFIG REQUIRED) -+find_package(Fontconfig REQUIRED) -+find_package(Freetype REQUIRED) -+if(UNIX OR BUILD_SHARED_LIBS) -+ find_package(harfbuzz CONFIG REQUIRED) - endif() - -+find_library(Pango_LIBRARY_RELEASE NAMES pango-1.0) -+find_library(Pango_LIBRARY_DEBUG NAMES pango-1.0) -+select_library_configurations(Pango) -+ -+find_library(PangoFt2_LIBRARY_RELEASE NAMES pangoft2-1.0) -+find_library(PangoFt2_LIBRARY_DEBUG NAMES pangoft2-1.0) -+select_library_configurations(PangoFt2) -+ -+find_library(PangoCairo_LIBRARY_RELEASE NAMES pangocairo-1.0) -+find_library(PangoCairo_LIBRARY_DEBUG NAMES pangocairo-1.0) -+select_library_configurations(PangoCairo) -+ - set(text2image_src - text2image.cpp - boxchar.cpp -@@ -285,16 +299,34 @@ set(text2image_src - - add_executable (text2image ${text2image_src}) - target_link_libraries (text2image unicharset_training) --if (PKG_CONFIG_FOUND) -+ - target_include_directories (text2image BEFORE PRIVATE ${Cairo_INCLUDE_DIRS} ${Pango_INCLUDE_DIRS}) - target_compile_definitions (text2image PRIVATE -DPANGO_ENABLE_ENGINE) --target_link_libraries (text2image -+if(UNIX OR BUILD_SHARED_LIBS) -+ target_link_libraries (text2image -+ ${PangoCairo_LIBRARIES} -+ ${PangoFt2_LIBRARIES} - ${Pango_LIBRARIES} - ${Cairo_LIBRARIES} -+ harfbuzz::harfbuzz -+ Freetype::Freetype -+ unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject -+ unofficial::cairo::cairo unofficial::cairo::cairo-gobject -+ ${Intl_LIBRARIES} -+ Fontconfig::Fontconfig -+) -+else() -+ target_link_libraries (text2image - ${PangoCairo_LIBRARIES} - ${PangoFt2_LIBRARIES} - ${FontConfig_LIBRARIES} --) -+ ${Pango_LIBRARIES} -+ Freetype::Freetype -+ unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject -+ unofficial::cairo::cairo unofficial::cairo::cairo-gobject -+ ${Intl_LIBRARIES} -+ Fontconfig::Fontconfig -+ ) - endif() - if (CPPAN_BUILD) - target_link_libraries (text2image pvt.cppan.demo.gnome.pango.pangocairo) -@@ -302,7 +334,6 @@ endif() - project_group (text2image "Training Tools") - install (TARGETS text2image RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - --endif() - endif(ICU_FOUND) - - ############################################################################### diff --git a/ports/tesseract/fix-training-tools.patch b/ports/tesseract/fix-training-tools.patch deleted file mode 100644 index fd5729cb8b1e7e..00000000000000 --- a/ports/tesseract/fix-training-tools.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt -index af291a5..f2e2ceb 100644 ---- a/src/training/CMakeLists.txt -+++ b/src/training/CMakeLists.txt -@@ -63,7 +63,7 @@ endif() - # LIBRARY tessopt - ######################################## - --add_library (tessopt tessopt.cpp tessopt.h) -+add_library (tessopt STATIC tessopt.cpp tessopt.h) - project_group (tessopt "Training Tools") - - -@@ -81,7 +81,7 @@ set(common_training_src - mastertrainer.cpp - mastertrainer.h - ) --add_library (common_training ${common_training_src}) -+add_library (common_training STATIC ${common_training_src}) - target_link_libraries (common_training libtesseract tessopt) - project_group (common_training "Training Tools") - -@@ -196,7 +196,7 @@ set(unicharset_training_src - validate_javanese.cpp validate_myanmar.cpp validator.cpp - - ) --add_library (unicharset_training ${unicharset_training_src}) -+add_library (unicharset_training STATIC ${unicharset_training_src}) - if(UNIX) - list(APPEND ICU_LIBRARIES ${CMAKE_DL_LIBS}) - endif() -@@ -270,7 +270,7 @@ endif() - - find_package(unofficial-cairo CONFIG REQUIRED) - find_package(unofficial-glib CONFIG REQUIRED) --find_package(Intl CONFIG REQUIRED) -+find_package(Intl REQUIRED) - find_package(Fontconfig REQUIRED) - find_package(Freetype REQUIRED) - if(UNIX OR BUILD_SHARED_LIBS) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 113fc20060fb51..b3b3708047e5eb 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -5,8 +5,6 @@ vcpkg_from_github( SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 PATCHES fix-tiff-linkage.patch - #fix-text2image.patch - #fix-training-tools.patch ) # The built-in cmake FindICU is better From 47fd08e84e2093d8b523e00e6af502be3ea37551 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 22:34:30 +0100 Subject: [PATCH 110/182] fix version --- versions/t-/tesseract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 255a089bcc9aab..6c8124580f28a6 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c6c5b498a1ab6220b6251e487da969b480d9e9ca", + "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", "version-string": "4.1.1", "port-version": 6 }, From 8c397d72b8a1be99b99589e5521d5077748e23e0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 22:35:04 +0100 Subject: [PATCH 111/182] rerun add-version --- versions/baseline.json | 2 +- versions/t-/tesseract.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index bf3e2524950b07..1b32a0b42e39b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5654,7 +5654,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 6 + "port-version": 7 }, "tfhe": { "baseline": "1.0.1-1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 6c8124580f28a6..4b41ef4c24255e 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "247f1ebd702d64169d78cb0ea936c4b8613940bd", + "version-string": "4.1.1", + "port-version": 7 + }, { "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", "version-string": "4.1.1", From b09c525ca889dc4111210d125ab103b10d55d1de Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 21 Jan 2021 23:46:46 +0100 Subject: [PATCH 112/182] add libgpod:x64-linux=fail to baseline due to missing system tools/libraries --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 834675abbc1472..73cd75e552ea4f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -562,6 +562,8 @@ libcopp:arm64-windows=fail libcopp:arm-uwp=fail libcrafter:x86-windows=fail libcrafter:x64-windows=fail +# Missing system libraries on linux to run/prepare autoconf +libgpod:x64-linux=fail cpuid:arm-uwp=fail cpuid:x64-uwp=fail cpuid:arm64-windows=fail From abaf085d0fc7fb7c35ff3bbf09f320c930398473 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 25 Jan 2021 11:49:12 +0100 Subject: [PATCH 113/182] change regex to take double - into account. --- scripts/cmake/vcpkg_configure_meson.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index b5a3ac99bdda57..4a4cfe6fbc0d10 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -36,6 +36,7 @@ This command supplies many common arguments to Meson. To see the full list, exam * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) #]===] + function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https://mesonbuild.com/Native-environments.html set(NATIVE "[binaries]\n") #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) @@ -101,7 +102,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso set(LIBPATH_${_config} "'${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CFLAGS_${_config} "${LIBPATH_${_config}}") @@ -109,7 +110,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CXXFLAGS_${_config} "${LIBPATH_${_config}}") @@ -123,7 +124,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso else() set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") endif() - string(REGEX REPLACE "( +|^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(--?|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") @@ -291,14 +292,14 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") list(APPEND MESON_CFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( +|^)(-|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") list(APPEND MESON_CXXFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") @@ -311,7 +312,7 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson else() set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") endif() - string(REGEX REPLACE "( +|^)(-|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(--?|/)" ";\\2" LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") list(TRANSFORM LINKER_FLAGS_${_config} APPEND "'") list(TRANSFORM LINKER_FLAGS_${_config} PREPEND "'") list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") From b5964849b829c87732528e9f22d613e934fcff83 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 25 Jan 2021 23:16:27 +0100 Subject: [PATCH 114/182] run x-add-version --- versions/baseline.json | 90 +++++++++++++++++++-------------------- versions/h-/harfbuzz.json | 5 +++ versions/p-/pango.json | 5 +++ 3 files changed, 55 insertions(+), 45 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index f898dce807d9eb..f4396453807723 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 1 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 1 }, "atlmfc": { "baseline": "0", @@ -1042,11 +1042,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 8 + "port-version": 9 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 5 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1061,8 +1061,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -1934,7 +1934,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2085,8 +2085,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2169,12 +2169,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 25 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2202,7 +2202,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2289,16 +2289,16 @@ "port-version": 3 }, "gtk": { - "baseline": "3.22.19-4", + "baseline": "4.0.1", "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2326,7 +2326,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 0 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", @@ -2418,7 +2418,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2534,7 +2534,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2790,7 +2790,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -2882,7 +2882,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -2982,7 +2982,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3150,7 +3150,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3218,7 +3218,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.11", @@ -3281,8 +3281,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 3 }, "librsync": { "baseline": "2020-09-16", @@ -3309,12 +3309,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.30", @@ -3477,8 +3477,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0", + "port-version": 1 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4409,16 +4409,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 11 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4533,8 +4533,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -5670,7 +5670,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 6 + "port-version": 7 }, "tfhe": { "baseline": "1.0.1-1", @@ -6002,7 +6002,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index b21931e21943bf..078f997aedee09 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cecd47613451f4fdd33bec09bd557a5b0c616f58", + "version-string": "2.7.4", + "port-version": 1 + }, { "git-tree": "bb9ea75cd35a35e57fb0bf79ff78818c95148fcf", "version-string": "2.7.4", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 45c690134486d1..130f42a9384e82 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b89f255af8917e4b13768b3bc1c773736b50759", + "version-string": "1.48.0", + "port-version": 0 + }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", From fa7b656185e22c02a53db181948535207be39b5e Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 25 Jan 2021 23:19:15 +0100 Subject: [PATCH 115/182] run format-manifest --- ports/harfbuzz/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index f35dba24b52a31..c2e9ab742139a5 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version-string": "2.7.4", - "port-version" : 1, + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ From db6f17c47094f79ecd8e6672a285e50608001ff4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:11:57 +0100 Subject: [PATCH 116/182] add missing removal of multiple spaces back into the regex --- scripts/cmake/vcpkg_configure_meson.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 4a4cfe6fbc0d10..c7c4981e865321 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -36,7 +36,6 @@ This command supplies many common arguments to Meson. To see the full list, exam * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) #]===] - function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https://mesonbuild.com/Native-environments.html set(NATIVE "[binaries]\n") #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) @@ -102,7 +101,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso set(LIBPATH_${_config} "'${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib'") set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(--?|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CFLAGS_${_config} "${LIBPATH_${_config}}") @@ -110,7 +109,7 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(--?|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") #list(APPEND MESON_CXXFLAGS_${_config} "${LIBPATH_${_config}}") @@ -292,14 +291,14 @@ function(vcpkg_internal_meson_generate_cross_file_config _config) #https://meson set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(--?|/)" ";\\2" MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") list(TRANSFORM MESON_CFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CFLAGS_${_config} PREPEND "'") list(APPEND MESON_CFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") list(JOIN MESON_CFLAGS_${_config} ", " MESON_CFLAGS_${_config}) string(REPLACE "'', " "" MESON_CFLAGS_${_config} "${MESON_CFLAGS_${_config}}") string(APPEND NATIVE_${_config} "c_args = [${MESON_CFLAGS_${_config}}]\n") - string(REGEX REPLACE "( |^)(--?|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") + string(REGEX REPLACE "( +|^)(--?|/)" ";\\2" MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") list(TRANSFORM MESON_CXXFLAGS_${_config} APPEND "'") list(TRANSFORM MESON_CXXFLAGS_${_config} PREPEND "'") list(APPEND MESON_CXXFLAGS_${_config} "'-I\"${CURRENT_INSTALLED_DIR}/include\"'") From db69b42344e8d00c44f73ba24157985227a5e140 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 26 Jan 2021 10:12:41 +0100 Subject: [PATCH 117/182] remove ws diff change --- scripts/cmake/vcpkg_install_meson.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index ad2933595788e7..e11e427cba1a67 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -102,5 +102,4 @@ function(vcpkg_install_meson) unset(ENV{MACOSX_DEPLOYMENT_TARGET}) endif() endif() - endfunction() From 9552edb544d54d517d06bb9ea0c91b4a02b2f193 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 26 Jan 2021 12:26:04 +0100 Subject: [PATCH 118/182] fix gtkmm the upstream way --- ports/gtkmm/gtkapi.patch | 35 +++++++++++++++++++++++++++++++++++ ports/gtkmm/portfile.cmake | 6 +----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 ports/gtkmm/gtkapi.patch diff --git a/ports/gtkmm/gtkapi.patch b/ports/gtkmm/gtkapi.patch new file mode 100644 index 00000000000000..09fa038f33de30 --- /dev/null +++ b/ports/gtkmm/gtkapi.patch @@ -0,0 +1,35 @@ +diff --git a/untracked/gtk/gtkmm/expression.h b/untracked/gtk/gtkmm/expression.h +index fc3bf1e5b..ff70c720a 100644 +--- a/untracked/gtk/gtkmm/expression.h ++++ b/untracked/gtk/gtkmm/expression.h +@@ -377,7 +377,7 @@ private: + namespace Expression_Private + { + +-void watch_callback(gpointer data); ++GTKMM_API void watch_callback(gpointer data); + + template + class Invoker +@@ -406,7 +406,7 @@ void closure_marshal(GClosure* closure, + gpointer invocation_hint, + gpointer marshal_data); + +-void closure_callback_func(); ++GTKMM_API void closure_callback_func(); + + template + void closure_destroy(gpointer data, GClosure* closure); +diff --git a/untracked/gtk/gtkmm/expressionwatch.h b/untracked/gtk/gtkmm/expressionwatch.h +index 279870ed7..e9c760664 100644 +--- a/untracked/gtk/gtkmm/expressionwatch.h ++++ b/untracked/gtk/gtkmm/expressionwatch.h +@@ -83,7 +83,7 @@ public: + }; + + template +-class GTKMM_API ExpressionWatch final : public ExpressionWatchBase ++class ExpressionWatch final : public ExpressionWatchBase + { + public: + /** Evaluates the watched expression and on success returns the result. diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 2c3099325ae752..a415d259b88509 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -12,13 +12,9 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES build.patch + gtkapi.patch #upstream patch to fix dllimport issue ) -if(VCPKG_TARGET_IS_WINDOWS) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DGTKMM_BUILD /DGDKMM_BUILD") -endif() - vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS From 1da6dcebc389fbef6a11638559e4f0c2c41e7477 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 2 Feb 2021 10:46:22 +0100 Subject: [PATCH 119/182] remove ws to reduce diff --- scripts/cmake/vcpkg_install_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index e11e427cba1a67..6310a96cd0284d 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -75,7 +75,7 @@ function(vcpkg_install_meson) string(REGEX REPLACE ".a$" ".lib" LIBNAMENEW "${LIBNAME}") string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") - # For cmake fixes. + # For cmake fixes. string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) From 8f40c2f2df86576bf3c682254638c9e4d5b42e99 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 2 Feb 2021 11:40:21 +0100 Subject: [PATCH 120/182] make glib build on osx --- ports/glib/fix-libintl-detection.patch | 13 +++++++++++++ ports/glib/portfile.cmake | 7 ++++++- scripts/ci.baseline.txt | 1 - 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/glib/fix-libintl-detection.patch diff --git a/ports/glib/fix-libintl-detection.patch b/ports/glib/fix-libintl-detection.patch new file mode 100644 index 00000000000000..0ee0063b4c46de --- /dev/null +++ b/ports/glib/fix-libintl-detection.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +--- a/meson.build ++++ b/meson.build +@@ -2029,6 +2029,9 @@ else + libintl = disabler() + endif + endif ++ if not libintl.found() ++ libintl = dependency('Intl', required : false, method : 'cmake') ++ endif + if not libintl.found() + libintl = subproject('proxy-libintl').get_variable('intl_dep') + libintl_deps = [libintl] + libintl_deps diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 229c7608f7aa08..3446e4da4c5b94 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_extract_source_archive_ex( REF ${GLIB_VERSION} PATCHES use-libiconv-on-windows.patch + fix-libintl-detection.patch ) @@ -62,8 +63,12 @@ set(GLIB_TOOLS gdbus gresource gsettings ) + if(NOT VCPKG_TARGET_IS_WINDOWS) - list(APPEND GLIB_TOOLS gapplication glib-gettextize gtester) + if(NOT VCPKG_TARGET_IS_OSX) + list(APPEND GLIB_TOOLS gapplication) + endif() + list(APPEND GLIB_TOOLS glib-gettextize gtester) endif() set(GLIB_SCRIPTS gdbus-codegen glib-genmarshal glib-mkenums gtester-report) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 538cae62204148..ff91af4e010ed2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -386,7 +386,6 @@ glfw3:arm-uwp=fail glfw3:x64-uwp=fail glib:x64-uwp=fail glib:x64-windows-static=fail -glib:x64-osx=fail gmmlib:arm64-windows=fail gmmlib:arm-uwp=fail gmmlib:x64-osx=fail From efacdb9ebb9013cee0e479d80de3fd59d18a3369 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 8 Feb 2021 08:58:04 +0100 Subject: [PATCH 121/182] format manifest --- ports/cairo/vcpkg.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 770db8af3209c0..d4c161faa9996b 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -5,11 +5,11 @@ "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "dependencies": [ + "dirent", "libpng", - "pixman", - "zlib", "lzo", - "dirent" + "pixman", + "zlib" ], "default-features": [ "freetype" From c5d43370e065fad8889313de15ebf1dd2a86a1de Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 8 Feb 2021 09:01:49 +0100 Subject: [PATCH 122/182] run x-add-version --- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2911996c65620a..ad2cbd43ce6694 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1062,7 +1062,7 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 9 + "port-version": 10 }, "cairomm": { "baseline": "1.16.0", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index b2fab7af92b4a4..f6db92ae0aa291 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03f474232a07c0ef208c499896b3df7daa661980", + "version-string": "1.16.0", + "port-version": 10 + }, { "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", "version-string": "1.16.0", From d72a3226b699978ffc52ec62a4c51f89e9dbe0a2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 9 Feb 2021 11:11:32 +0100 Subject: [PATCH 123/182] add pthread dependency --- ports/cairo/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index d4c161faa9996b..389bdb2dc44a41 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -9,6 +9,7 @@ "libpng", "lzo", "pixman", + "pthread", "zlib" ], "default-features": [ From 6a38f3765e564869e3944d98829519600450c745 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 9 Feb 2021 11:11:59 +0100 Subject: [PATCH 124/182] update baseline due to glib compiling on osx now. --- scripts/ci.baseline.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ff91af4e010ed2..752aa4c16eb66d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -411,6 +411,7 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail +gts:x64-osx=fail guetzli:x64-osx=fail h3:arm64-windows=fail h3:arm-uwp=fail @@ -519,6 +520,7 @@ lastools:arm-uwp=fail lastools:x64-uwp=fail laszip:arm-uwp=fail laszip:x64-uwp=fail +lcm:x64-osx=fail leptonica:x64-uwp=fail leptonica:arm-uwp=fail leveldb:arm-uwp=fail @@ -544,6 +546,7 @@ libcrafter:x86-windows=fail libcrafter:x64-windows=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail +libgpod:x64-osx=fail libcrafter:x64-windows-static-md=fail cpuid:arm-uwp=fail cpuid:x64-uwp=fail @@ -1128,6 +1131,7 @@ openmpi:x86-windows=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail openscap:x64-linux=fail +openscap:x64-osx=fail openssl-unix:arm64-windows=fail openssl-unix:arm-uwp=fail openssl-unix:x64-uwp=fail From d2089c1ff94dc616b3ed5dced650a64c121e736d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 15 Feb 2021 13:19:52 +0100 Subject: [PATCH 125/182] add meson as a dep to glib --- ports/glib/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 6da5c9e0fa4a49..640efc7d9c3790 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -3,7 +3,7 @@ Version: 2.66.4 Port-Version: 0 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. -Build-Depends: zlib, pcre, libffi, gettext, libiconv, dirent +Build-Depends: zlib, pcre, libffi, gettext, libiconv, dirent, tool-meson Supports: !uwp&!(windows&static) Feature: selinux From 79fd14be4d20ae64cf5a718623e1ef76abb6856d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 4 Mar 2021 15:18:09 +0100 Subject: [PATCH 126/182] - add glib host dependencies - switch to manifest of touched ports --- ports/atk/CONTROL | 7 ------- ports/atk/portfile.cmake | 8 ++++---- ports/atk/vcpkg.json | 16 +++++++++++++++ ports/atkmm/CONTROL | 7 ------- ports/atkmm/vcpkg.json | 14 +++++++++++++ ports/cairomm/CONTROL | 6 ------ ports/cairomm/vcpkg.json | 10 +++++++++ ports/cartographer/CONTROL | 6 ------ ports/cartographer/vcpkg.json | 22 ++++++++++++++++++++ ports/fluidsynth/CONTROL | 6 ------ ports/fluidsynth/vcpkg.json | 10 +++++++++ ports/gdk-pixbuf/CONTROL | 6 ------ ports/gdk-pixbuf/portfile.cmake | 8 ++++---- ports/gdk-pixbuf/vcpkg.json | 17 ++++++++++++++++ ports/glib/CONTROL | 10 --------- ports/glib/vcpkg.json | 21 +++++++++++++++++++ ports/glibmm/CONTROL | 7 ------- ports/glibmm/vcpkg.json | 17 ++++++++++++++++ ports/gmime/CONTROL | 7 ------- ports/gmime/vcpkg.json | 14 +++++++++++++ ports/graphene/CONTROL | 7 ------- ports/graphene/portfile.cmake | 8 ++++---- ports/graphene/vcpkg.json | 15 ++++++++++++++ ports/gtk/CONTROL | 6 ------ ports/gtk/portfile.cmake | 22 ++++++++++---------- ports/gtk/vcpkg.json | 35 ++++++++++++++++++++++++++++++++ ports/gtkmm/CONTROL | 7 ------- ports/gtkmm/portfile.cmake | 4 ++-- ports/gtkmm/vcpkg.json | 25 +++++++++++++++++++++++ ports/gts/CONTROL | 6 ------ ports/gts/vcpkg.json | 10 +++++++++ ports/harfbuzz/portfile.cmake | 8 ++++---- ports/harfbuzz/vcpkg.json | 6 +++++- ports/ignition-cmake2/CONTROL | 6 ------ ports/ignition-cmake2/vcpkg.json | 10 +++++++++ ports/io2d/CONTROL | 5 ----- ports/io2d/vcpkg.json | 23 +++++++++++++++++++++ ports/lcm/CONTROL | 7 ------- ports/lcm/vcpkg.json | 13 ++++++++++++ ports/libcroco/CONTROL | 5 ----- ports/libcroco/vcpkg.json | 10 +++++++++ ports/libgpod/CONTROL | 6 ------ ports/libgpod/vcpkg.json | 12 +++++++++++ ports/libnice/CONTROL | 6 ------ ports/libnice/vcpkg.json | 11 ++++++++++ ports/libplist/CONTROL | 4 ---- ports/libplist/vcpkg.json | 6 ++++++ ports/librsvg/CONTROL | 6 ------ ports/librsvg/vcpkg.json | 13 ++++++++++++ ports/libxmlpp/CONTROL | 6 ------ ports/libxmlpp/vcpkg.json | 11 ++++++++++ ports/pango/CONTROL | 6 ------ ports/pango/portfile.cmake | 8 ++++---- ports/pango/vcpkg.json | 24 ++++++++++++++++++++++ ports/pangomm/CONTROL | 6 ------ ports/pangomm/portfile.cmake | 8 ++++---- ports/pangomm/vcpkg.json | 21 +++++++++++++++++++ ports/tesseract/CONTROL | 14 ------------- ports/tesseract/vcpkg.json | 26 ++++++++++++++++++++++++ ports/v8/CONTROL | 7 ------- ports/v8/vcpkg.json | 20 ++++++++++++++++++ 61 files changed, 468 insertions(+), 210 deletions(-) delete mode 100644 ports/atk/CONTROL create mode 100644 ports/atk/vcpkg.json delete mode 100644 ports/atkmm/CONTROL create mode 100644 ports/atkmm/vcpkg.json delete mode 100644 ports/cairomm/CONTROL create mode 100644 ports/cairomm/vcpkg.json delete mode 100644 ports/cartographer/CONTROL create mode 100644 ports/cartographer/vcpkg.json delete mode 100644 ports/fluidsynth/CONTROL create mode 100644 ports/fluidsynth/vcpkg.json delete mode 100644 ports/gdk-pixbuf/CONTROL create mode 100644 ports/gdk-pixbuf/vcpkg.json delete mode 100644 ports/glib/CONTROL create mode 100644 ports/glib/vcpkg.json delete mode 100644 ports/glibmm/CONTROL create mode 100644 ports/glibmm/vcpkg.json delete mode 100644 ports/gmime/CONTROL create mode 100644 ports/gmime/vcpkg.json delete mode 100644 ports/graphene/CONTROL create mode 100644 ports/graphene/vcpkg.json delete mode 100644 ports/gtk/CONTROL create mode 100644 ports/gtk/vcpkg.json delete mode 100644 ports/gtkmm/CONTROL create mode 100644 ports/gtkmm/vcpkg.json delete mode 100644 ports/gts/CONTROL create mode 100644 ports/gts/vcpkg.json delete mode 100644 ports/ignition-cmake2/CONTROL create mode 100644 ports/ignition-cmake2/vcpkg.json delete mode 100644 ports/io2d/CONTROL create mode 100644 ports/io2d/vcpkg.json delete mode 100644 ports/lcm/CONTROL create mode 100644 ports/lcm/vcpkg.json delete mode 100644 ports/libcroco/CONTROL create mode 100644 ports/libcroco/vcpkg.json delete mode 100644 ports/libgpod/CONTROL create mode 100644 ports/libgpod/vcpkg.json delete mode 100644 ports/libnice/CONTROL create mode 100644 ports/libnice/vcpkg.json delete mode 100644 ports/libplist/CONTROL create mode 100644 ports/libplist/vcpkg.json delete mode 100644 ports/librsvg/CONTROL create mode 100644 ports/librsvg/vcpkg.json delete mode 100644 ports/libxmlpp/CONTROL create mode 100644 ports/libxmlpp/vcpkg.json delete mode 100644 ports/pango/CONTROL create mode 100644 ports/pango/vcpkg.json delete mode 100644 ports/pangomm/CONTROL create mode 100644 ports/pangomm/vcpkg.json delete mode 100644 ports/tesseract/CONTROL create mode 100644 ports/tesseract/vcpkg.json delete mode 100644 ports/v8/CONTROL create mode 100644 ports/v8/vcpkg.json diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL deleted file mode 100644 index 3636df97136168..00000000000000 --- a/ports/atk/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: atk -Version: 2.36.0 -Port-Version: 1 -Homepage: https://developer.gnome.org/atk/ -Description: GNOME Accessibility Toolkit -Build-Depends: glib, gettext -Supports: !(osx|arm) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 638e41e6986d3e..d6d3f1882c7221 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -17,10 +17,10 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS -Dintrospection=false - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + 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_meson() diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json new file mode 100644 index 00000000000000..82c5394fcfafd4 --- /dev/null +++ b/ports/atk/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "atk", + "version-string": "2.36.0", + "port-version": 1, + "description": "GNOME Accessibility Toolkit", + "homepage": "https://developer.gnome.org/atk/", + "supports": "!(osx | arm)", + "dependencies": [ + "gettext", + "glib", + { + "name": "glib", + "host": true + } + ] +} diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL deleted file mode 100644 index da97428e24e6a9..00000000000000 --- a/ports/atkmm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: atkmm -Version: 2.36.0 -Port-Version: 1 -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/vcpkg.json b/ports/atkmm/vcpkg.json new file mode 100644 index 00000000000000..d8089cf2b875ff --- /dev/null +++ b/ports/atkmm/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "atkmm", + "version-string": "2.36.0", + "port-version": 1, + "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" + ] +} diff --git a/ports/cairomm/CONTROL b/ports/cairomm/CONTROL deleted file mode 100644 index 2a35a7adff554f..00000000000000 --- a/ports/cairomm/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: cairomm -Version: 1.16.0 -Port-Version: 0 -Homepage: https://www.cairographics.org -Description: A C++ wrapper for the cairo graphics library -Build-Depends: cairo, libsigcpp diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json new file mode 100644 index 00000000000000..64b0d08c13589a --- /dev/null +++ b/ports/cairomm/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cairomm", + "version-string": "1.16.0", + "description": "A C++ wrapper for the cairo graphics library", + "homepage": "https://www.cairographics.org", + "dependencies": [ + "cairo", + "libsigcpp" + ] +} diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL deleted file mode 100644 index 964d3a9e092933..00000000000000 --- a/ports/cartographer/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: cartographer -Version: 1.0.0 -Port-Version: 4 -Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf -Homepage: https://github.com/googlecartographer/cartographer -Description: Google 2D & 3D SLAM package diff --git a/ports/cartographer/vcpkg.json b/ports/cartographer/vcpkg.json new file mode 100644 index 00000000000000..b5f5f1076f4524 --- /dev/null +++ b/ports/cartographer/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "cartographer", + "version-string": "1.0.0", + "port-version": 4, + "description": "Google 2D & 3D SLAM package", + "homepage": "https://github.com/googlecartographer/cartographer", + "dependencies": [ + "boost-iostreams", + "cairo", + { + "name": "ceres", + "features": [ + "suitesparse" + ] + }, + "gflags", + "glog", + "gtest", + "lua", + "protobuf" + ] +} diff --git a/ports/fluidsynth/CONTROL b/ports/fluidsynth/CONTROL deleted file mode 100644 index 406bb91a1d12bd..00000000000000 --- a/ports/fluidsynth/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fluidsynth -Version: 2.1.4 -Port-Version: 1 -Homepage: https://github.com/FluidSynth/fluidsynth -Description: FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont. -Build-Depends: glib \ No newline at end of file diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json new file mode 100644 index 00000000000000..abc98adba79488 --- /dev/null +++ b/ports/fluidsynth/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "fluidsynth", + "version-string": "2.1.4", + "port-version": 1, + "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", + "homepage": "https://github.com/FluidSynth/fluidsynth", + "dependencies": [ + "glib" + ] +} diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL deleted file mode 100644 index cbcc6ffff4dcc2..00000000000000 --- a/ports/gdk-pixbuf/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: gdk-pixbuf -Version: 2.42.2 -Port-Version: 0 -Homepage: https://developer.gnome.org/gdk-pixbuf/ -Description: Image loading library. -Build-Depends: gettext, zlib, libpng, glib, tiff diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 9f91f5a8a03b93..8ae8349a9b4858 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -29,10 +29,10 @@ vcpkg_configure_meson( -Dinstalled_tests=false -Dgio_sniffing=false -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + 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_meson(ADD_BIN_TO_PATH) diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json new file mode 100644 index 00000000000000..a92376db3b0bfe --- /dev/null +++ b/ports/gdk-pixbuf/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gdk-pixbuf", + "version-string": "2.42.2", + "description": "Image loading library.", + "homepage": "https://developer.gnome.org/gdk-pixbuf/", + "dependencies": [ + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "libpng", + "tiff", + "zlib" + ] +} diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL deleted file mode 100644 index 640efc7d9c3790..00000000000000 --- a/ports/glib/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: glib -Version: 2.66.4 -Port-Version: 0 -Homepage: https://developer.gnome.org/glib/ -Description: Portable, general-purpose utility library. -Build-Depends: zlib, pcre, libffi, gettext, libiconv, dirent, tool-meson -Supports: !uwp&!(windows&static) - -Feature: selinux -Description: Build with selinux support. \ No newline at end of file diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json new file mode 100644 index 00000000000000..a0d019694b0bed --- /dev/null +++ b/ports/glib/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "glib", + "version-string": "2.66.4", + "description": "Portable, general-purpose utility library.", + "homepage": "https://developer.gnome.org/glib/", + "supports": "!uwp & !(windows & static)", + "dependencies": [ + "dirent", + "gettext", + "libffi", + "libiconv", + "pcre", + "tool-meson", + "zlib" + ], + "features": { + "selinux": { + "description": "Build with selinux support." + } + } +} diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL deleted file mode 100644 index 9b2797172f0e30..00000000000000 --- a/ports/glibmm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: glibmm -Version: 2.68.0 -Port-Version: 1 -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-3 -Supports: !uwp diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json new file mode 100644 index 00000000000000..99d4c3d3c083a8 --- /dev/null +++ b/ports/glibmm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "glibmm", + "version-string": "2.68.0", + "port-version": 1, + "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" + ] +} diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL deleted file mode 100644 index b14eeeeec05e67..00000000000000 --- a/ports/gmime/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: gmime -Version: 3.2.6 -Port-Version: 2 -Build-Depends: zlib, glib, libiconv, libidn2 -Homepage: https://developer.gnome.org/gmime/ -Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME). -Supports: windows \ No newline at end of file diff --git a/ports/gmime/vcpkg.json b/ports/gmime/vcpkg.json new file mode 100644 index 00000000000000..7681bb85e3ddf5 --- /dev/null +++ b/ports/gmime/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "gmime", + "version-string": "3.2.6", + "port-version": 2, + "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", + "homepage": "https://developer.gnome.org/gmime/", + "supports": "windows", + "dependencies": [ + "glib", + "libiconv", + "libidn2", + "zlib" + ] +} diff --git a/ports/graphene/CONTROL b/ports/graphene/CONTROL deleted file mode 100644 index d4796f804e79ba..00000000000000 --- a/ports/graphene/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: graphene -Version: 1.10.2 -Port-Version: 0 -Homepage: https://www.gtk.org/ -Description: A thin layer of types for graphic libraries. -Build-Depends: glib, gettext -Supports: !(arm&windows) \ No newline at end of file diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake index 46c254676bf4e9..39c090d3fb5a3e 100644 --- a/ports/graphene/portfile.cmake +++ b/ports/graphene/portfile.cmake @@ -20,10 +20,10 @@ vcpkg_configure_meson( -Dintrospection=false -Dtests=false -Dinstalled_tests=false - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + 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_meson() diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json new file mode 100644 index 00000000000000..d3aadbe32e2a2b --- /dev/null +++ b/ports/graphene/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "graphene", + "version-string": "1.10.2", + "description": "A thin layer of types for graphic libraries.", + "homepage": "https://www.gtk.org/", + "supports": "!(arm & windows)", + "dependencies": [ + "gettext", + "glib", + { + "name": "glib", + "host": true + } + ] +} diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL deleted file mode 100644 index f766038db90e7d..00000000000000 --- a/ports/gtk/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: gtk -Version: 4.0.1 -Port-Version: 0 -Homepage: https://www.gtk.org/ -Description: Portable library for creating graphical user interfaces. -Build-Depends: glib, atk, gdk-pixbuf, pango, cairo[core,gobject], cairo[core,x11] (linux), libepoxy, gettext, graphene, sassc diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 7b377d2db0bdf9..c910e634816595 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_extract_source_archive_ex( vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/tools/glib/") +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") if(VCPKG_TARGET_IS_LINUX) set(OPTIONS -Dwayland-backend=false) # CI missing at least wayland-protocols @@ -35,17 +35,17 @@ vcpkg_configure_meson( -Dintrospection=disabled -Dsassc=enabled -Dmedia-ffmpeg=disabled - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' - gdbus-codegen='${CURRENT_INSTALLED_DIR}/tools/glib/gdbus-codegen' - glib-compile-schemas='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' - gdbus-codegen='${CURRENT_INSTALLED_DIR}/tools/glib/gdbus-codegen' - glib-compile-schemas='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json new file mode 100644 index 00000000000000..de195158fcce97 --- /dev/null +++ b/ports/gtk/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "gtk", + "version-string": "4.0.1", + "description": "Portable library for creating graphical user interfaces.", + "homepage": "https://www.gtk.org/", + "dependencies": [ + "atk", + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + { + "name": "cairo", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + "gdk-pixbuf", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "graphene", + "libepoxy", + "pango", + "sassc" + ] +} diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL deleted file mode 100644 index 953cd7a9fdd37b..00000000000000 --- a/ports/gtkmm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: gtkmm -Version: 4.0.0 -Port-Version: 0 -Homepage: https://www.gtkmm.org/ -Description: gtkmm is the official C++ interface for the popular GUI library GTK+. -Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm -Supports: !uwp diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index a415d259b88509..9b5e5ab0cded67 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -21,8 +21,8 @@ vcpkg_configure_meson( -Dmsvc14x-parallel-installable=false -Dbuild-tests=false -Dbuild-demos=false - ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' - ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) vcpkg_install_meson() diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json new file mode 100644 index 00000000000000..b65de46b3ef65a --- /dev/null +++ b/ports/gtkmm/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "gtkmm", + "version-string": "4.0.0", + "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", + "homepage": "https://www.gtkmm.org/", + "supports": "!uwp", + "dependencies": [ + "atk", + "atkmm", + "cairo", + "cairomm", + "gdk-pixbuf", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "glibmm", + "gtk", + "libepoxy", + "pango", + "pangomm" + ] +} diff --git a/ports/gts/CONTROL b/ports/gts/CONTROL deleted file mode 100644 index 59bf76989e1bfc..00000000000000 --- a/ports/gts/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: gts -Version: 0.7.6 -Port-Version: 4 -Homepage: https://github.com/finetjul/gts -Description: A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles -Build-Depends: glib diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json new file mode 100644 index 00000000000000..2ad1fdd2d04763 --- /dev/null +++ b/ports/gts/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gts", + "version-string": "0.7.6", + "port-version": 4, + "description": "A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles", + "homepage": "https://github.com/finetjul/gts", + "dependencies": [ + "glib" + ] +} diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 3e350cd2e4ce97..24e74403940468 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -41,10 +41,10 @@ vcpkg_configure_meson( -Ddocs=disabled -Dtests=disabled -Dbenchmark=disabled - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + 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_meson() diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index c2e9ab742139a5..076d3b549a3b57 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -18,7 +18,11 @@ "glib": { "description": "Glib Unicode callbacks support", "dependencies": [ - "glib" + "glib", + { + "name": "glib", + "host": true + } ] }, "graphite2": { diff --git a/ports/ignition-cmake2/CONTROL b/ports/ignition-cmake2/CONTROL deleted file mode 100644 index 7ce098593ae1dc..00000000000000 --- a/ports/ignition-cmake2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ignition-cmake2 -Version: 2.5.0 -Port-Version: 1 -Homepage: https://ignitionrobotics.org/libs/cmake -Description: CMake helper functions for building robotic applications -Build-Depends: ignition-modularscripts diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json new file mode 100644 index 00000000000000..9cbc55e6927392 --- /dev/null +++ b/ports/ignition-cmake2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ignition-cmake2", + "version-string": "2.5.0", + "port-version": 1, + "description": "CMake helper functions for building robotic applications", + "homepage": "https://ignitionrobotics.org/libs/cmake", + "dependencies": [ + "ignition-modularscripts" + ] +} diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL deleted file mode 100644 index aea8aa7daa4aa3..00000000000000 --- a/ports/io2d/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: io2d -Version: 2020-09-14 -Port-Version: 2 -Description: a lightweight, cross platform drawing library -Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx) diff --git a/ports/io2d/vcpkg.json b/ports/io2d/vcpkg.json new file mode 100644 index 00000000000000..68278bb8c70e99 --- /dev/null +++ b/ports/io2d/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "io2d", + "version-string": "2020-09-14", + "port-version": 2, + "description": "a lightweight, cross platform drawing library", + "dependencies": [ + { + "name": "cairo", + "platform": "!osx" + }, + { + "name": "cairo", + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "graphicsmagick", + "platform": "!osx" + } + ] +} diff --git a/ports/lcm/CONTROL b/ports/lcm/CONTROL deleted file mode 100644 index 0c4c82ed82cd7e..00000000000000 --- a/ports/lcm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: lcm -Version: 1.4.0 -Port-Version: 2 -Build-Depends: glib -Homepage: https://github.com/lcm-proj/lcm -Description: Lightweight Communications and Marshalling (LCM) - LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages. diff --git a/ports/lcm/vcpkg.json b/ports/lcm/vcpkg.json new file mode 100644 index 00000000000000..5ca564f61c7deb --- /dev/null +++ b/ports/lcm/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "lcm", + "version-string": "1.4.0", + "port-version": 2, + "description": [ + "Lightweight Communications and Marshalling (LCM)", + "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." + ], + "homepage": "https://github.com/lcm-proj/lcm", + "dependencies": [ + "glib" + ] +} diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL deleted file mode 100644 index cf566c7001ad96..00000000000000 --- a/ports/libcroco/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libcroco -Version: 0.6.13 -Port-Version: 3 -Description: A standalone css2 parsing and manipulation library -Build-Depends: glib, libxml2 diff --git a/ports/libcroco/vcpkg.json b/ports/libcroco/vcpkg.json new file mode 100644 index 00000000000000..0befe1e7708271 --- /dev/null +++ b/ports/libcroco/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libcroco", + "version-string": "0.6.13", + "port-version": 3, + "description": "A standalone css2 parsing and manipulation library", + "dependencies": [ + "glib", + "libxml2" + ] +} diff --git a/ports/libgpod/CONTROL b/ports/libgpod/CONTROL deleted file mode 100644 index 5500f154d7627d..00000000000000 --- a/ports/libgpod/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libgpod -Version: 2019-08-29 -Port-Version: 3 -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/vcpkg.json b/ports/libgpod/vcpkg.json new file mode 100644 index 00000000000000..7538dfb49c07bf --- /dev/null +++ b/ports/libgpod/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libgpod", + "version-string": "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" + ] +} diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL deleted file mode 100644 index e45fc9b57f2e4d..00000000000000 --- a/ports/libnice/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libnice -Version: 0.1.15 -Port-Version: 7 -Homepage: https://nice.freedesktop.org -Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389). -Build-Depends: glib, openssl diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json new file mode 100644 index 00000000000000..c291b1cdf070ad --- /dev/null +++ b/ports/libnice/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libnice", + "version-string": "0.1.15", + "port-version": 7, + "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", + "homepage": "https://nice.freedesktop.org", + "dependencies": [ + "glib", + "openssl" + ] +} diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL deleted file mode 100644 index 087b184ece391f..00000000000000 --- a/ports/libplist/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libplist -Version: 1.3.6 -Port-Version: 1 -Description: A library to handle Apple Property List format in binary or XML diff --git a/ports/libplist/vcpkg.json b/ports/libplist/vcpkg.json new file mode 100644 index 00000000000000..7497f76387c09c --- /dev/null +++ b/ports/libplist/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libplist", + "version-string": "1.3.6", + "port-version": 1, + "description": "A library to handle Apple Property List format in binary or XML" +} diff --git a/ports/librsvg/CONTROL b/ports/librsvg/CONTROL deleted file mode 100644 index b26ed9d696424a..00000000000000 --- a/ports/librsvg/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: librsvg -Version: 2.40.20 -Port-Version: 3 -Homepage: https://gitlab.gnome.org/GNOME/librsvg -Description: A small library to render Scalable Vector Graphics (SVG) -Build-Depends: cairo, pango, gdk-pixbuf, libcroco \ No newline at end of file diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json new file mode 100644 index 00000000000000..63a3f9e48205de --- /dev/null +++ b/ports/librsvg/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "librsvg", + "version-string": "2.40.20", + "port-version": 3, + "description": "A small library to render Scalable Vector Graphics (SVG)", + "homepage": "https://gitlab.gnome.org/GNOME/librsvg", + "dependencies": [ + "cairo", + "gdk-pixbuf", + "libcroco", + "pango" + ] +} diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL deleted file mode 100644 index 9904f6c8530ad9..00000000000000 --- a/ports/libxmlpp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libxmlpp -Version: 5.0 -Port-Version: 1 -Description: a C++ wrapper for the libxml XML parser library. -Build-Depends: libxml2, glibmm -Supports: !(windows&static) diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json new file mode 100644 index 00000000000000..c952af73dff195 --- /dev/null +++ b/ports/libxmlpp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libxmlpp", + "version-string": "5.0", + "port-version": 1, + "description": "a C++ wrapper for the libxml XML parser library.", + "supports": "!(windows & static)", + "dependencies": [ + "glibmm", + "libxml2" + ] +} diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL deleted file mode 100644 index 0a786365eb1ed2..00000000000000 --- a/ports/pango/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: pango -Version: 1.48.0 -Port-Version: 0 -Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ -Description: Text and font handling library. -Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz, fribidi diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index af582494937253..f22ec2f8a9239f 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -22,10 +22,10 @@ vcpkg_configure_meson( -Dcairo=enabled -Dxft=disabled -Dfreetype=enabled - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + 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_meson() diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json new file mode 100644 index 00000000000000..c920535ba730ef --- /dev/null +++ b/ports/pango/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "pango", + "version-string": "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" + ] +} diff --git a/ports/pangomm/CONTROL b/ports/pangomm/CONTROL deleted file mode 100644 index 87e763a6490f35..00000000000000 --- a/ports/pangomm/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: pangomm -Version: 2.48.0 -Port-Version: 0 -Homepage: https://ftp.gnome.org/pub/GNOME/sources/pangomm -Description: pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class. -Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz, pango, cairomm, glibmm diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 95eb70ed2aa677..c77eaf88649248 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -16,10 +16,10 @@ vcpkg_configure_meson( PREFER_NINJA OPTIONS -Dmsvc14x-parallel-installable=false - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' - ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_INSTALLED_DIR}/tools/glib/glib-genmarshal' - glib-mkenums='${CURRENT_INSTALLED_DIR}/tools/glib/glib-mkenums' + 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_meson() diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json new file mode 100644 index 00000000000000..4eeccd1114bf9c --- /dev/null +++ b/ports/pangomm/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "pangomm", + "version-string": "2.48.0", + "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", + "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pangomm", + "dependencies": [ + "cairo", + "cairomm", + "fontconfig", + "freetype", + "gettext", + "glib", + { + "name": "glib", + "host": true + }, + "glibmm", + "harfbuzz", + "pango" + ] +} diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL deleted file mode 100644 index b43581f6bc0aae..00000000000000 --- a/ports/tesseract/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: tesseract -Version: 4.1.1 -Port-Version: 7 -Homepage: https://github.com/tesseract-ocr/tesseract -Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google. -Build-Depends: leptonica, libarchive -Supports: !(windows&(arm|arm64)) - -Feature: training-tools -Description: build training tools -Build-Depends: icu, pango, cairo, fontconfig - -Feature: cpu-independed -Description: build on any cpu extension commands support diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json new file mode 100644 index 00000000000000..97c4cb709f0388 --- /dev/null +++ b/ports/tesseract/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "tesseract", + "version-string": "4.1.1", + "port-version": 7, + "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", + "homepage": "https://github.com/tesseract-ocr/tesseract", + "supports": "!(windows & (arm | arm64))", + "dependencies": [ + "leptonica", + "libarchive" + ], + "features": { + "cpu-independed": { + "description": "build on any cpu extension commands support" + }, + "training-tools": { + "description": "build training tools", + "dependencies": [ + "cairo", + "fontconfig", + "icu", + "pango" + ] + } + } +} diff --git a/ports/v8/CONTROL b/ports/v8/CONTROL deleted file mode 100644 index 727245f89f059d..00000000000000 --- a/ports/v8/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: v8 -Version: 8.6.395.17 -Port-Version: 1 -Homepage: https://v8.dev -Description: Google Chrome's JavaScript engine -Build-Depends: icu, zlib, glib (linux), pthread (linux) -Supports: !(arm|arm64|uwp|osx) diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json new file mode 100644 index 00000000000000..30d7258a100750 --- /dev/null +++ b/ports/v8/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "v8", + "version-string": "8.6.395.17", + "port-version": 1, + "description": "Google Chrome's JavaScript engine", + "homepage": "https://v8.dev", + "supports": "!(arm | arm64 | uwp | osx)", + "dependencies": [ + { + "name": "glib", + "platform": "linux" + }, + "icu", + { + "name": "pthread", + "platform": "linux" + }, + "zlib" + ] +} From c2e814e879a81d85ece60a08527d20733f964a66 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 4 Mar 2021 15:19:23 +0100 Subject: [PATCH 127/182] switch to manifest. --- ports/pixman/CONTROL | 5 ----- ports/pixman/vcpkg.json | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 ports/pixman/CONTROL create mode 100644 ports/pixman/vcpkg.json diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL deleted file mode 100644 index 6dbd573ffccfaa..00000000000000 --- a/ports/pixman/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pixman -Version: 0.40.0 -Homepage: https://www.cairographics.org/releases -Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. -Build-Depends: libpng, tool-meson diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json new file mode 100644 index 00000000000000..d63b8be85d3c4e --- /dev/null +++ b/ports/pixman/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "pixman", + "version-string": "0.40.0", + "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", + "homepage": "https://www.cairographics.org/releases", + "dependencies": [ + "libpng", + "tool-meson" + ] +} From 979186d9073d7a58108b940b0b8c8358d2649431 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:35:33 +0100 Subject: [PATCH 128/182] [libxml2] add gnuinstalldirs --- ports/libxml2/CMakeLists.txt | 2 +- ports/libxml2/CONTROL | 6 ------ ports/libxml2/vcpkg.json | 12 ++++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 ports/libxml2/CONTROL create mode 100644 ports/libxml2/vcpkg.json diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index bdc3939bff1325..65f1d2f8fd8bb0 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(libxml2 C) - +include(GNUInstallDirs) option(INSTALL_HEADERS "Install public header files" ON) set(CMAKE_SHARED_LIBRARY_PREFIX) diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL deleted file mode 100644 index fe8dec589f3cac..00000000000000 --- a/ports/libxml2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libxml2 -Version: 2.9.10 -Port-Version: 2 -Homepage: https://xmlsoft.org/ -Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) -Build-Depends: zlib, libiconv, liblzma diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json new file mode 100644 index 00000000000000..9aa1928caebfaf --- /dev/null +++ b/ports/libxml2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxml2", + "version-string": "2.9.10", + "port-version": 3, + "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform)", + "homepage": "https://xmlsoft.org/", + "dependencies": [ + "libiconv", + "liblzma", + "zlib" + ] +} From 892e3b0869434bc1e3c877cf9f4a154803fef363 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:40:25 +0100 Subject: [PATCH 129/182] [libxml2] add missing include of GNUInstallDirs --- ports/libxml2/CMakeLists.txt | 2 +- ports/libxml2/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index cd6de43260917e..c92208afa617da 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(libxml2 C) - +include(GNUInstallDirs) set(WITH_TRIO 0 CACHE BOOL "Add trio support") set(WITH_THREADS 1 CACHE BOOL "Add multithread support") set(WITH_THREAD_ALLOC 0 CACHE BOOL "Add per-thread memory") diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index c5ac7c0fd32aa1..cf516de7b4e6eb 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.10", - "port-version": 3, + "port-version": 4, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ From 93d0f64f0daaa37110f229428e4efb831c44867d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:41:11 +0100 Subject: [PATCH 130/182] add version info --- versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index fee501f2587e17..8c4a74f38c7eca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3586,7 +3586,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 3 + "port-version": 4 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index e7a5c70f798a24..b449c16d401bb3 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ed3f34c81182a5a32967a0fb390b13e9c195750", + "version-semver": "2.9.10", + "port-version": 4 + }, { "git-tree": "7aa5a9ea1742082d57eb67708f107ade65f94c12", "version-semver": "2.9.10", From e9cfff3fc9a995a7263014527548582b527db637 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:49:40 +0100 Subject: [PATCH 131/182] add include dir to pc files .... --- ports/libxml2/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index c92208afa617da..a590bd73665605 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -170,6 +170,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +set(XML_INCLUDEDIR "-I\"${includedir}\"") configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libxml-2.0.pc DESTINATION lib/pkgconfig) \ No newline at end of file From 226fe4d7e943dbbbc62f596db8fd9e2a771f4477 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:50:36 +0100 Subject: [PATCH 132/182] update version --- versions/l-/libxml2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index b449c16d401bb3..bfcb4a9a3634f4 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9ed3f34c81182a5a32967a0fb390b13e9c195750", + "git-tree": "16f25a133470e3097293c31211586c381184a494", "version-semver": "2.9.10", "port-version": 4 }, From fb4057ac6dd78e6f0432e3a0f5d3690eec7ce600 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 11:08:23 +0100 Subject: [PATCH 133/182] add UWP as crosscompiling target --- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 92f34bef86d576..a58dff254098c0 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -285,7 +285,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "cpu_family = '${BUILD_CPU_FAM}'\n") string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") - if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS) + if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP) set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) file(WRITE "${_file}" "${CROSS}") From d28ed169725015abf916ea6396d60e948c50a02a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 29 Mar 2021 15:30:05 +0200 Subject: [PATCH 134/182] Apply suggestions from code review --- versions/c-/cairomm.json | 5 ----- versions/g-/gdk-pixbuf.json | 5 ----- versions/g-/gtk.json | 5 ----- 3 files changed, 15 deletions(-) diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 427dc54e774921..6e544e706815d0 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -5,11 +5,6 @@ "version-string": "1.16.0", "port-version": 0 }, - { - "git-tree": "920d887aa5c35b9d689bba35c8bfdd8bbf8f0553", - "version-string": "1.15.3", - "port-version": 6 - }, { "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", "version-string": "1.15.3", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index b869ead8e6b8f8..b1a7426409b4ea 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -5,11 +5,6 @@ "version-string": "2.42.2", "port-version": 0 }, - { - "git-tree": "59fe81bc77c0b43e3fbf6c6746cf8fe3e6ffe3de", - "version-string": "2.36.9", - "port-version": 8 - }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index d4e74db54766dc..94d7c5d37682df 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -5,11 +5,6 @@ "version-string": "4.0.1", "port-version": 0 }, - { - "git-tree": "24a30d94c1b17c18e69e6d491c364a58ceb39bf9", - "version-string": "3.22.19", - "port-version": 5 - }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", From 89c47cdaa445bb3b702866d3f9efae9a37d253ed Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 29 Mar 2021 15:42:10 +0200 Subject: [PATCH 135/182] trying to fix cairo pthread detection on osx. --- scripts/cmake/vcpkg_configure_make.cmake | 27 +++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 95c1fb322751b5..58d108b34dca90 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -631,7 +631,15 @@ function(vcpkg_configure_make) set(LINK_ENV_${_VAR_SUFFIX} "${LINKER_FLAGS_${_VAR_SUFFIX}}") endif() else() - set(LDFLAGS_${_VAR_SUFFIX} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link ${LINKER_FLAGS_${_VAR_SUFFIX}}") + set(_link_dirs) + if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") + set(_link_dirs "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") + endif() + if(EXISTS "{_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + set(_link_dirs "${_link_dirs} -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + endif() + string(STRIP "${_link_dirs}" _link_dirs) + set(LDFLAGS_${_VAR_SUFFIX} "${_link_dirs} ${LINKER_FLAGS_${_VAR_SUFFIX}}") endif() unset(_VAR_SUFFIX) endif() @@ -700,10 +708,19 @@ function(vcpkg_configure_make) endif() set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}") - set(ENV{LIB} "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link/${LIB_PATHLIKE_CONCAT}") - set(ENV{LIBPATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link/${LIBPATH_PATHLIKE_CONCAT}") - set(ENV{LIBRARY_PATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link/${LIBRARY_PATH_PATHLIKE_CONCAT}") - set(ENV{LD_LIBRARY_PATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link/${LD_LIBRARY_PATH_PATHLIKE_CONCAT}") + set(_lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + foreach(_lib_env_var IN LISTS _lib_env_vars) + set(_link_path) + if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib") + set(_link_path "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib${VCPKG_HOST_PATH_SEPARATOR}") + endif() + if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") + set(_link_path "${_link_path}${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link${VCPKG_HOST_PATH_SEPARATOR}") + endif() + set(ENV{${_lib_env_var}} "${_link_path}${${_lib_env_var}_PATHLIKE_CONCAT}") + endforeach() + unset(_link_path) + unset(_lib_env_vars) if (CMAKE_HOST_WIN32) set(command ${base_cmd} -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") From c79ba2ccd17b7220ed2095a40821cb61fd09363c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 09:50:08 +0200 Subject: [PATCH 136/182] fix libmicrohttpd by adding the required system frameworks on osx --- ports/libmicrohttpd/CONTROL | 2 +- ports/libmicrohttpd/portfile.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/libmicrohttpd/CONTROL b/ports/libmicrohttpd/CONTROL index c1a76d5f9f1223..3a77ac72b5f084 100644 --- a/ports/libmicrohttpd/CONTROL +++ b/ports/libmicrohttpd/CONTROL @@ -1,6 +1,6 @@ Source: libmicrohttpd Version: 0.9.63 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.gnu.org/software/libmicrohttpd/ Description: GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index e055a246a38fce..993ba722b8ecfd 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -33,6 +33,9 @@ if (VCPKG_TARGET_IS_WINDOWS) file(GLOB MICROHTTPD_HEADERS ${SOURCE_PATH}/src/include/microhttpd*.h) file(COPY ${MICROHTTPD_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) else() + if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENV{LIBS} "$ENV{LIBS} -framework Foundation -framework AppKit") # TODO: Get this from the extracted cmake vars somehow + endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" ) From 92220988c562fa96310d839edbce4ceff87a6ba7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 09:50:46 +0200 Subject: [PATCH 137/182] fix poppler by not removing the CXX standard --- .../0001-remove-CMAKE_CXX_STANDARD.patch | 24 ------------------- ports/poppler/portfile.cmake | 1 - ports/poppler/vcpkg.json | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch diff --git a/ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch b/ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch deleted file mode 100644 index 8e47286c4021d9..00000000000000 --- a/ports/poppler/0001-remove-CMAKE_CXX_STANDARD.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 36fb9e11ab5b15fc003d77e7876e37339c37a55d Mon Sep 17 00:00:00 2001 -From: abc -Date: Wed, 16 Dec 2020 22:43:36 +0800 -Subject: [PATCH 1/2] remove CMAKE_CXX_STANDARD - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1573249a..ec66b515 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,6 @@ string(REGEX REPLACE "^0?(.+)$" "\\1" POPPLER_MINOR_VERSION "${POPPLER_MINOR_VER - set(POPPLER_MICRO_VERSION "1") - set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION_STRING}.${POPPLER_MICRO_VERSION}") - --set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_EXTENSIONS OFF) - set(CMAKE_LINK_DEPENDS_NO_SHARED TRUE) - --- -2.29.2.windows.2 - diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 566a309592c4da..74e8b22e269bdc 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github( SHA512 f692682689c0b0fcc3953a1cc157b6e1d2ce3ccab185189d6dc0807f1dd3ea2d1a9773d0b805079a30b3c8a3b0cf3ee83239ed48d7b08dc7762eba29c2033674 HEAD_REF master PATCHES - 0001-remove-CMAKE_CXX_STANDARD.patch 0002-remove-test-subdirectory.patch 0003-fix-gperf-not-recognized.patch 0004-disable-clang-format.patch diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index a000e3dcc753e1..57587f343393a2 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poppler", "version-string": "20.12.1", - "port-version": 4, + "port-version": 5, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "dependencies": [ From dd3304f2f29a2edf755bbbcc0dd42d30f45f85d7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 10:01:51 +0200 Subject: [PATCH 138/182] fix missing coretext header from harfbuzz in pano --- ports/harfbuzz/portfile.cmake | 8 ++++++++ ports/harfbuzz/vcpkg.json | 3 +++ ports/pango/vcpkg.json | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 6daff433a2cbb1..261a36f12856d9 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -23,6 +23,14 @@ if("graphite2" IN_LIST FEATURES) else() list(APPEND FEATURE_OPTIONS -Dgraphite=disabled) endif() +if("coretext" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) + if(NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "Feature 'coretext' os only available on OSX") + endif() +else() + list(APPEND FEATURE_OPTIONS -Dcoretext=disabled) +endif() if("glib" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -Dglib=enabled) list(APPEND FEATURE_OPTIONS -Dgobject=enabled) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 9b8cd1d65c6d24..f96325ee914c50 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -37,5 +37,8 @@ "icu" ] } + "coretext": { + "description": "Enable CoreText shaper backend on macOS", + } } } diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index c920535ba730ef..0e0baf806f4b23 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -19,6 +19,13 @@ "name": "glib", "host": true }, - "harfbuzz" + "harfbuzz", + { + "name": "harfbuzz", + "features": [ + "coretext" + ] + "platform": osx + }, ] } From 45d916741535e4f77ac1738fe584fd63e0fb5119 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 10:35:31 +0200 Subject: [PATCH 139/182] fix formating issues --- ports/harfbuzz/vcpkg.json | 6 +++--- ports/pango/vcpkg.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index f96325ee914c50..29196a2e083907 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -15,6 +15,9 @@ } ], "features": { + "coretext": { + "description": "Enable CoreText shaper backend on macOS" + }, "glib": { "description": "Glib Unicode callbacks support", "dependencies": [ @@ -37,8 +40,5 @@ "icu" ] } - "coretext": { - "description": "Enable CoreText shaper backend on macOS", - } } } diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 0e0baf806f4b23..72f4bf22b4b13a 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -24,8 +24,8 @@ "name": "harfbuzz", "features": [ "coretext" - ] - "platform": osx - }, + ], + "platform": "osx" + } ] } From b0920442d06ce5cc3055de1c3e29514bbc93bcf6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 19:32:02 +0200 Subject: [PATCH 140/182] fix librsvg on osx --- ports/librsvg/CMakeLists.txt | 7 +++---- ports/librsvg/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index ea788c1d02d69e..67cfced8c26267 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -11,12 +11,12 @@ find_package(LibXml2 REQUIRED) if(CMAKE_SYSTEM_NAME MATCHES "Windows") elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") else() - find_library(PANGO_FT2_LIB pangoft2-1) - find_library(FONTCONFIG_LIB fontconfig) + pkg_check_modules(PANGO2 pangoft2 pangofc IMPORTED_TARGET) + set(PANGO_FT2_LIB PkgConfig::PANGO2) endif() # Add include directories -include_directories(${CAIRO_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}) +include_directories(${CAIRO_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS} ${PANGO2_INCLUDE_DIRS}) set(LIBRSVG_SOURCES librsvg-features.c @@ -107,7 +107,6 @@ target_link_libraries(rsvg-2.40 PRIVATE PkgConfig::PANGO PkgConfig::GDK_PIXBUF ${PANGO_FT2_LIB} - ${FONTCONFIG_LIB} unofficial::libcroco::croco-0.6 ) target_link_libraries(pixbufloader-svg PRIVATE diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index 63a3f9e48205de..65ed3b8250e20e 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librsvg", "version-string": "2.40.20", - "port-version": 3, + "port-version": 4, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "dependencies": [ From 2604fbe5bb1b7006057ae45511f8998329698a9b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 19:51:20 +0200 Subject: [PATCH 141/182] revert version changes --- versions/a-/atk.json | 5 -- versions/a-/atkmm.json | 5 -- versions/baseline.json | 90 ++++++++++++++++---------------- versions/c-/cairo.json | 5 -- versions/c-/cairomm.json | 5 -- versions/c-/cartographer.json | 5 -- versions/f-/fluidsynth.json | 5 -- versions/g-/gdk-pixbuf.json | 5 -- versions/g-/glib.json | 5 -- versions/g-/glibmm.json | 5 -- versions/g-/gmime.json | 5 -- versions/g-/gtk.json | 5 -- versions/g-/gtkmm.json | 5 -- versions/g-/gts.json | 5 -- versions/i-/ignition-cmake2.json | 5 -- versions/i-/io2d.json | 5 -- versions/l-/lcm.json | 5 -- versions/l-/libcroco.json | 5 -- versions/l-/libgpod.json | 5 -- versions/l-/libnice.json | 5 -- versions/l-/libplist.json | 5 -- versions/l-/librsvg.json | 5 -- versions/l-/libsigcpp-3.json | 5 -- versions/l-/libsigcpp.json | 5 -- versions/l-/libxml2.json | 5 -- versions/l-/libxmlpp.json | 5 -- versions/p-/pango.json | 5 -- versions/p-/pangomm.json | 5 -- versions/p-/pixman.json | 5 -- versions/t-/tesseract.json | 5 -- versions/v-/v8.json | 5 -- 31 files changed, 45 insertions(+), 195 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 8746d643883f17..163f0e3aed978e 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "e0b101e154971ffe46c75a5429ceee13cbfaf04d", - "version-string": "2.36.0", - "port-version": 1 - }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index bb867d976666ef..e239881ae79757 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "66a68879d7bdfcc46089201456e2c9e83a54f490", - "version-string": "2.36.0", - "port-version": 1 - }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/versions/baseline.json b/versions/baseline.json index 5670ec5195b469..c984e3c4db8ee2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.36.0", - "port-version": 1 + "baseline": "2.24.0-5", + "port-version": 2 }, "atkmm": { - "baseline": "2.36.0", - "port-version": 1 + "baseline": "2.24.2", + "port-version": 5 }, "atlmfc": { "baseline": "0", @@ -1066,11 +1066,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 10 + "port-version": 9 }, "cairomm": { - "baseline": "1.16.0", - "port-version": 0 + "baseline": "1.15.3", + "port-version": 5 }, "camport3": { "baseline": "1.5.3", @@ -1085,8 +1085,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0", - "port-version": 4 + "baseline": "1.0.0-3", + "port-version": 0 }, "casclib": { "baseline": "1.50b-1", @@ -1990,7 +1990,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 1 + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2149,8 +2149,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.42.2", - "port-version": 0 + "baseline": "2.36.9-5", + "port-version": 7 }, "genann": { "baseline": "2019-07-10", @@ -2237,12 +2237,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.66.4", - "port-version": 0 + "baseline": "2.52.3", + "port-version": 25 }, "glibmm": { - "baseline": "2.68.0", - "port-version": 1 + "baseline": "2.52.1", + "port-version": 14 }, "glm": { "baseline": "0.9.9.8", @@ -2270,7 +2270,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 2 + "port-version": 1 }, "gmmlib": { "baseline": "20.3.1", @@ -2357,16 +2357,16 @@ "port-version": 4 }, "gtk": { - "baseline": "4.0.1", + "baseline": "3.22.19-4", "port-version": 0 }, "gtkmm": { - "baseline": "4.0.0", - "port-version": 0 + "baseline": "3.22.2", + "port-version": 5 }, "gts": { - "baseline": "0.7.6", - "port-version": 4 + "baseline": "0.7.6-3", + "port-version": 0 }, "guetzli": { "baseline": "2020-09-14", @@ -2494,7 +2494,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 1 + "port-version": 0 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2618,7 +2618,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 1 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2874,7 +2874,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 2 + "port-version": 1 }, "lcms": { "baseline": "2.11", @@ -2974,7 +2974,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 3 + "port-version": 2 }, "libcuckoo": { "baseline": "0.3", @@ -3086,7 +3086,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 3 + "port-version": 2 }, "libgta": { "baseline": "1.0.8-1", @@ -3270,7 +3270,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 7 + "port-version": 6 }, "libnoise": { "baseline": "1.0.0", @@ -3342,7 +3342,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 1 + "port-version": 0 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3405,8 +3405,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20", - "port-version": 3 + "baseline": "2.40.20-2", + "port-version": 0 }, "librsync": { "baseline": "2020-09-16", @@ -3433,12 +3433,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.0.3", - "port-version": 0 + "baseline": "2.10-3", + "port-version": 2 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 1 + "port-version": 0 }, "libsndfile": { "baseline": "1.0.31", @@ -3606,15 +3606,15 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 4 + "port-version": 3 }, "libxmlmm": { "baseline": "0.6.0", "port-version": 0 }, "libxmlpp": { - "baseline": "5.0", - "port-version": 1 + "baseline": "2.40.1", + "port-version": 8 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4573,16 +4573,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.48.0", - "port-version": 0 + "baseline": "1.40.11", + "port-version": 9 }, "pangolin": { "baseline": "0.5", "port-version": 12 }, "pangomm": { - "baseline": "2.48.0", - "port-version": 0 + "baseline": "2.40.1", + "port-version": 4 }, "parallel-hashmap": { "baseline": "1.32", @@ -4697,8 +4697,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.40.0", - "port-version": 0 + "baseline": "0.38.4", + "port-version": 2 }, "platform-folders": { "baseline": "4.0.0", @@ -5854,7 +5854,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 7 + "port-version": 6 }, "tfhe": { "baseline": "1.0.1-1", @@ -6190,7 +6190,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 1 + "port-version": 0 }, "valijson": { "baseline": "2018-11-17-1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index f6db92ae0aa291..b2fab7af92b4a4 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "03f474232a07c0ef208c499896b3df7daa661980", - "version-string": "1.16.0", - "port-version": 10 - }, { "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", "version-string": "1.16.0", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 6e544e706815d0..0e8797f14846c2 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "abe2c108111f594d51d09b16ef635ebfd6bf536d", - "version-string": "1.16.0", - "port-version": 0 - }, { "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index a3b9781306c18e..71eb9875c12507 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "8549e99573872d6850115f193c007b14a82dc030", - "version-string": "1.0.0", - "port-version": 4 - }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index b273df8c8249b1..a766ae2ca7c7b7 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "fee8bac7705601eccd92f8cf169b8c8fa82789fc", - "version-string": "2.1.4", - "port-version": 1 - }, { "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", "version-string": "2.1.4", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index b1a7426409b4ea..b97d4dc18f7215 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7276a3574cb547a27b964d17ebeb4bafa67152af", - "version-string": "2.42.2", - "port-version": 0 - }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index f72325c5709d10..9cfd59ea012ad3 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "a975e4fd5215808d45be26b3479e314e385608b5", - "version-string": "2.66.4", - "port-version": 0 - }, { "git-tree": "5cadd8fd83d64bc11b551994268c796eabf629b6", "version-string": "2.52.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index c90be74e4779aa..4cf69bdaf52f74 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "701454d5ead4fb275eedc5f4bb568b07e451e707", - "version-string": "2.68.0", - "port-version": 1 - }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 293e837381a7bd..2e7e8725fd3c3e 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "b6bc0323c2ad89dc02918e979c62685ae109990c", - "version-string": "3.2.6", - "port-version": 2 - }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 94d7c5d37682df..f56dba6ffdc30e 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2ca10958dc4c69b8a7dca3c7054b4b16329cb214", - "version-string": "4.0.1", - "port-version": 0 - }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index c777b75cd691c6..3b53b748c7077b 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2ded62b63709a99df68db9cfebe15acf771f94cd", - "version-string": "4.0.0", - "port-version": 0 - }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index 2dfcb6950c7c8a..536f7229e8a253 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "5e4ec0af9a4be523f882ac823baae6a59862c5e9", - "version-string": "0.7.6", - "port-version": 4 - }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index c305c03193569d..f229c494bdb39e 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2473a6eb3ef729b0e0b8d4403db680f143d8c0ea", - "version-string": "2.5.0", - "port-version": 1 - }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index 7a5ad2e24d6536..dd9370afdbb5b8 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "94959e392a3bbd476470bf973eaee57c782a6d77", - "version-string": "2020-09-14", - "port-version": 2 - }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index aa81f03ac60220..fef7df868650a2 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "4ecdb51b741d376b0ebd4fb637bd18fa8d39e264", - "version-string": "1.4.0", - "port-version": 2 - }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index e16bcf17731455..698b3aa5e5e7c7 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "5bcb19e4f340e0fbda821b4c29e3b31c38cb1e44", - "version-string": "0.6.13", - "port-version": 3 - }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index 6791d102502786..a9f78ea687d836 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "afaf6b4fea7f832662cba5da071bb1305ed0067f", - "version-string": "2019-08-29", - "port-version": 3 - }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 8fc070af2389d5..8da130a656e44f 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c0242706caa01291cdd89b147c24427eda31f514", - "version-string": "0.1.15", - "port-version": 7 - }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index ab916e78dde2dd..ad060ee201e27a 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "03648fe1fa9a293e77e8b819cbdb81e6687e1e30", - "version-string": "1.3.6", - "port-version": 1 - }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index e602d10bf093fb..8ec19294d84978 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c81c496bbb86a9191a85bd740af99747a1ba6590", - "version-string": "2.40.20", - "port-version": 3 - }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json index 069ab1a71e7b3d..2ac14dd336ea2e 100644 --- a/versions/l-/libsigcpp-3.json +++ b/versions/l-/libsigcpp-3.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6e09df080412a20aaf2755e78cd4314168fb8853", - "version-string": "3.0.3", - "port-version": 1 - }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index cb960085a55edb..8b666ff86ef141 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "329fb670d579bd3dca135f414d4d3af17e88ff37", - "version-string": "3.0.3", - "port-version": 0 - }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index bfcb4a9a3634f4..e7a5c70f798a24 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "16f25a133470e3097293c31211586c381184a494", - "version-semver": "2.9.10", - "port-version": 4 - }, { "git-tree": "7aa5a9ea1742082d57eb67708f107ade65f94c12", "version-semver": "2.9.10", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index a8bb3d873e60b6..0bdfeffe82817a 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c996518168e9937837b41350d589aeb00bf6a63e", - "version-string": "5.0", - "port-version": 1 - }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 130f42a9384e82..45c690134486d1 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2b89f255af8917e4b13768b3bc1c773736b50759", - "version-string": "1.48.0", - "port-version": 0 - }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 0af63378f930f9..5bca77f4691273 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7187eb27e948fd62ea103b6b036268982bfc76dc", - "version-string": "2.48.0", - "port-version": 0 - }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index d5f3898064d76a..6daee6513416f1 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c6ba934f70a6699f15abba8cff50e0dab4c28030", - "version-string": "0.40.0", - "port-version": 0 - }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 4b41ef4c24255e..6c8124580f28a6 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "247f1ebd702d64169d78cb0ea936c4b8613940bd", - "version-string": "4.1.1", - "port-version": 7 - }, { "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", "version-string": "4.1.1", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index d16adc0cb9f3b4..827273bc245a24 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "029191f061fed542434dfabbd3d3b622dfbc366c", - "version-string": "8.6.395.17", - "port-version": 1 - }, { "git-tree": "06594ed228d75261805f473207a1db1757f974fe", "version-string": "8.6.395.17", From 6fde82e4e8965b3e20bc6166d3095b899eb03c23 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 19:52:50 +0200 Subject: [PATCH 142/182] bump version --- ports/graphene/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index d3aadbe32e2a2b..d23043af66ba9f 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,6 +1,7 @@ { "name": "graphene", "version-string": "1.10.2", + "port-version" : 1 "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "supports": "!(arm & windows)", From 28738bf9f88b330670b8f45415fb22f92a99470a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 30 Mar 2021 19:53:16 +0200 Subject: [PATCH 143/182] version stuff. --- versions/a-/atk.json | 5 ++ versions/a-/atkmm.json | 5 ++ versions/baseline.json | 98 ++++++++++++++++---------------- versions/c-/cairo.json | 5 ++ versions/c-/cairomm.json | 5 ++ versions/c-/cartographer.json | 5 ++ versions/f-/fluidsynth.json | 5 ++ versions/g-/gdk-pixbuf.json | 5 ++ versions/g-/glib.json | 5 ++ versions/g-/glibmm.json | 5 ++ versions/g-/gmime.json | 5 ++ versions/g-/gtk.json | 5 ++ versions/g-/gtkmm.json | 5 ++ versions/g-/gts.json | 5 ++ versions/h-/harfbuzz.json | 5 ++ versions/i-/ignition-cmake2.json | 5 ++ versions/i-/io2d.json | 5 ++ versions/l-/lcm.json | 5 ++ versions/l-/libcroco.json | 5 ++ versions/l-/libgpod.json | 5 ++ versions/l-/libmicrohttpd.json | 5 ++ versions/l-/libnice.json | 5 ++ versions/l-/libplist.json | 5 ++ versions/l-/librsvg.json | 5 ++ versions/l-/libsigcpp-3.json | 5 ++ versions/l-/libsigcpp.json | 5 ++ versions/l-/libxml2.json | 5 ++ versions/l-/libxmlpp.json | 5 ++ versions/p-/pango.json | 5 ++ versions/p-/pangomm.json | 5 ++ versions/p-/pixman.json | 5 ++ versions/p-/poppler.json | 5 ++ versions/t-/tesseract.json | 5 ++ versions/v-/v8.json | 5 ++ 34 files changed, 214 insertions(+), 49 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 163f0e3aed978e..438ff5c6aee577 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e56c2c8924211cfba7dd9cb337ae443648dd47aa", + "version-string": "2.36.0", + "port-version": 1 + }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index e239881ae79757..ebac060aaad78d 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb67bab204bae725439a12683f7eb1093bcdda92", + "version-string": "2.36.0", + "port-version": 1 + }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/versions/baseline.json b/versions/baseline.json index c984e3c4db8ee2..fa0f6f5b071be3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 1 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 1 }, "atlmfc": { "baseline": "0", @@ -1066,11 +1066,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 9 + "port-version": 10 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 5 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1085,8 +1085,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -1990,7 +1990,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2149,8 +2149,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2237,12 +2237,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 25 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2270,7 +2270,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2357,16 +2357,16 @@ "port-version": 4 }, "gtk": { - "baseline": "3.22.19-4", + "baseline": "4.0.1", "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2398,7 +2398,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", @@ -2494,7 +2494,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2552,7 +2552,7 @@ "baseline": "9.0.0", "port-version": 0 }, - "iir1": { + "iir1": { "baseline": "1.8.0", "port-version": 0 }, @@ -2618,7 +2618,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2874,7 +2874,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -2974,7 +2974,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -3086,7 +3086,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3226,7 +3226,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 4 + "port-version": 5 }, "libmikmod": { "baseline": "3.3.11.1-8", @@ -3270,7 +3270,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3342,7 +3342,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3405,8 +3405,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 4 }, "librsync": { "baseline": "2020-09-16", @@ -3433,12 +3433,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.31", @@ -3606,15 +3606,15 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 3 + "port-version": 4 }, "libxmlmm": { "baseline": "0.6.0", "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0", + "port-version": 1 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4573,16 +4573,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 12 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4697,8 +4697,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -4782,7 +4782,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 4 + "port-version": 5 }, "popsift": { "baseline": "0.9", @@ -5854,7 +5854,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 6 + "port-version": 7 }, "tfhe": { "baseline": "1.0.1-1", @@ -6190,7 +6190,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index b2fab7af92b4a4..58f5de76ed3904 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb3e1a364dc478a0579d5335ca379858796ce0df", + "version-string": "1.16.0", + "port-version": 10 + }, { "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", "version-string": "1.16.0", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 0e8797f14846c2..12d9e14473b924 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fda0f2c6e42e18db762de9668cd987eac7b9a6ca", + "version-string": "1.16.0", + "port-version": 0 + }, { "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index 71eb9875c12507..f9f52e9bd22c02 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f01cd599fa1b8bbd970a22c5999951e70f06b76", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index a766ae2ca7c7b7..d0eb18ac77bb1f 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c12b58f2176ae79dcb5df60b26158ac8da0739a", + "version-string": "2.1.4", + "port-version": 1 + }, { "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", "version-string": "2.1.4", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index b97d4dc18f7215..dc26fb1ec0d005 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1d52875078dbbff69ddc0937ff5c53418dce624", + "version-string": "2.42.2", + "port-version": 0 + }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 9cfd59ea012ad3..32f434e768dec0 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb75f3fbbbf9385d7863533db0f9af517f11850", + "version-string": "2.66.4", + "port-version": 0 + }, { "git-tree": "5cadd8fd83d64bc11b551994268c796eabf629b6", "version-string": "2.52.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 4cf69bdaf52f74..d3a1767cee8ad4 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e482b2eb7d99e443ff3912c669b6f9cffdb6bdf", + "version-string": "2.68.0", + "port-version": 1 + }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 2e7e8725fd3c3e..dd3c9a42a9bfb8 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee8e1ef92eea0de4ca85bf46aec30da062581de3", + "version-string": "3.2.6", + "port-version": 2 + }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index f56dba6ffdc30e..6f91777db75251 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6b02a605b5c6a4abbaec1604f08bb6ab23031d4", + "version-string": "4.0.1", + "port-version": 0 + }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 3b53b748c7077b..45ad31effab825 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b5c68088c447581b71dbf5846779f0c019ebe23", + "version-string": "4.0.0", + "port-version": 0 + }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index 536f7229e8a253..a53e3e81777020 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c979e77ddac0e011563fb106289c19daef37d6", + "version-string": "0.7.6", + "port-version": 4 + }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7bdb4e94c9a0f2..284b07685df40f 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd09141561b4c328b19f9c7e1609ee92c39d6421", + "version-string": "2.7.4", + "port-version": 2 + }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index f229c494bdb39e..772e6622e730ad 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc2f4260711853f32ae2a5a8adf2fb8a1df9d4ca", + "version-string": "2.5.0", + "port-version": 1 + }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index dd9370afdbb5b8..6cdd5e12b97ad0 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d0772b90b868ce5a0fe022b7108be8c416b4f4b", + "version-string": "2020-09-14", + "port-version": 2 + }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index fef7df868650a2..2900921de17880 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3269aef446ddceeb331723b2d201559e424cc5f2", + "version-string": "1.4.0", + "port-version": 2 + }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 698b3aa5e5e7c7..a918c6979269ad 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0e5e0ae88e2110f6d8a0ba47d79e4484d21e250", + "version-string": "0.6.13", + "port-version": 3 + }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index a9f78ea687d836..265245cb0b14af 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9a7c9e5f2f8b9fdb6eca8464cad3c858f7b4f05", + "version-string": "2019-08-29", + "port-version": 3 + }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index dc63982f4d9d8c..14d69f741cc0f7 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", + "version-string": "0.9.63", + "port-version": 5 + }, { "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", "version-string": "0.9.63", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 8da130a656e44f..1bf1e65e1363cf 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d38bf95d924a4593e2f68bfda7346dbce84937e", + "version-string": "0.1.15", + "port-version": 7 + }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index ad060ee201e27a..a8185c2d47ad94 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd36e85a36046ba00a462a8d904608adfa8a1e03", + "version-string": "1.3.6", + "port-version": 1 + }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 8ec19294d84978..a553aa49ba73d2 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f1d148016736472e0119a65b332ec45ca0f094d", + "version-string": "2.40.20", + "port-version": 4 + }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json index 2ac14dd336ea2e..069ab1a71e7b3d 100644 --- a/versions/l-/libsigcpp-3.json +++ b/versions/l-/libsigcpp-3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e09df080412a20aaf2755e78cd4314168fb8853", + "version-string": "3.0.3", + "port-version": 1 + }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 8b666ff86ef141..cb960085a55edb 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "329fb670d579bd3dca135f414d4d3af17e88ff37", + "version-string": "3.0.3", + "port-version": 0 + }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index e7a5c70f798a24..bfcb4a9a3634f4 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16f25a133470e3097293c31211586c381184a494", + "version-semver": "2.9.10", + "port-version": 4 + }, { "git-tree": "7aa5a9ea1742082d57eb67708f107ade65f94c12", "version-semver": "2.9.10", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 0bdfeffe82817a..be4ebc8e2eb48f 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "583ed36bee4bb725f5360d79f96a360bc316c899", + "version-string": "5.0", + "port-version": 1 + }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 45c690134486d1..15fa4093b47ebc 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5770eeb0c72fc551e225b1fb3f63eeeab57bf27c", + "version-string": "1.48.0", + "port-version": 0 + }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 5bca77f4691273..83f00382087e78 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e797d73f60daf865977159036493f482343aa6b", + "version-string": "2.48.0", + "port-version": 0 + }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 6daee6513416f1..922c4c1562c3d0 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85a752b4e32b7e30ee11eb4dde7f1779f421974c", + "version-string": "0.40.0", + "port-version": 0 + }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index aa5ea95145df5f..3596cede5f2119 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3af3a74201527add29fdc677104f1f2af79eda05", + "version-string": "20.12.1", + "port-version": 5 + }, { "git-tree": "39df7895fae1b7440dd7c453679f6e0d782a8a5a", "version-string": "20.12.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 6c8124580f28a6..267d7d24c0996f 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af1a2fd9d4b7bd9de9e1d03fc4a8ea7145f725c7", + "version-string": "4.1.1", + "port-version": 7 + }, { "git-tree": "46aa8d12c08674f4518e9b74b32826bbb380cac9", "version-string": "4.1.1", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 827273bc245a24..dac72302becf8c 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bda31e08cf689a20d97f08cec0c9cd3d93bb6b8", + "version-string": "8.6.395.17", + "port-version": 1 + }, { "git-tree": "06594ed228d75261805f473207a1db1757f974fe", "version-string": "8.6.395.17", From 19ba7e0ee72c89ca5a94a8fcf54d4a5dff972b36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 31 Mar 2021 08:56:49 +0200 Subject: [PATCH 144/182] fix graphene version stuff --- ports/graphene/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/graphene.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index d23043af66ba9f..4caa0c71694f18 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphene", "version-string": "1.10.2", - "port-version" : 1 + "port-version": 1, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "supports": "!(arm & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index fa0f6f5b071be3..728e2676445d25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2314,7 +2314,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "graphicsmagick": { "baseline": "1.3.36", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 3ebae9736547c3..33ec2833905712 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9be6ea065a4260df8a1df5351b15d026d2e3e244", + "version-string": "1.10.2", + "port-version": 1 + }, { "git-tree": "002959491c215c722047465a93b05d078d743864", "version-string": "1.10.2", From 771c9350b0d3b7d54cb191beecdec37702839a58 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 31 Mar 2021 09:15:24 +0200 Subject: [PATCH 145/182] fix version stuff --- versions/g-/graphene.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 33ec2833905712..2c57a745898c5e 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9be6ea065a4260df8a1df5351b15d026d2e3e244", + "git-tree": "78bc1d9d9b69e9f1f8f7e10a0f60fd810f875504", "version-string": "1.10.2", "port-version": 1 }, From e17321f270bb74773a57aa3b82a89079cd8570cc Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 31 Mar 2021 11:08:03 +0200 Subject: [PATCH 146/182] removing ports from ci baseline to cause me pain --- scripts/ci.baseline.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2032f84db22351..bfc448a2a55b84 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -74,7 +74,7 @@ caf:arm64-windows=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail -cairomm:x64-linux=fail +# cairomm:x64-linux=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail cartographer:x64-osx=fail @@ -1213,7 +1213,7 @@ orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail -pangomm:x64-osx=fail +# pangomm:x64-osx=fail pangomm:arm64-windows=fail paraview:x64-linux=fail parmetis:x64-linux=fail From 10e6c87b453a7109f742358260d36fd36e612bab Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 31 Mar 2021 11:33:22 +0200 Subject: [PATCH 147/182] move cairomm:x64-linux=fail to gtkmm:x64-linx=fail remove pangomm:x64-osx=fail --- scripts/ci.baseline.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bfc448a2a55b84..a091bfe58f6427 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -74,7 +74,6 @@ caf:arm64-windows=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail -# cairomm:x64-linux=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail cartographer:x64-osx=fail @@ -430,6 +429,7 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail +gtkmm:x64-linx=fail gts:x64-osx=fail guetzli:x64-osx=fail h3:arm64-windows=fail @@ -1213,7 +1213,6 @@ orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail -# pangomm:x64-osx=fail pangomm:arm64-windows=fail paraview:x64-linux=fail parmetis:x64-linux=fail From efbe092b74e0974aafb73741bcb9d6a9da81b4c0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 31 Mar 2021 16:07:19 +0200 Subject: [PATCH 148/182] fix typo --- scripts/ci.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a091bfe58f6427..d10bbcf7f8039d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -429,7 +429,7 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail -gtkmm:x64-linx=fail +gtkmm:x64-linux=fail gts:x64-osx=fail guetzli:x64-osx=fail h3:arm64-windows=fail From 12dbc0f1d6333dfbdce45bc4c30c9d690fa642a9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 1 Apr 2021 10:27:41 +0200 Subject: [PATCH 149/182] revert ws changes to vcpkg_install_meson --- scripts/cmake/vcpkg_install_meson.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index ad2933595788e7..6310a96cd0284d 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -75,7 +75,7 @@ function(vcpkg_install_meson) string(REGEX REPLACE ".a$" ".lib" LIBNAMENEW "${LIBNAME}") string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") - # For cmake fixes. + # For cmake fixes. string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) @@ -102,5 +102,4 @@ function(vcpkg_install_meson) unset(ENV{MACOSX_DEPLOYMENT_TARGET}) endif() endif() - endfunction() From 985003dc18f3e30826f5e3bfe85ace4a84914c84 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 7 Apr 2021 21:50:30 +0200 Subject: [PATCH 150/182] update port version after merge --- ports/libxml2/vcpkg.json | 2 +- ports/tesseract/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index cf516de7b4e6eb..ac7957af22da2b 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.10", - "port-version": 4, + "port-version": 5, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 97c4cb709f0388..d3366a25919175 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tesseract", "version-string": "4.1.1", - "port-version": 7, + "port-version": 8, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "supports": "!(windows & (arm | arm64))", From ad7397ebd80ddeae48edfd5d6ee14d3c19f9bce9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 7 Apr 2021 21:51:59 +0200 Subject: [PATCH 151/182] version stuff --- versions/baseline.json | 4 ++-- versions/l-/libxml2.json | 5 +++++ versions/t-/tesseract.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b732cb78183c7d..d89d421d05381f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3614,7 +3614,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 4 + "port-version": 5 }, "libxmlmm": { "baseline": "0.6.0", @@ -5890,7 +5890,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 7 + "port-version": 8 }, "tfhe": { "baseline": "1.0.1-1", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 40b026f1cc6ef8..18a54d2b294843 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a36785e1d1e5babb12f2cd5b479ce6b03f0566c", + "version-semver": "2.9.10", + "port-version": 5 + }, { "git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577", "version-semver": "2.9.10", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 6fa7f4fa614b18..7909d2dfe7a4fe 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6008422c10e6cbf7627c4bcdc7e189f26faf08d6", + "version-string": "4.1.1", + "port-version": 8 + }, { "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109", "version-string": "4.1.1", From 88b986fa6e5850210bfc599e141051f14f1747fa Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 12:48:58 +0200 Subject: [PATCH 152/182] fix fluidsynth by adding vcpkg_check_features --- ports/fluidsynth/portfile.cmake | 85 ++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 28cd1ccff40e2b..4034c15c81ad20 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -7,10 +7,37 @@ vcpkg_from_github( PATCHES force-x86-gentables.patch ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "dbus" enable-dbus + "jack" enable-jack + "libinstpatch" enable-libinstpatch + "libsndfile" enable-libsndfile + "midishare" enable-midishare + "opensles" enable-opensles + "oboe" enable-oboe + "oss" enable-oss + "sdl2" enable-sdl2 + "pulseaudio" enable-pulseaudio + "readline" enable-readline + #platform dependent: + "lash" enable-lash + "alsa" enable-alsa + "systemd" enable-systemd + "coreaudio" enable-coreaudio + "coremidi" enable-coremidi + "dart" enable-dart + ) vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + OPTIONS + ${FEATURE_OPTIONS} + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + -Denable-dbus:BOOL=OFF + OPTIONS_DEBUG + -Denable-debug:BOOL=ON ) vcpkg_install_cmake() @@ -27,4 +54,58 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + + +# # Options disabled by default +# option ( enable-debug "enable debugging (default=no)" off ) +# option ( enable-floats "enable type float instead of double for DSP samples" off ) +# option ( enable-fpe-check "enable Floating Point Exception checks and debug messages" off ) +# option ( enable-portaudio "compile PortAudio support" off ) +# option ( enable-profiling "profile the dsp code" off ) +# option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" off ) +# option ( enable-ubsan "compile and link against UBSan (for debugging fluidsynth internals)" off ) + +# # Options enabled by default +# option ( enable-aufile "compile support for sound file output" on ) +# option ( BUILD_SHARED_LIBS "Build a shared object or DLL" on ) +# option ( enable-dbus "compile DBUS support (if it is available)" on ) +# option ( enable-ipv6 "enable ipv6 support" on ) +# option ( enable-jack "compile JACK support (if it is available)" on ) +# option ( enable-ladspa "enable LADSPA effect units" on ) +# option ( enable-libinstpatch "use libinstpatch (if available) to load DLS and GIG files" on ) +# option ( enable-libsndfile "compile libsndfile support (if it is available)" on ) +# option ( enable-midishare "compile MidiShare support (if it is available)" on ) +# option ( enable-opensles "compile OpenSLES support (if it is available)" off ) +# option ( enable-oboe "compile Oboe support (requires OpenSLES and/or AAudio)" off ) +# option ( enable-network "enable network support (requires BSD sockets)" on ) +# option ( enable-oss "compile OSS support (if it is available)" on ) +# option ( enable-dsound "compile DirectSound support (if it is available)" on ) +# option ( enable-waveout "compile Windows WaveOut support (if it is available)" on ) +# option ( enable-winmidi "compile Windows MIDI support (if it is available)" on ) +# option ( enable-sdl2 "compile SDL2 audio support (if it is available)" on ) +# option ( enable-pkgconfig "use pkg-config to locate fluidsynth's (mostly optional) dependencies" on ) +# option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on ) +# option ( enable-readline "compile readline lib line editing (if it is available)" on ) +# option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on ) + +# # Platform specific options +# if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" ) + # option ( enable-lash "compile LASH support (if it is available)" on ) + # option ( enable-alsa "compile ALSA support (if it is available)" on ) +# endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" ) + +# if ( CMAKE_SYSTEM MATCHES "Linux" ) + # option ( enable-systemd "compile systemd support (if it is available)" on ) +# endif ( CMAKE_SYSTEM MATCHES "Linux" ) + +# if ( CMAKE_SYSTEM MATCHES "Darwin" ) + # option ( enable-coreaudio "compile CoreAudio support (if it is available)" on ) + # option ( enable-coremidi "compile CoreMIDI support (if it is available)" on ) + # option ( enable-framework "create a Mac OSX style FluidSynth.framework" on ) +# endif ( CMAKE_SYSTEM MATCHES "Darwin" ) + +# if ( CMAKE_SYSTEM MATCHES "OS2" ) + # option ( enable-dart "compile DART support (if it is available)" on ) + # set ( enable-ipv6 off ) +# endif ( CMAKE_SYSTEM MATCHES "OS2" ) \ No newline at end of file From 5034e3708cc98a4515ba7786a22319ce9716b478 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 13:08:23 +0200 Subject: [PATCH 153/182] move cairo to ci baseline on osx --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b51f06e9c06020..97a2ba6cf66af0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -74,6 +74,8 @@ caf:arm64-windows=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail +# Requires VM update for gtk-doc +cairo:x64-osx=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail cartographer:x64-osx=fail From 2ace8257e78c7d1f578cba0da8fb3557073c25df Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 13:10:32 +0200 Subject: [PATCH 154/182] version stuff --- versions/baseline.json | 98 ++++++++++++++++++------------------- versions/f-/fluidsynth.json | 2 +- versions/g-/glib.json | 5 ++ 3 files changed, 55 insertions(+), 50 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 01b6dd47e56b43..435b037756badf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 1 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 1 }, "atlmfc": { "baseline": "0", @@ -1074,11 +1074,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 9 + "port-version": 10 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 5 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1093,8 +1093,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -1998,7 +1998,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2161,8 +2161,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2249,12 +2249,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 26 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2282,7 +2282,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2326,7 +2326,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "graphicsmagick": { "baseline": "1.3.36", @@ -2369,16 +2369,16 @@ "port-version": 4 }, "gtk": { - "baseline": "3.22.19-4", + "baseline": "4.0.1", "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2410,7 +2410,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", @@ -2506,7 +2506,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2630,7 +2630,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2886,7 +2886,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -2986,7 +2986,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -3098,7 +3098,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3238,7 +3238,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 4 + "port-version": 5 }, "libmikmod": { "baseline": "3.3.11.1-8", @@ -3282,7 +3282,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3354,7 +3354,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3417,8 +3417,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 4 }, "librsync": { "baseline": "2020-09-16", @@ -3445,12 +3445,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.31", @@ -3625,8 +3625,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0", + "port-version": 1 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4613,16 +4613,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 14 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4737,8 +4737,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -4822,7 +4822,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 4 + "port-version": 5 }, "popsift": { "baseline": "0.9", @@ -5910,7 +5910,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 7 + "port-version": 8 }, "tfhe": { "baseline": "1.0.1-1", @@ -6246,7 +6246,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", @@ -6613,4 +6613,4 @@ "port-version": 1 } } -} \ No newline at end of file +} diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index d0eb18ac77bb1f..c043f45dcef7da 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1c12b58f2176ae79dcb5df60b26158ac8da0739a", + "git-tree": "2d8c6d77ae8a9ead1185626d926df3aa440bd0e5", "version-string": "2.1.4", "port-version": 1 }, diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 05b4ab39f35822..7eb8c54f3e7bd3 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb75f3fbbbf9385d7863533db0f9af517f11850", + "version-string": "2.66.4", + "port-version": 0 + }, { "git-tree": "4ae9d07c61fa6787bacd9402f61b416843e36867", "version-string": "2.52.3", From 8776afc7afb93af0079800a0e79d967f615ae491 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 13:11:21 +0200 Subject: [PATCH 155/182] fluidsynth corrections --- ports/fluidsynth/portfile.cmake | 1 - ports/fluidsynth/vcpkg.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 4034c15c81ad20..539edb7d03acae 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -35,7 +35,6 @@ vcpkg_configure_cmake( OPTIONS ${FEATURE_OPTIONS} -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - -Denable-dbus:BOOL=OFF OPTIONS_DEBUG -Denable-debug:BOOL=ON ) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index abc98adba79488..d00705ad49b73c 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fluidsynth", - "version-string": "2.1.4", + "version": "2.1.4", "port-version": 1, "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", From bf4d634ed44a0848a1ecab41a7eedd9a0b1e201c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 13:12:18 +0200 Subject: [PATCH 156/182] more version stuff --- versions/f-/fluidsynth.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index c043f45dcef7da..7baa6a3411ca29 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "2d8c6d77ae8a9ead1185626d926df3aa440bd0e5", - "version-string": "2.1.4", + "git-tree": "4f73dd799fe5519221d3ea5bf37004d3329f3c69", + "version": "2.1.4", "port-version": 1 }, { From 8575e505b568230752eea262c19ae4f87853a2ea Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 15:27:16 +0200 Subject: [PATCH 157/182] apply code review changes --- ports/atkmm/portfile.cmake | 18 ++---------- ports/atkmm/vcpkg.json | 4 +-- ports/cairo/portfile.cmake | 1 - ports/librsvg/vcpkg.json | 4 +-- ports/libxmlpp/portfile.cmake | 28 +++---------------- ports/libxmlpp/vcpkg.json | 4 +-- ports/pango/portfile.cmake | 52 ++++++----------------------------- 7 files changed, 20 insertions(+), 91 deletions(-) diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index c5f607c75f6165..267c484608cf1e 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -16,25 +16,11 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} OPTIONS -Dbuild-documentation=false - -Dmsvc14x-parallel-installable=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() -# 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") - - -# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], - # value: 'if-git-build', description: 'Generate source code from .hg and .ccg files') -# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'min', - # description: 'Compiler warning level') -# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'fatal', - # description: 'Compiler warning level when a tarball is created') -# option('build-deprecated-api', type: 'boolean', value: true, - # description: 'Build deprecated API and include it in the library') -# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], - # value: 'if-maintainer-mode', description: 'Build and install the documentation') -# option('msvc14x-parallel-installable', type: 'boolean', value: true, - # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index d8089cf2b875ff..b0c3884ef2cbc3 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "atkmm", - "version-string": "2.36.0", - "port-version": 1, + "version": "2.36.0", + "port-version": 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", diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 11156ae328b61b..b19bceaea08eae 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_extract_source_archive_ex( PATCHES export-only-in-shared-build.patch 0001_fix_osx_defined.patch - #build.patch build2.patch remove_test_perf.patch ) diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index 65ed3b8250e20e..13d22016379200 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librsvg", - "version-string": "2.40.20", - "port-version": 4, + "version": "2.40.20", + "port-version": 3, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "dependencies": [ diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index c7a137f1c53fd4..6c951f270cfa94 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -15,10 +15,12 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dbuild-documentation=false - -Dvalidation=false + -Dvalidation=false # Validate the tutorial XML file -Dbuild-examples=false -Dbuild-tests=false - -Dmsvc14x-parallel-installable=false) + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dbuild-deprecated-api=true # Build deprecated API and include it in the library + ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() @@ -26,25 +28,3 @@ vcpkg_copy_pdbs() # Handle copyright and readme file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp RENAME copyright) file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp) - - -# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], - # value: 'if-git-build', description: 'Let mm-common-get copy some files to untracked/') -# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], - # value: 'min', description: 'Compiler warning level') -# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], - # value: 'fatal', description: 'Compiler warning level when a tarball is created') -# option('build-deprecated-api', type: 'boolean', value: true, - # description: 'Build deprecated API and include it in the library') -# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], - # value: 'if-maintainer-mode', description: 'Build and install the documentation') -# option('validation', type: 'boolean', value: true, - # description: 'Validate the tutorial XML file') -# option('build-pdf', type: 'boolean', value: false, - # description: 'Build tutorial PDF file') -# option('build-examples', type: 'boolean', value: true, - # description: 'Build example programs') -# option('build-tests', type: 'boolean', value: true, - # description: 'Build test programs') -# option('msvc14x-parallel-installable', type: 'boolean', value: true, - # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index c952af73dff195..476a8cb735854d 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxmlpp", - "version-string": "5.0", - "port-version": 1, + "version": "5.0.0", + "port-version": 0, "description": "a C++ wrapper for the libxml XML parser library.", "supports": "!(windows & static)", "dependencies": [ diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index f22ec2f8a9239f..3830c545d1c6f9 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -15,13 +15,14 @@ vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -Dintrospection=disabled - -Dfontconfig=enabled - -Dsysprof=disabled - -Dlibtahi=disabled - -Dcairo=enabled - -Dxft=disabled - -Dfreetype=enabled + -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' @@ -44,40 +45,3 @@ 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() -# option('gtk_doc', - # description: 'Build API reference for Pango using GTK-Doc', - # type: 'boolean', - # value: false) -# option('introspection', - # description: 'Build the GObject introspection data for Pango', - # type: 'feature', - # value: 'auto', - # yield: true) -# option('install-tests', - # description : 'Install tests', - # type: 'boolean', - # value: 'false') -# option('fontconfig', - # description : 'Build with FontConfig support. Passing \'auto\' or \'disabled\' disables fontconfig where it is optional, i.e. on Windows and macOS. Passing \'disabled\' on platforms where fontconfig is required results in error.', - # type: 'feature', - # value: 'auto') -# option('sysprof', - # type : 'feature', - # value : 'disabled', - # description : 'include tracing support for sysprof') -# option('libthai', - # type : 'feature', - # value : 'auto', - # description : 'Build with libthai support') -# option('cairo', - # type : 'feature', - # value : 'auto', - # description : 'Build with cairo support') -# option('xft', - # type : 'feature', - # value : 'auto', - # description : 'Build with xft support') -# option('freetype', - # type : 'feature', - # value : 'auto', - # description : 'Build with freetype support') From c600beb591671a6cf27bb897ad97336f54a04d2d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 15:28:39 +0200 Subject: [PATCH 158/182] clean version stuff. --- versions/a-/atk.json | 5 -- versions/a-/atkmm.json | 5 -- versions/baseline.json | 98 ++++++++++++++++---------------- versions/c-/cairo.json | 5 -- versions/c-/cairomm.json | 5 -- versions/c-/cartographer.json | 5 -- versions/f-/fluidsynth.json | 5 -- versions/g-/gdk-pixbuf.json | 5 -- versions/g-/glib.json | 5 -- versions/g-/glibmm.json | 5 -- versions/g-/gmime.json | 5 -- versions/g-/graphene.json | 5 -- versions/g-/gtk.json | 5 -- versions/g-/gtkmm.json | 5 -- versions/g-/gts.json | 5 -- versions/h-/harfbuzz.json | 5 -- versions/i-/ignition-cmake2.json | 5 -- versions/i-/io2d.json | 5 -- versions/l-/lcm.json | 5 -- versions/l-/libcroco.json | 5 -- versions/l-/libgpod.json | 5 -- versions/l-/libmicrohttpd.json | 5 -- versions/l-/libnice.json | 5 -- versions/l-/libplist.json | 5 -- versions/l-/librsvg.json | 5 -- versions/l-/libsigcpp-3.json | 5 -- versions/l-/libsigcpp.json | 5 -- versions/l-/libxmlpp.json | 5 -- versions/p-/pango.json | 5 -- versions/p-/pangomm.json | 5 -- versions/p-/pixman.json | 5 -- versions/p-/poppler.json | 5 -- versions/t-/tesseract.json | 5 -- versions/v-/v8.json | 5 -- 34 files changed, 49 insertions(+), 214 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 438ff5c6aee577..163f0e3aed978e 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "e56c2c8924211cfba7dd9cb337ae443648dd47aa", - "version-string": "2.36.0", - "port-version": 1 - }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index ebac060aaad78d..e239881ae79757 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "fb67bab204bae725439a12683f7eb1093bcdda92", - "version-string": "2.36.0", - "port-version": 1 - }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/versions/baseline.json b/versions/baseline.json index 435b037756badf..01b6dd47e56b43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.36.0", - "port-version": 1 + "baseline": "2.24.0-5", + "port-version": 2 }, "atkmm": { - "baseline": "2.36.0", - "port-version": 1 + "baseline": "2.24.2", + "port-version": 5 }, "atlmfc": { "baseline": "0", @@ -1074,11 +1074,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 10 + "port-version": 9 }, "cairomm": { - "baseline": "1.16.0", - "port-version": 0 + "baseline": "1.15.3", + "port-version": 5 }, "camport3": { "baseline": "1.5.3", @@ -1093,8 +1093,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0", - "port-version": 4 + "baseline": "1.0.0-3", + "port-version": 0 }, "casclib": { "baseline": "1.50b-1", @@ -1998,7 +1998,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 1 + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2161,8 +2161,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.42.2", - "port-version": 0 + "baseline": "2.36.9-5", + "port-version": 7 }, "genann": { "baseline": "2019-07-10", @@ -2249,12 +2249,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.66.4", - "port-version": 0 + "baseline": "2.52.3", + "port-version": 26 }, "glibmm": { - "baseline": "2.68.0", - "port-version": 1 + "baseline": "2.52.1", + "port-version": 14 }, "glm": { "baseline": "0.9.9.8", @@ -2282,7 +2282,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 2 + "port-version": 1 }, "gmmlib": { "baseline": "20.3.1", @@ -2326,7 +2326,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 1 + "port-version": 0 }, "graphicsmagick": { "baseline": "1.3.36", @@ -2369,16 +2369,16 @@ "port-version": 4 }, "gtk": { - "baseline": "4.0.1", + "baseline": "3.22.19-4", "port-version": 0 }, "gtkmm": { - "baseline": "4.0.0", - "port-version": 0 + "baseline": "3.22.2", + "port-version": 5 }, "gts": { - "baseline": "0.7.6", - "port-version": 4 + "baseline": "0.7.6-3", + "port-version": 0 }, "guetzli": { "baseline": "2020-09-14", @@ -2410,7 +2410,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 2 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", @@ -2506,7 +2506,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 1 + "port-version": 0 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2630,7 +2630,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 1 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2886,7 +2886,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 2 + "port-version": 1 }, "lcms": { "baseline": "2.11", @@ -2986,7 +2986,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 3 + "port-version": 2 }, "libcuckoo": { "baseline": "0.3", @@ -3098,7 +3098,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 3 + "port-version": 2 }, "libgta": { "baseline": "1.0.8-1", @@ -3238,7 +3238,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 5 + "port-version": 4 }, "libmikmod": { "baseline": "3.3.11.1-8", @@ -3282,7 +3282,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 7 + "port-version": 6 }, "libnoise": { "baseline": "1.0.0", @@ -3354,7 +3354,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 1 + "port-version": 0 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3417,8 +3417,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20", - "port-version": 4 + "baseline": "2.40.20-2", + "port-version": 0 }, "librsync": { "baseline": "2020-09-16", @@ -3445,12 +3445,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.0.3", - "port-version": 0 + "baseline": "2.10-3", + "port-version": 2 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 1 + "port-version": 0 }, "libsndfile": { "baseline": "1.0.31", @@ -3625,8 +3625,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "5.0", - "port-version": 1 + "baseline": "2.40.1", + "port-version": 8 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4613,16 +4613,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.48.0", - "port-version": 0 + "baseline": "1.40.11", + "port-version": 9 }, "pangolin": { "baseline": "0.5", "port-version": 14 }, "pangomm": { - "baseline": "2.48.0", - "port-version": 0 + "baseline": "2.40.1", + "port-version": 4 }, "parallel-hashmap": { "baseline": "1.32", @@ -4737,8 +4737,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.40.0", - "port-version": 0 + "baseline": "0.38.4", + "port-version": 2 }, "platform-folders": { "baseline": "4.0.0", @@ -4822,7 +4822,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 5 + "port-version": 4 }, "popsift": { "baseline": "0.9", @@ -5910,7 +5910,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 8 + "port-version": 7 }, "tfhe": { "baseline": "1.0.1-1", @@ -6246,7 +6246,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 1 + "port-version": 0 }, "valijson": { "baseline": "2018-11-17-1", @@ -6613,4 +6613,4 @@ "port-version": 1 } } -} +} \ No newline at end of file diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 58f5de76ed3904..b2fab7af92b4a4 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "fb3e1a364dc478a0579d5335ca379858796ce0df", - "version-string": "1.16.0", - "port-version": 10 - }, { "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", "version-string": "1.16.0", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 12d9e14473b924..0e8797f14846c2 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "fda0f2c6e42e18db762de9668cd987eac7b9a6ca", - "version-string": "1.16.0", - "port-version": 0 - }, { "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index f9f52e9bd22c02..71eb9875c12507 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "4f01cd599fa1b8bbd970a22c5999951e70f06b76", - "version-string": "1.0.0", - "port-version": 4 - }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 7baa6a3411ca29..a766ae2ca7c7b7 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "4f73dd799fe5519221d3ea5bf37004d3329f3c69", - "version": "2.1.4", - "port-version": 1 - }, { "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", "version-string": "2.1.4", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index dc26fb1ec0d005..b97d4dc18f7215 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "b1d52875078dbbff69ddc0937ff5c53418dce624", - "version-string": "2.42.2", - "port-version": 0 - }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 7eb8c54f3e7bd3..05b4ab39f35822 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7fb75f3fbbbf9385d7863533db0f9af517f11850", - "version-string": "2.66.4", - "port-version": 0 - }, { "git-tree": "4ae9d07c61fa6787bacd9402f61b416843e36867", "version-string": "2.52.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index d3a1767cee8ad4..4cf69bdaf52f74 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2e482b2eb7d99e443ff3912c669b6f9cffdb6bdf", - "version-string": "2.68.0", - "port-version": 1 - }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index dd3c9a42a9bfb8..2e7e8725fd3c3e 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "ee8e1ef92eea0de4ca85bf46aec30da062581de3", - "version-string": "3.2.6", - "port-version": 2 - }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 2c57a745898c5e..3ebae9736547c3 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "78bc1d9d9b69e9f1f8f7e10a0f60fd810f875504", - "version-string": "1.10.2", - "port-version": 1 - }, { "git-tree": "002959491c215c722047465a93b05d078d743864", "version-string": "1.10.2", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 6f91777db75251..f56dba6ffdc30e 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "a6b02a605b5c6a4abbaec1604f08bb6ab23031d4", - "version-string": "4.0.1", - "port-version": 0 - }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 45ad31effab825..3b53b748c7077b 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "1b5c68088c447581b71dbf5846779f0c019ebe23", - "version-string": "4.0.0", - "port-version": 0 - }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index a53e3e81777020..536f7229e8a253 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "76c979e77ddac0e011563fb106289c19daef37d6", - "version-string": "0.7.6", - "port-version": 4 - }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 284b07685df40f..7bdb4e94c9a0f2 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "fd09141561b4c328b19f9c7e1609ee92c39d6421", - "version-string": "2.7.4", - "port-version": 2 - }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index 772e6622e730ad..f229c494bdb39e 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "cc2f4260711853f32ae2a5a8adf2fb8a1df9d4ca", - "version-string": "2.5.0", - "port-version": 1 - }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index 6cdd5e12b97ad0..dd9370afdbb5b8 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7d0772b90b868ce5a0fe022b7108be8c416b4f4b", - "version-string": "2020-09-14", - "port-version": 2 - }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index 2900921de17880..fef7df868650a2 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "3269aef446ddceeb331723b2d201559e424cc5f2", - "version-string": "1.4.0", - "port-version": 2 - }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index a918c6979269ad..698b3aa5e5e7c7 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "e0e5e0ae88e2110f6d8a0ba47d79e4484d21e250", - "version-string": "0.6.13", - "port-version": 3 - }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index 265245cb0b14af..a9f78ea687d836 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "c9a7c9e5f2f8b9fdb6eca8464cad3c858f7b4f05", - "version-string": "2019-08-29", - "port-version": 3 - }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index 14d69f741cc0f7..dc63982f4d9d8c 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", - "version-string": "0.9.63", - "port-version": 5 - }, { "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", "version-string": "0.9.63", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 1bf1e65e1363cf..8da130a656e44f 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2d38bf95d924a4593e2f68bfda7346dbce84937e", - "version-string": "0.1.15", - "port-version": 7 - }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index a8185c2d47ad94..ad060ee201e27a 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "dd36e85a36046ba00a462a8d904608adfa8a1e03", - "version-string": "1.3.6", - "port-version": 1 - }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index a553aa49ba73d2..8ec19294d84978 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "1f1d148016736472e0119a65b332ec45ca0f094d", - "version-string": "2.40.20", - "port-version": 4 - }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json index 069ab1a71e7b3d..2ac14dd336ea2e 100644 --- a/versions/l-/libsigcpp-3.json +++ b/versions/l-/libsigcpp-3.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6e09df080412a20aaf2755e78cd4314168fb8853", - "version-string": "3.0.3", - "port-version": 1 - }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index cb960085a55edb..8b666ff86ef141 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "329fb670d579bd3dca135f414d4d3af17e88ff37", - "version-string": "3.0.3", - "port-version": 0 - }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index be4ebc8e2eb48f..0bdfeffe82817a 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "583ed36bee4bb725f5360d79f96a360bc316c899", - "version-string": "5.0", - "port-version": 1 - }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 15fa4093b47ebc..45c690134486d1 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "5770eeb0c72fc551e225b1fb3f63eeeab57bf27c", - "version-string": "1.48.0", - "port-version": 0 - }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 83f00382087e78..5bca77f4691273 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "8e797d73f60daf865977159036493f482343aa6b", - "version-string": "2.48.0", - "port-version": 0 - }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 922c4c1562c3d0..6daee6513416f1 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "85a752b4e32b7e30ee11eb4dde7f1779f421974c", - "version-string": "0.40.0", - "port-version": 0 - }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 3596cede5f2119..aa5ea95145df5f 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "3af3a74201527add29fdc677104f1f2af79eda05", - "version-string": "20.12.1", - "port-version": 5 - }, { "git-tree": "39df7895fae1b7440dd7c453679f6e0d782a8a5a", "version-string": "20.12.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 7909d2dfe7a4fe..6fa7f4fa614b18 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6008422c10e6cbf7627c4bcdc7e189f26faf08d6", - "version-string": "4.1.1", - "port-version": 8 - }, { "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109", "version-string": "4.1.1", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index dac72302becf8c..827273bc245a24 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "1bda31e08cf689a20d97f08cec0c9cd3d93bb6b8", - "version-string": "8.6.395.17", - "port-version": 1 - }, { "git-tree": "06594ed228d75261805f473207a1db1757f974fe", "version-string": "8.6.395.17", From f81be65da5197c2aad67ab8e81e858f80e61f8a8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 15:30:04 +0200 Subject: [PATCH 159/182] update version stuff --- versions/a-/atk.json | 5 ++ versions/a-/atkmm.json | 5 ++ versions/baseline.json | 98 ++++++++++++++++---------------- versions/c-/cairo.json | 5 ++ versions/c-/cairomm.json | 5 ++ versions/c-/cartographer.json | 5 ++ versions/f-/fluidsynth.json | 5 ++ versions/g-/gdk-pixbuf.json | 5 ++ versions/g-/glib.json | 5 ++ versions/g-/glibmm.json | 5 ++ versions/g-/gmime.json | 5 ++ versions/g-/graphene.json | 5 ++ versions/g-/gtk.json | 5 ++ versions/g-/gtkmm.json | 5 ++ versions/g-/gts.json | 5 ++ versions/h-/harfbuzz.json | 5 ++ versions/i-/ignition-cmake2.json | 5 ++ versions/i-/io2d.json | 5 ++ versions/l-/lcm.json | 5 ++ versions/l-/libcroco.json | 5 ++ versions/l-/libgpod.json | 5 ++ versions/l-/libmicrohttpd.json | 5 ++ versions/l-/libnice.json | 5 ++ versions/l-/libplist.json | 5 ++ versions/l-/librsvg.json | 5 ++ versions/l-/libsigcpp-3.json | 5 ++ versions/l-/libsigcpp.json | 5 ++ versions/l-/libxmlpp.json | 5 ++ versions/p-/pango.json | 5 ++ versions/p-/pangomm.json | 5 ++ versions/p-/pixman.json | 5 ++ versions/p-/poppler.json | 5 ++ versions/t-/tesseract.json | 5 ++ versions/v-/v8.json | 5 ++ 34 files changed, 214 insertions(+), 49 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 163f0e3aed978e..438ff5c6aee577 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e56c2c8924211cfba7dd9cb337ae443648dd47aa", + "version-string": "2.36.0", + "port-version": 1 + }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index e239881ae79757..d303fcd363656b 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "390c0901f1e0c56c11423b85f3a99a651203d2c4", + "version": "2.36.0", + "port-version": 0 + }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/versions/baseline.json b/versions/baseline.json index 01b6dd47e56b43..0733e856ff9f43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 1 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 0 }, "atlmfc": { "baseline": "0", @@ -1074,11 +1074,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 9 + "port-version": 10 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 5 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1093,8 +1093,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -1998,7 +1998,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2161,8 +2161,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2249,12 +2249,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 26 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2282,7 +2282,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2326,7 +2326,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "graphicsmagick": { "baseline": "1.3.36", @@ -2369,16 +2369,16 @@ "port-version": 4 }, "gtk": { - "baseline": "3.22.19-4", + "baseline": "4.0.1", "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2410,7 +2410,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", @@ -2506,7 +2506,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2630,7 +2630,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2886,7 +2886,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -2986,7 +2986,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -3098,7 +3098,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3238,7 +3238,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 4 + "port-version": 5 }, "libmikmod": { "baseline": "3.3.11.1-8", @@ -3282,7 +3282,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3354,7 +3354,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3417,8 +3417,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 3 }, "librsync": { "baseline": "2020-09-16", @@ -3445,12 +3445,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.31", @@ -3625,8 +3625,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0.0", + "port-version": 0 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4613,16 +4613,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 14 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4737,8 +4737,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -4822,7 +4822,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 4 + "port-version": 5 }, "popsift": { "baseline": "0.9", @@ -5910,7 +5910,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 7 + "port-version": 8 }, "tfhe": { "baseline": "1.0.1-1", @@ -6246,7 +6246,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", @@ -6613,4 +6613,4 @@ "port-version": 1 } } -} \ No newline at end of file +} diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index b2fab7af92b4a4..d2508bc211e3b9 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "822a5c6f6c4e73a5d1574c5b3e5d7ed4a232ddbb", + "version-string": "1.16.0", + "port-version": 10 + }, { "git-tree": "eb09773c303a9608687dca6a0480ff551c0c2bf9", "version-string": "1.16.0", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 0e8797f14846c2..12d9e14473b924 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fda0f2c6e42e18db762de9668cd987eac7b9a6ca", + "version-string": "1.16.0", + "port-version": 0 + }, { "git-tree": "0dce5120b52866ee6e0b485081389f9ea9679fb4", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index 71eb9875c12507..f9f52e9bd22c02 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f01cd599fa1b8bbd970a22c5999951e70f06b76", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index a766ae2ca7c7b7..7baa6a3411ca29 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f73dd799fe5519221d3ea5bf37004d3329f3c69", + "version": "2.1.4", + "port-version": 1 + }, { "git-tree": "3c4776e7b26493ea0fa2f825a2e855231805e978", "version-string": "2.1.4", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index b97d4dc18f7215..dc26fb1ec0d005 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1d52875078dbbff69ddc0937ff5c53418dce624", + "version-string": "2.42.2", + "port-version": 0 + }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 05b4ab39f35822..7eb8c54f3e7bd3 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb75f3fbbbf9385d7863533db0f9af517f11850", + "version-string": "2.66.4", + "port-version": 0 + }, { "git-tree": "4ae9d07c61fa6787bacd9402f61b416843e36867", "version-string": "2.52.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 4cf69bdaf52f74..d3a1767cee8ad4 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e482b2eb7d99e443ff3912c669b6f9cffdb6bdf", + "version-string": "2.68.0", + "port-version": 1 + }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 2e7e8725fd3c3e..dd3c9a42a9bfb8 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee8e1ef92eea0de4ca85bf46aec30da062581de3", + "version-string": "3.2.6", + "port-version": 2 + }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 3ebae9736547c3..2c57a745898c5e 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78bc1d9d9b69e9f1f8f7e10a0f60fd810f875504", + "version-string": "1.10.2", + "port-version": 1 + }, { "git-tree": "002959491c215c722047465a93b05d078d743864", "version-string": "1.10.2", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index f56dba6ffdc30e..6f91777db75251 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6b02a605b5c6a4abbaec1604f08bb6ab23031d4", + "version-string": "4.0.1", + "port-version": 0 + }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 3b53b748c7077b..45ad31effab825 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b5c68088c447581b71dbf5846779f0c019ebe23", + "version-string": "4.0.0", + "port-version": 0 + }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index 536f7229e8a253..a53e3e81777020 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c979e77ddac0e011563fb106289c19daef37d6", + "version-string": "0.7.6", + "port-version": 4 + }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7bdb4e94c9a0f2..284b07685df40f 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd09141561b4c328b19f9c7e1609ee92c39d6421", + "version-string": "2.7.4", + "port-version": 2 + }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index f229c494bdb39e..772e6622e730ad 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc2f4260711853f32ae2a5a8adf2fb8a1df9d4ca", + "version-string": "2.5.0", + "port-version": 1 + }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index dd9370afdbb5b8..6cdd5e12b97ad0 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d0772b90b868ce5a0fe022b7108be8c416b4f4b", + "version-string": "2020-09-14", + "port-version": 2 + }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index fef7df868650a2..2900921de17880 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3269aef446ddceeb331723b2d201559e424cc5f2", + "version-string": "1.4.0", + "port-version": 2 + }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 698b3aa5e5e7c7..a918c6979269ad 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0e5e0ae88e2110f6d8a0ba47d79e4484d21e250", + "version-string": "0.6.13", + "port-version": 3 + }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index a9f78ea687d836..265245cb0b14af 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9a7c9e5f2f8b9fdb6eca8464cad3c858f7b4f05", + "version-string": "2019-08-29", + "port-version": 3 + }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index dc63982f4d9d8c..14d69f741cc0f7 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", + "version-string": "0.9.63", + "port-version": 5 + }, { "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", "version-string": "0.9.63", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 8da130a656e44f..1bf1e65e1363cf 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d38bf95d924a4593e2f68bfda7346dbce84937e", + "version-string": "0.1.15", + "port-version": 7 + }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index ad060ee201e27a..a8185c2d47ad94 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd36e85a36046ba00a462a8d904608adfa8a1e03", + "version-string": "1.3.6", + "port-version": 1 + }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 8ec19294d84978..dd7bd19b72388f 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0de6b9c0d9dc0ada7b9223669bb08e9ef146aa7a", + "version": "2.40.20", + "port-version": 3 + }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json index 2ac14dd336ea2e..069ab1a71e7b3d 100644 --- a/versions/l-/libsigcpp-3.json +++ b/versions/l-/libsigcpp-3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e09df080412a20aaf2755e78cd4314168fb8853", + "version-string": "3.0.3", + "port-version": 1 + }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 8b666ff86ef141..cb960085a55edb 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "329fb670d579bd3dca135f414d4d3af17e88ff37", + "version-string": "3.0.3", + "port-version": 0 + }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 0bdfeffe82817a..923950851f00f7 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0521700c3d80c667604af711d4d95cb78b42163e", + "version": "5.0.0", + "port-version": 0 + }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 45c690134486d1..330810263a2431 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82db6bfbd3cb657347bfa89d2a37d7115494285c", + "version-string": "1.48.0", + "port-version": 0 + }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 5bca77f4691273..83f00382087e78 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e797d73f60daf865977159036493f482343aa6b", + "version-string": "2.48.0", + "port-version": 0 + }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 6daee6513416f1..922c4c1562c3d0 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85a752b4e32b7e30ee11eb4dde7f1779f421974c", + "version-string": "0.40.0", + "port-version": 0 + }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index aa5ea95145df5f..3596cede5f2119 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3af3a74201527add29fdc677104f1f2af79eda05", + "version-string": "20.12.1", + "port-version": 5 + }, { "git-tree": "39df7895fae1b7440dd7c453679f6e0d782a8a5a", "version-string": "20.12.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 6fa7f4fa614b18..7909d2dfe7a4fe 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6008422c10e6cbf7627c4bcdc7e189f26faf08d6", + "version-string": "4.1.1", + "port-version": 8 + }, { "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109", "version-string": "4.1.1", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 827273bc245a24..dac72302becf8c 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bda31e08cf689a20d97f08cec0c9cd3d93bb6b8", + "version-string": "8.6.395.17", + "port-version": 1 + }, { "git-tree": "06594ed228d75261805f473207a1db1757f974fe", "version-string": "8.6.395.17", From 46763ed2e4ce664085216c879535d894f7aefd45 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 16:00:11 +0200 Subject: [PATCH 160/182] code review cleanup --- ports/cairo/portfile.cmake | 6 -- ports/cairo/vcpkg.json | 2 +- ports/cairomm/portfile.cmake | 23 +---- ports/cairomm/vcpkg.json | 2 +- ports/fluidsynth/portfile.cmake | 54 ---------- ports/gdk-pixbuf/portfile.cmake | 75 +++----------- ports/glibmm/fix-define-glibmmconfig.patch | 43 -------- ports/glibmm/fix-thread.h.patch | 13 --- ports/glibmm/glibmm-api-variant.patch | 84 --------------- ports/glibmm/portfile.cmake | 17 --- ports/glibmm/vcpkg.json | 4 +- ports/gtk/portfile.cmake | 115 +++++---------------- ports/gtk/vcpkg.json | 2 +- ports/gtkmm/portfile.cmake | 19 +--- ports/gtkmm/vcpkg.json | 2 +- ports/harfbuzz/portfile.cmake | 66 +++--------- ports/libgpod/portfile.cmake | 11 -- ports/libplist/vcpkg.json | 5 +- 18 files changed, 61 insertions(+), 482 deletions(-) delete mode 100644 ports/glibmm/fix-define-glibmmconfig.patch delete mode 100644 ports/glibmm/fix-thread.h.patch delete mode 100644 ports/glibmm/glibmm-api-variant.patch diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index b19bceaea08eae..c00b60a440820f 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -59,12 +59,6 @@ vcpkg_configure_make( lt_cv_deplibs_check_method=pass_all ) vcpkg_install_make() -# vcpkg_install_make(SUBPATH /src) -# if("gobject" IN_LIST FEATURES) - # This deletes the previous build - # vcpkg_install_make(SUBPATH /util/cairo-gobject) -# endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 389bdb2dc44a41..d158e3ebe9b8b0 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cairo", - "version-string": "1.16.0", + "version": "1.16.0", "port-version": 10, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index 9b81dacac89646..b83ee9c3564648 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_configure_meson( PREFER_NINJA OPTIONS -Dbuild-examples=false - -Dmsvc14x-parallel-installable=false + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 ) vcpkg_install_meson() @@ -40,24 +40,3 @@ if(VCPKG_LIBRARY_LINAKGE STREQUAL "static") vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1") endif() endif() - -# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], - # value: 'if-git-build', description: 'Let mm-common-get copy some files to untracked/') -# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], - # value: 'min', description: 'Compiler warning level') -# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], - # value: 'fatal', description: 'Compiler warning level when a tarball is created') -# option('build-deprecated-api', type: 'boolean', value: true, - # description: 'Build deprecated API and include it in the library') -# option('build-exceptions-api', type: 'boolean', value: true, - # description: 'Build exceptions API and include it in the library') -# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], - # value: 'if-maintainer-mode', description: 'Build and install the documentation') -# option('build-examples', type: 'boolean', value: true, - # description: 'Build example programs') -# option('build-tests', type: 'combo', choices: ['false', 'if-dependencies-found', 'true'], - # value: 'if-dependencies-found', description: 'Build test programs (requires Boost Test and Fontconfig or Windows)') -# option('boost-shared', type: 'boolean', - # value: false, description: 'Use shared version of boost') -# option('msvc14x-parallel-installable', type: 'boolean', value: true, - # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') \ No newline at end of file diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index 64b0d08c13589a..d760825a0ea7b7 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cairomm", - "version-string": "1.16.0", + "version": "1.16.0", "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", "dependencies": [ diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 539edb7d03acae..a19c0fecefabf6 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -54,57 +54,3 @@ endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - - -# # Options disabled by default -# option ( enable-debug "enable debugging (default=no)" off ) -# option ( enable-floats "enable type float instead of double for DSP samples" off ) -# option ( enable-fpe-check "enable Floating Point Exception checks and debug messages" off ) -# option ( enable-portaudio "compile PortAudio support" off ) -# option ( enable-profiling "profile the dsp code" off ) -# option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" off ) -# option ( enable-ubsan "compile and link against UBSan (for debugging fluidsynth internals)" off ) - -# # Options enabled by default -# option ( enable-aufile "compile support for sound file output" on ) -# option ( BUILD_SHARED_LIBS "Build a shared object or DLL" on ) -# option ( enable-dbus "compile DBUS support (if it is available)" on ) -# option ( enable-ipv6 "enable ipv6 support" on ) -# option ( enable-jack "compile JACK support (if it is available)" on ) -# option ( enable-ladspa "enable LADSPA effect units" on ) -# option ( enable-libinstpatch "use libinstpatch (if available) to load DLS and GIG files" on ) -# option ( enable-libsndfile "compile libsndfile support (if it is available)" on ) -# option ( enable-midishare "compile MidiShare support (if it is available)" on ) -# option ( enable-opensles "compile OpenSLES support (if it is available)" off ) -# option ( enable-oboe "compile Oboe support (requires OpenSLES and/or AAudio)" off ) -# option ( enable-network "enable network support (requires BSD sockets)" on ) -# option ( enable-oss "compile OSS support (if it is available)" on ) -# option ( enable-dsound "compile DirectSound support (if it is available)" on ) -# option ( enable-waveout "compile Windows WaveOut support (if it is available)" on ) -# option ( enable-winmidi "compile Windows MIDI support (if it is available)" on ) -# option ( enable-sdl2 "compile SDL2 audio support (if it is available)" on ) -# option ( enable-pkgconfig "use pkg-config to locate fluidsynth's (mostly optional) dependencies" on ) -# option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on ) -# option ( enable-readline "compile readline lib line editing (if it is available)" on ) -# option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on ) - -# # Platform specific options -# if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" ) - # option ( enable-lash "compile LASH support (if it is available)" on ) - # option ( enable-alsa "compile ALSA support (if it is available)" on ) -# endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" ) - -# if ( CMAKE_SYSTEM MATCHES "Linux" ) - # option ( enable-systemd "compile systemd support (if it is available)" on ) -# endif ( CMAKE_SYSTEM MATCHES "Linux" ) - -# if ( CMAKE_SYSTEM MATCHES "Darwin" ) - # option ( enable-coreaudio "compile CoreAudio support (if it is available)" on ) - # option ( enable-coremidi "compile CoreMIDI support (if it is available)" on ) - # option ( enable-framework "create a Mac OSX style FluidSynth.framework" on ) -# endif ( CMAKE_SYSTEM MATCHES "Darwin" ) - -# if ( CMAKE_SYSTEM MATCHES "OS2" ) - # option ( enable-dart "compile DART support (if it is available)" on ) - # set ( enable-ipv6 off ) -# endif ( CMAKE_SYSTEM MATCHES "OS2" ) \ No newline at end of file diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 8ae8349a9b4858..a87bf0c93775c1 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -13,22 +13,23 @@ vcpkg_extract_source_archive_ex( PATCHES fix_build.patch ) if(VCPKG_TARGET_IS_WINDOWS) - #list(APPEND OPTIONS -Dnative_windows_loaders=true) + #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -Dman=false - -Dgtk_doc=false + -Dman=false # Whether to generate man pages (requires xlstproc) + -Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc) -Ddocs=false - -Dpng=true - -Dtiff=true - -Djpeg=true - -Dintrospection=disabled - -Drelocatable=true + -Dpng=true # Enable PNG loader (requires libpng) + -Dtiff=true # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used + -Djpeg=true # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used + -Dintrospection=disabled # Whether to generate the API introspection data (requires GObject-Introspection) + -Drelocatable=true # Whether to enable application bundle relocation support -Dinstalled_tests=false - -Dgio_sniffing=false - -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located + -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) + -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; + # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf 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' @@ -36,9 +37,7 @@ vcpkg_configure_meson( ) vcpkg_install_meson(ADD_BIN_TO_PATH) - - -# FIx paths in pc file. +# Fix paths in pc file. set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) @@ -69,53 +68,3 @@ file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdk-p file(RENAME ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/COPYING ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -# option('png', - # description: 'Enable PNG loader (requires libpng)', - # type: 'boolean', - # value: true) -# option('tiff', - # description: 'Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used', - # type: 'boolean', - # value: true) -# option('jpeg', - # description: 'Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used', - # type: 'boolean', - # value: true) -# option('builtin_loaders', - # description: 'Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf', - # type: 'string', - # value: 'none') -# option('gtk_doc', - # description: 'Whether to generate the API reference (requires GTK-Doc)', - # type: 'boolean', - # value: false) -# option('docs', - # description: 'Whether to generate the whole documentation (see: gtk_doc and man options) [Deprecated]', - # type: 'boolean', - # value: false) -# option('introspection', - # description: 'Whether to generate the API introspection data (requires GObject-Introspection)', - # type: 'feature', - # value: 'auto', - # yield: true) -# option('man', - # description: 'Whether to generate man pages (requires xlstproc)', - # type: 'boolean', - # value: true) -# option('relocatable', - # description: 'Whether to enable application bundle relocation support', - # type: 'boolean', - # value: false) -# option('native_windows_loaders', - # description: 'Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option', - # type: 'boolean', - # value: false) -# option('installed_tests', - # description: 'Install the test suite', - # type: 'boolean', - # value: true) -# option('gio_sniffing', - # description: 'Perform file type detection using GIO (Unused on MacOS and Windows)', - # type: 'boolean', - # value: true) diff --git a/ports/glibmm/fix-define-glibmmconfig.patch b/ports/glibmm/fix-define-glibmmconfig.patch deleted file mode 100644 index 90b97d9072a7a4..00000000000000 --- 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 8e7c01b6b5eff5..00000000000000 --- 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 bb00ac3f5dc96c..00000000000000 --- 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 2a63aa963538d9..9880325a837786 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -10,25 +10,8 @@ vcpkg_download_distfile(ARCHIVE 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( -# SOURCE_PATH ${SOURCE_PATH} -# PREFER_NINJA -# OPTIONS -# -DWARNINGS_HEADER=${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h -# OPTIONS_DEBUG -# -DDISABLE_INSTALL_HEADERS=ON -#) - -#vcpkg_install_cmake() - vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS -Dbuild-examples=false diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index 99d4c3d3c083a8..016dcbd5159c12 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glibmm", - "version-string": "2.68.0", - "port-version": 1, + "version": "2.68.0", + "port-version": 0, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "supports": "!uwp", diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index c910e634816595..37bf387d3f6571 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -18,10 +18,24 @@ get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") +set(x11 false) +set(win32 false) +set(osx false) if(VCPKG_TARGET_IS_LINUX) set(OPTIONS -Dwayland-backend=false) # CI missing at least wayland-protocols + set(x11 true) + # Enable the wayland gdk backend (only when building on Unix except for macOS) +elseif(VCPKG_TARGET_IS_WINDOWS) + set(win32 true) +elseif(VCPKG_TARGET_IS_OSX) + set(osx true) endif() +list(APPEND OPTIONS -Dx11-backend=${x11}) #Enable the X11 gdk backend (only when building on Unix) +list(APPEND OPTIONS -Dbroadway-backend=false) #Enable the broadway (HTML5) gdk backend +list(APPEND OPTIONS -Dwin32-backend=${win32}) #Enable the Windows gdk backend (only when building on Windows) +list(APPEND OPTIONS -Dmacos-backend=${osx}) #Enable the macOS gdk backend (only when building on macOS) + vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -33,8 +47,17 @@ vcpkg_configure_meson( -Dgtk_doc=false -Dman-pages=false -Dintrospection=disabled - -Dsassc=enabled - -Dmedia-ffmpeg=disabled + -Dsassc=enabled # Rebuild themes using sassc + -Dmedia-ffmpeg=disabled # Build the ffmpeg media backend + -Dmedia-gstreamer=disabled # Build the gstreamer media backend + -Dprint-cups=disabled # Build the cups print backend + -Dprint-cloudprint=disabled # Build the cloudprint print backend + -Dvulkan=disabled # Enable support for the Vulkan graphics API + -Dxinerama=disabled # Enable support for the X11 Xinerama extension + -Dcloudproviders=disabled # Enable the cloudproviders support + -Dsysprof=disabled # include tracing support for sysprof + -Dtracker=disabled # Enable Tracker3 filechooser search + -Dcolord=disabled # Build colord support for the CUPS printing backend ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' @@ -107,91 +130,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -# GDK backends - -# option('x11-backend', - # type: 'boolean', - # value: true, - # description : 'Enable the X11 gdk backend (only when building on Unix)') - -# option('wayland-backend', - # type: 'boolean', - # value: true, - # description : 'Enable the wayland gdk backend (only when building on Unix except for macOS)') - -# option('broadway-backend', - # type: 'boolean', - # value: false, - # description : 'Enable the broadway (HTML5) gdk backend') - -# option('win32-backend', - # type: 'boolean', - # value: true, - # description : 'Enable the Windows gdk backend (only when building on Windows)') - -# option('macos-backend', - # type: 'boolean', - # value: true, - # description : 'Enable the macOS gdk backend (only when building on macOS)') - -# # Media backends - -# option('media-ffmpeg', - # type: 'feature', - # value: 'auto', - # description : 'Build the ffmpeg media backend') - -# option('media-gstreamer', - # type: 'feature', - # value: 'auto', - # description : 'Build the gstreamer media backend') - -# # Print backends - -# option('print-cups', - # type: 'feature', - # value: 'auto', - # description : 'Build the cups print backend') - -# option('print-cloudprint', - # type: 'feature', - # value: 'auto', - # description : 'Build the cloudprint print backend') - -# # Optional features - -# option('vulkan', - # type: 'feature', - # value: 'auto', - # description : 'Enable support for the Vulkan graphics API') - -# option('xinerama', - # type: 'feature', - # value: 'auto', - # description : 'Enable support for the X11 Xinerama extension') - -# option('cloudproviders', - # type: 'feature', - # value: 'disabled', - # description : 'Enable the cloudproviders support') - -# option('sysprof', - # type: 'feature', - # value: 'disabled', - # description : 'include tracing support for sysprof') - -# option('tracker', - # type: 'feature', - # value: 'disabled', - # description : 'Enable Tracker3 filechooser search') - -# option('colord', - # type: 'feature', - # value: 'disabled', - # description : 'Build colord support for the CUPS printing backend') - -# option('sassc', - # type: 'feature', - # value: 'auto', - # description: 'Rebuild themes using sassc') - diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index de195158fcce97..d9fedf148437fb 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk", - "version-string": "4.0.1", + "version": "4.0.1", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "dependencies": [ diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 9b5e5ab0cded67..68820556413fca 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -Dmsvc14x-parallel-installable=false + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 -Dbuild-tests=false -Dbuild-demos=false ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' @@ -31,21 +31,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() - file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gtkmm" RENAME copyright) - - -# option('maintainer-mode', type: 'combo', choices: ['false', 'if-git-build', 'true'], - # value: 'if-git-build', description: 'Generate source code from .hg and .ccg files') -# option('warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'min', - # description: 'Compiler warning level') -# option('dist-warnings', type: 'combo', choices: ['no', 'min', 'max', 'fatal'], value: 'fatal', - # description: 'Compiler warning level when a tarball is created') -# option('build-deprecated-api', type: 'boolean', value: true, - # description: 'Build deprecated API and include it in the library') -# option('build-documentation', type: 'combo', choices: ['false', 'if-maintainer-mode', 'true'], - # value: 'if-maintainer-mode', description: 'Build and install the documentation') -# option('build-demos', type: 'boolean', value: true, description: 'Build demo programs') -# option('build-tests', type: 'boolean', value: true, description: 'Build test programs') -# option('msvc14x-parallel-installable', type: 'boolean', value: true, - # description: 'Use separate DLL and LIB filenames for Visual Studio 2017 and 2019') diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index b65de46b3ef65a..7764c53908127d 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtkmm", - "version-string": "4.0.0", + "version": "4.0.0", "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", "supports": "!uwp", diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 261a36f12856d9..56486acbaa50c1 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -14,17 +14,17 @@ vcpkg_from_github( ) if("icu" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -Dicu=enabled) + list(APPEND FEATURE_OPTIONS -Dicu=enabled) # Enable ICU library unicode functions else() list(APPEND FEATURE_OPTIONS -Dicu=disabled) endif() if("graphite2" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -Dgraphite=enabled) + list(APPEND FEATURE_OPTIONS -Dgraphite=enabled) #Enable Graphite2 complementary shaper else() list(APPEND FEATURE_OPTIONS -Dgraphite=disabled) endif() if("coretext" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) + list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) # Enable CoreText shaper backend on macOS if(NOT VCPKG_TARGET_IS_OSX) message(FATAL_ERROR "Feature 'coretext' os only available on OSX") endif() @@ -32,27 +32,25 @@ else() list(APPEND FEATURE_OPTIONS -Dcoretext=disabled) endif() if("glib" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -Dglib=enabled) - list(APPEND FEATURE_OPTIONS -Dgobject=enabled) + list(APPEND FEATURE_OPTIONS -Dglib=enabled) # Enable GLib unicode functions + list(APPEND FEATURE_OPTIONS -Dgobject=enabled) #Enable GObject bindings else() list(APPEND FEATURE_OPTIONS -Dglib=disabled) list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() -list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) -#if(VCPKG_TARGET_IS_WINDOWS) -# list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # This breaks qt5-base:x64-windows-static due to missing libraries being link against. -#elseif(VCPKG_TARGET_IS_OSX) -# list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) -#endif() +list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # Enable GDI helpers and Uniscribe shaper backend (Windows only) +endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} - -Dcairo=disabled - -Dfontconfig=disabled - -Dintrospection=disabled - -Ddocs=disabled + -Dcairo=disabled # Use Cairo graphics library + -Dfontconfig=disabled # Use fontconfig + -Dintrospection=disabled # Generate gobject-introspection bindings (.gir/.typelib files) + -Ddocs=disabled # Generate documentation with gtk-doc -Dtests=disabled -Dbenchmark=disabled ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' @@ -83,41 +81,3 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -# # HarfBuzz feature options -# option('glib', type: 'feature', value: 'auto', - # description: 'Enable GLib unicode functions') -# option('gobject', type: 'feature', value: 'auto', - # description: 'Enable GObject bindings') -# option('cairo', type: 'feature', value: 'auto', - # description: 'Use Cairo graphics library') -# option('fontconfig', type: 'feature', value: 'auto', - # description: 'Use fontconfig') -# option('icu', type: 'feature', value: 'auto', - # description: 'Enable ICU library unicode functions') -# option('graphite', type: 'feature', value: disabled, - # description: 'Enable Graphite2 complementary shaper') -# option('freetype', type: 'feature', value: 'auto', - # description: 'Enable freetype interop helpers') -# option('gdi', type: 'feature', value: disabled, - # description: 'Enable GDI helpers and Uniscribe shaper backend (Windows only)') -# option('directwrite', type: 'feature', value: disabled, - # description: 'Enable DirectWrite shaper backend on Windows (experimental)') -# option('coretext', type: 'feature', value: disabled, - # description: 'Enable CoreText shaper backend on macOS') - -# # Common feature options -# option('tests', type: 'feature', value: enabled, yield: true, - # description: 'Enable or disable unit tests') -# option('introspection', type: 'feature', value: 'auto', yield: true, - # description: 'Generate gobject-introspection bindings (.gir/.typelib files)') -# option('docs', type: 'feature', value: 'auto', yield: true, - # description: 'Generate documentation with gtk-doc') - -# option('benchmark', type: 'feature', value: 'auto', - # description: 'Enable benchmark tests') -# option('icu_builtin', type: 'boolean', value: false, - # description: 'Don\'t separate ICU support as harfbuzz-icu module') -# option('experimental_api', type: 'boolean', value: false, - # description: 'Enable experimental APIs') -# option('fuzzer_ldflags', type: 'string', - # description: 'Extra LDFLAGS used during linking of fuzzing binaries') \ No newline at end of file diff --git a/ports/libgpod/portfile.cmake b/ports/libgpod/portfile.cmake index 142bb78dcc9573..397f0e5d125313 100644 --- a/ports/libgpod/portfile.cmake +++ b/ports/libgpod/portfile.cmake @@ -9,17 +9,6 @@ vcpkg_from_github( PATCHES configure.ac.patch ) -#file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -# vcpkg_configure_cmake( - # SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA - # OPTIONS ${FEATURE_OPTIONS} - # -DLIBGPOD_BLOB_DIR=${CURRENT_PACKAGES_DIR}/tools -# ) -# vcpkg_install_cmake() - -#file(COPY "/usr/share/gtk-doc/data/gtk-doc.make" DESTINATION "${SOURCE_PATH}") vcpkg_execute_required_process( COMMAND intltoolize --force --copy --automake WORKING_DIRECTORY "${SOURCE_PATH}" diff --git a/ports/libplist/vcpkg.json b/ports/libplist/vcpkg.json index 7497f76387c09c..752fd8b26c4072 100644 --- a/ports/libplist/vcpkg.json +++ b/ports/libplist/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libplist", - "version-string": "1.3.6", + "version": "1.3.6", "port-version": 1, - "description": "A library to handle Apple Property List format in binary or XML" + "description": "A library to handle Apple Property List format in binary or XML", + "homepage": "https://libimobiledevice.org/" } From a3613b1d6e548d5c5ee3a9b14c2e5b35baf8dcb1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 16:01:27 +0200 Subject: [PATCH 161/182] version stuff --- versions/baseline.json | 2 +- versions/c-/cairo.json | 4 ++-- versions/c-/cairomm.json | 4 ++-- versions/f-/fluidsynth.json | 2 +- versions/g-/gdk-pixbuf.json | 2 +- versions/g-/glibmm.json | 6 +++--- versions/g-/gtk.json | 4 ++-- versions/g-/gtkmm.json | 4 ++-- versions/h-/harfbuzz.json | 2 +- versions/l-/libgpod.json | 2 +- versions/l-/libplist.json | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 0733e856ff9f43..f0f0d92eb45a12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2254,7 +2254,7 @@ }, "glibmm": { "baseline": "2.68.0", - "port-version": 1 + "port-version": 0 }, "glm": { "baseline": "0.9.9.8", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index d2508bc211e3b9..745c0f449a39af 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "822a5c6f6c4e73a5d1574c5b3e5d7ed4a232ddbb", - "version-string": "1.16.0", + "git-tree": "e202120abe2e7351f6299912398cf3da0b9f7c87", + "version": "1.16.0", "port-version": 10 }, { diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 12d9e14473b924..4ceb12945d4812 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "fda0f2c6e42e18db762de9668cd987eac7b9a6ca", - "version-string": "1.16.0", + "git-tree": "3af73cd5093260902589ca1a3fc6b7755edd236e", + "version": "1.16.0", "port-version": 0 }, { diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 7baa6a3411ca29..3929fbd1377abc 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4f73dd799fe5519221d3ea5bf37004d3329f3c69", + "git-tree": "78c179004d27468421063f727d8d6a6a40cebcee", "version": "2.1.4", "port-version": 1 }, diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index dc26fb1ec0d005..17dd3e8dd8227f 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1d52875078dbbff69ddc0937ff5c53418dce624", + "git-tree": "2179a71ba3726d7073e467689af0525d7a0b1bde", "version-string": "2.42.2", "port-version": 0 }, diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index d3a1767cee8ad4..312505fdf3a1e0 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "2e482b2eb7d99e443ff3912c669b6f9cffdb6bdf", - "version-string": "2.68.0", - "port-version": 1 + "git-tree": "10c82a3482a15ed995a4575edd4e080c8024cae5", + "version": "2.68.0", + "port-version": 0 }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 6f91777db75251..5ecf1bdf30b4cf 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "a6b02a605b5c6a4abbaec1604f08bb6ab23031d4", - "version-string": "4.0.1", + "git-tree": "643bf0a427ba899a95237f15321dd853ddd0128a", + "version": "4.0.1", "port-version": 0 }, { diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 45ad31effab825..283c05e3907d4d 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "1b5c68088c447581b71dbf5846779f0c019ebe23", - "version-string": "4.0.0", + "git-tree": "110c7a19db18df0aceb68d442788e3cd2cdd9af4", + "version": "4.0.0", "port-version": 0 }, { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 284b07685df40f..1a89cc3ff5e065 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fd09141561b4c328b19f9c7e1609ee92c39d6421", + "git-tree": "e3e4a49dc9672ca66cd49a85ce9b4465d2e2ca96", "version-string": "2.7.4", "port-version": 2 }, diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index 265245cb0b14af..b84f9fce9137c1 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c9a7c9e5f2f8b9fdb6eca8464cad3c858f7b4f05", + "git-tree": "7b5f8f2439b17ec9264b0eb77879a540d3fc644b", "version-string": "2019-08-29", "port-version": 3 }, diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index a8185c2d47ad94..7cc06986502d29 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "dd36e85a36046ba00a462a8d904608adfa8a1e03", - "version-string": "1.3.6", + "git-tree": "75eb83284f3361bf04af84e67e0ed0439432c3f5", + "version": "1.3.6", "port-version": 1 }, { From db5dab68d812a39e9b2b84eb6627d1dffd4499a0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 16:02:06 +0200 Subject: [PATCH 162/182] formating --- ports/atkmm/vcpkg.json | 1 - ports/glibmm/vcpkg.json | 1 - ports/libxmlpp/vcpkg.json | 1 - 3 files changed, 3 deletions(-) diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index b0c3884ef2cbc3..832fa3b98da9c1 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "atkmm", "version": "2.36.0", - "port-version": 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", diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index 016dcbd5159c12..ddd4b7ef69b0ad 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glibmm", "version": "2.68.0", - "port-version": 0, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "supports": "!uwp", diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index 476a8cb735854d..ca45f1bc5041bf 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxmlpp", "version": "5.0.0", - "port-version": 0, "description": "a C++ wrapper for the libxml XML parser library.", "supports": "!(windows & static)", "dependencies": [ From caa89f0306dfa3eda0e1520e1333f9b83ef962ca Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 16:02:46 +0200 Subject: [PATCH 163/182] update version stuff again --- versions/a-/atkmm.json | 2 +- versions/g-/glibmm.json | 2 +- versions/l-/libxmlpp.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index d303fcd363656b..dea5102e4e8506 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "390c0901f1e0c56c11423b85f3a99a651203d2c4", + "git-tree": "f8339b44b255349a6e9ba586510c459a0c8b8a09", "version": "2.36.0", "port-version": 0 }, diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 312505fdf3a1e0..597c0a4ced7323 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "10c82a3482a15ed995a4575edd4e080c8024cae5", + "git-tree": "6b9a6c830d610bf0063e5b6ef8fce9652f40c663", "version": "2.68.0", "port-version": 0 }, diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 923950851f00f7..7f267720f7013a 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0521700c3d80c667604af711d4d95cb78b42163e", + "git-tree": "d07dfcf7dec94fb335a4470a19796af791094671", "version": "5.0.0", "port-version": 0 }, From d1f711c8f4e29e919f6a9929cca31034bfe04b5c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 16:44:15 +0200 Subject: [PATCH 164/182] remove gdi again --- ports/harfbuzz/portfile.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 56486acbaa50c1..dcaf22fee3d496 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -39,9 +39,10 @@ else() list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # Enable GDI helpers and Uniscribe shaper backend (Windows only) -endif() +# if(VCPKG_TARGET_IS_WINDOWS) + # Link errors in qt5-base. Probably requires changes to the pc files generated by meson + # list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # Enable GDI helpers and Uniscribe shaper backend (Windows only) +# endif() vcpkg_configure_meson( From 0e006218d70f0e0d4bbabe8400033ba43db52385 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 16:44:51 +0200 Subject: [PATCH 165/182] version stuff --- versions/h-/harfbuzz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 1a89cc3ff5e065..8f99f9daee6aeb 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e3e4a49dc9672ca66cd49a85ce9b4465d2e2ca96", + "git-tree": "6092824dde0302279d11baf13362ed868ba167ca", "version-string": "2.7.4", "port-version": 2 }, From 235ff4dd1a3f55722a8fe603a06b25c00aa29177 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 21:03:10 +0200 Subject: [PATCH 166/182] version stuff --- versions/baseline.json | 4 ++-- versions/g-/glib.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index e20cb0d6e3d78d..dbed642ca080dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2249,8 +2249,8 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 27 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { "baseline": "2.52.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 6c9cbdbe7c99b2..819fc4af5c1ca7 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb75f3fbbbf9385d7863533db0f9af517f11850", + "version-string": "2.66.4", + "port-version": 0 + }, { "git-tree": "715922ed1f6f71651f144fbe59d9aab441bd4b10", "version-string": "2.52.3", From 76938c851f05714ee9d5118855163a36e69bd592 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 12 Apr 2021 22:30:39 +0200 Subject: [PATCH 167/182] version baseline --- versions/baseline.json | 92 +++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index dbed642ca080dc..434ed4600d552c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 1 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 0 }, "atlmfc": { "baseline": "0", @@ -1074,11 +1074,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 9 + "port-version": 10 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 5 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1093,8 +1093,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -1998,7 +1998,7 @@ }, "fluidsynth": { "baseline": "2.1.4", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2161,8 +2161,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2253,8 +2253,8 @@ "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 0 }, "glm": { "baseline": "0.9.9.8", @@ -2282,7 +2282,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2326,7 +2326,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "graphicsmagick": { "baseline": "1.3.36", @@ -2369,16 +2369,16 @@ "port-version": 4 }, "gtk": { - "baseline": "3.22.19-4", + "baseline": "4.0.1", "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2410,7 +2410,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", @@ -2510,7 +2510,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2634,7 +2634,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2890,7 +2890,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -2990,7 +2990,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -3102,7 +3102,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3242,7 +3242,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 4 + "port-version": 5 }, "libmikmod": { "baseline": "3.3.11.1-8", @@ -3286,7 +3286,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3358,7 +3358,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3421,8 +3421,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 3 }, "librsync": { "baseline": "2020-09-16", @@ -3449,12 +3449,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.31", @@ -3629,8 +3629,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0.0", + "port-version": 0 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4617,16 +4617,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 14 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4741,8 +4741,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -4826,7 +4826,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 4 + "port-version": 5 }, "popsift": { "baseline": "0.9", @@ -5914,7 +5914,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 7 + "port-version": 8 }, "tfhe": { "baseline": "1.0.1-1", @@ -6250,7 +6250,7 @@ }, "v8": { "baseline": "8.6.395.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", From b2d72bf92cdc5073cb9456543b7bc39879cfb853 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 15 Apr 2021 12:58:26 -0700 Subject: [PATCH 168/182] Apply strega-nil suggestions from code review --- ports/atk/vcpkg.json | 1 - ports/glib/portfile.cmake | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index 82c5394fcfafd4..57ace73fbadf46 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "atk", "version-string": "2.36.0", - "port-version": 1, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "supports": "!(osx | arm)", diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 3446e4da4c5b94..1a0d01a09751c8 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -24,8 +24,10 @@ vcpkg_extract_source_archive_ex( ) -if (selinux IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") - message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") +if (selinux IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") + message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") + endif() list(APPEND OPTIONS -Dselinux=enabled) else() list(APPEND OPTIONS -Dselinux=disabled) @@ -89,8 +91,8 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() IF(VCPKG_TARGET_IS_WINDOWS) set(SYSTEM_LIBRARIES dnsapi iphlpapi winmm lshlwapi) @@ -121,4 +123,4 @@ string(REPLACE "path = os.path.join(filedir, '..', 'share', 'glib-2.0')" "path = string(REPLACE "path = os.path.join(filedir, '..')" "path = os.path.join(filedir, '../../share/glib-2.0')" _contents "${_contents}") string(REPLACE "path = os.path.join('${CURRENT_PACKAGES_DIR}/share', 'glib-2.0')" "path = os.path.join('unuseable/share', 'glib-2.0')" _contents "${_contents}") -file(WRITE "${_file}" "${_contents}") \ No newline at end of file +file(WRITE "${_file}" "${_contents}") From a222885e973f0808ddf1adabbe6e78480313affe Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Thu, 15 Apr 2021 13:02:28 -0700 Subject: [PATCH 169/182] run x-add-version --- versions/a-/atk.json | 4 ++-- versions/baseline.json | 2 +- versions/g-/glib.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 438ff5c6aee577..9486790e749b1f 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "e56c2c8924211cfba7dd9cb337ae443648dd47aa", + "git-tree": "89835b306e6aea61516702330d4966cc07333656", "version-string": "2.36.0", - "port-version": 1 + "port-version": 0 }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", diff --git a/versions/baseline.json b/versions/baseline.json index 434ed4600d552c..037227d8404c36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -178,7 +178,7 @@ }, "atk": { "baseline": "2.36.0", - "port-version": 1 + "port-version": 0 }, "atkmm": { "baseline": "2.36.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 819fc4af5c1ca7..d0e33cda2c36c9 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7fb75f3fbbbf9385d7863533db0f9af517f11850", + "git-tree": "0e66fafcba4872e5bdb12f8dbc3add0e1e4b7915", "version-string": "2.66.4", "port-version": 0 }, From 2ccf17eec4b6f27fade48fa77544f2490a108c8b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 12:29:32 +0200 Subject: [PATCH 170/182] reset versions to upstream/master --- versions/a-/atk.json | 5 ----- versions/a-/atkmm.json | 5 ----- versions/c-/cairo.json | 5 ----- versions/c-/cairomm.json | 5 ----- versions/c-/cartographer.json | 5 ----- versions/f-/fluidsynth.json | 2 +- versions/g-/gdk-pixbuf.json | 5 ----- versions/g-/glib.json | 5 ----- versions/g-/glibmm.json | 5 ----- versions/g-/gmime.json | 5 ----- versions/g-/graphene.json | 5 ----- versions/g-/gtk.json | 5 ----- versions/g-/gtkmm.json | 5 ----- versions/g-/gts.json | 5 ----- versions/h-/harfbuzz.json | 5 ----- versions/i-/ignition-cmake2.json | 5 ----- versions/i-/io2d.json | 5 ----- versions/l-/lcm.json | 5 ----- versions/l-/libcroco.json | 5 ----- versions/l-/libgpod.json | 5 ----- versions/l-/libmicrohttpd.json | 5 ----- versions/l-/libnice.json | 5 ----- versions/l-/libplist.json | 5 ----- versions/l-/librsvg.json | 5 ----- versions/l-/libsigcpp-3.json | 5 ----- versions/l-/libsigcpp.json | 5 ----- versions/l-/libxmlpp.json | 5 ----- versions/p-/pango.json | 5 ----- versions/p-/pangomm.json | 5 ----- versions/p-/pixman.json | 5 ----- versions/p-/poppler.json | 5 ----- versions/t-/tesseract.json | 5 ----- 32 files changed, 1 insertion(+), 156 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 9486790e749b1f..163f0e3aed978e 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "89835b306e6aea61516702330d4966cc07333656", - "version-string": "2.36.0", - "port-version": 0 - }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index dea5102e4e8506..e239881ae79757 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "f8339b44b255349a6e9ba586510c459a0c8b8a09", - "version": "2.36.0", - "port-version": 0 - }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index abe050fe2da1d5..833baaa4ea372a 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "e202120abe2e7351f6299912398cf3da0b9f7c87", - "version": "1.16.0", - "port-version": 11 - }, { "git-tree": "aa8df97c4b06bf590dc04ad931a08f0bf1e47471", "version-string": "1.16.0", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 35a27c186e2150..eb60a9dcf9fa39 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "3af73cd5093260902589ca1a3fc6b7755edd236e", - "version": "1.16.0", - "port-version": 0 - }, { "git-tree": "208a6f99a6fbc0239696b79653d769568ca603cc", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index f9f52e9bd22c02..71eb9875c12507 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "4f01cd599fa1b8bbd970a22c5999951e70f06b76", - "version-string": "1.0.0", - "port-version": 4 - }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 3929fbd1377abc..4df819b93189ba 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "78c179004d27468421063f727d8d6a6a40cebcee", + "git-tree": "e0fa8719cb1348a12b177ffdba4943891bede664", "version": "2.1.4", "port-version": 1 }, diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 17dd3e8dd8227f..b97d4dc18f7215 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2179a71ba3726d7073e467689af0525d7a0b1bde", - "version-string": "2.42.2", - "port-version": 0 - }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index d0e33cda2c36c9..6c9cbdbe7c99b2 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "0e66fafcba4872e5bdb12f8dbc3add0e1e4b7915", - "version-string": "2.66.4", - "port-version": 0 - }, { "git-tree": "715922ed1f6f71651f144fbe59d9aab441bd4b10", "version-string": "2.52.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 597c0a4ced7323..4cf69bdaf52f74 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6b9a6c830d610bf0063e5b6ef8fce9652f40c663", - "version": "2.68.0", - "port-version": 0 - }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index dd3c9a42a9bfb8..2e7e8725fd3c3e 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "ee8e1ef92eea0de4ca85bf46aec30da062581de3", - "version-string": "3.2.6", - "port-version": 2 - }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 2c57a745898c5e..3ebae9736547c3 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "78bc1d9d9b69e9f1f8f7e10a0f60fd810f875504", - "version-string": "1.10.2", - "port-version": 1 - }, { "git-tree": "002959491c215c722047465a93b05d078d743864", "version-string": "1.10.2", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 5ecf1bdf30b4cf..f56dba6ffdc30e 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "643bf0a427ba899a95237f15321dd853ddd0128a", - "version": "4.0.1", - "port-version": 0 - }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 283c05e3907d4d..3b53b748c7077b 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "110c7a19db18df0aceb68d442788e3cd2cdd9af4", - "version": "4.0.0", - "port-version": 0 - }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index a53e3e81777020..536f7229e8a253 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "76c979e77ddac0e011563fb106289c19daef37d6", - "version-string": "0.7.6", - "port-version": 4 - }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 8f99f9daee6aeb..7bdb4e94c9a0f2 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6092824dde0302279d11baf13362ed868ba167ca", - "version-string": "2.7.4", - "port-version": 2 - }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index 772e6622e730ad..f229c494bdb39e 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "cc2f4260711853f32ae2a5a8adf2fb8a1df9d4ca", - "version-string": "2.5.0", - "port-version": 1 - }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index 6cdd5e12b97ad0..dd9370afdbb5b8 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7d0772b90b868ce5a0fe022b7108be8c416b4f4b", - "version-string": "2020-09-14", - "port-version": 2 - }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index 2900921de17880..fef7df868650a2 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "3269aef446ddceeb331723b2d201559e424cc5f2", - "version-string": "1.4.0", - "port-version": 2 - }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index a918c6979269ad..698b3aa5e5e7c7 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "e0e5e0ae88e2110f6d8a0ba47d79e4484d21e250", - "version-string": "0.6.13", - "port-version": 3 - }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index b84f9fce9137c1..a9f78ea687d836 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "7b5f8f2439b17ec9264b0eb77879a540d3fc644b", - "version-string": "2019-08-29", - "port-version": 3 - }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index 14d69f741cc0f7..dc63982f4d9d8c 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", - "version-string": "0.9.63", - "port-version": 5 - }, { "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", "version-string": "0.9.63", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 1bf1e65e1363cf..8da130a656e44f 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2d38bf95d924a4593e2f68bfda7346dbce84937e", - "version-string": "0.1.15", - "port-version": 7 - }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index 7cc06986502d29..ad060ee201e27a 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "75eb83284f3361bf04af84e67e0ed0439432c3f5", - "version": "1.3.6", - "port-version": 1 - }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index dd7bd19b72388f..8ec19294d84978 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "0de6b9c0d9dc0ada7b9223669bb08e9ef146aa7a", - "version": "2.40.20", - "port-version": 3 - }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json index 069ab1a71e7b3d..2ac14dd336ea2e 100644 --- a/versions/l-/libsigcpp-3.json +++ b/versions/l-/libsigcpp-3.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6e09df080412a20aaf2755e78cd4314168fb8853", - "version-string": "3.0.3", - "port-version": 1 - }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index cb960085a55edb..8b666ff86ef141 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "329fb670d579bd3dca135f414d4d3af17e88ff37", - "version-string": "3.0.3", - "port-version": 0 - }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 7f267720f7013a..0bdfeffe82817a 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "d07dfcf7dec94fb335a4470a19796af791094671", - "version": "5.0.0", - "port-version": 0 - }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 330810263a2431..45c690134486d1 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "82db6bfbd3cb657347bfa89d2a37d7115494285c", - "version-string": "1.48.0", - "port-version": 0 - }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 83f00382087e78..5bca77f4691273 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "8e797d73f60daf865977159036493f482343aa6b", - "version-string": "2.48.0", - "port-version": 0 - }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 922c4c1562c3d0..6daee6513416f1 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "85a752b4e32b7e30ee11eb4dde7f1779f421974c", - "version-string": "0.40.0", - "port-version": 0 - }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 3596cede5f2119..aa5ea95145df5f 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "3af3a74201527add29fdc677104f1f2af79eda05", - "version-string": "20.12.1", - "port-version": 5 - }, { "git-tree": "39df7895fae1b7440dd7c453679f6e0d782a8a5a", "version-string": "20.12.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 7909d2dfe7a4fe..6fa7f4fa614b18 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "6008422c10e6cbf7627c4bcdc7e189f26faf08d6", - "version-string": "4.1.1", - "port-version": 8 - }, { "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109", "version-string": "4.1.1", From c7062e7f731d2675622b7befc0bb6de8dc724058 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 12:29:48 +0200 Subject: [PATCH 171/182] v8 CONTROL -> json --- ports/v8/CONTROL | 6 ------ ports/v8/vcpkg.json | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 ports/v8/CONTROL diff --git a/ports/v8/CONTROL b/ports/v8/CONTROL deleted file mode 100644 index a65e6ccd26d76c..00000000000000 --- a/ports/v8/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: v8 -Version: 9.0.257.17 -Homepage: https://v8.dev -Description: Google Chrome's JavaScript engine -Build-Depends: icu, zlib, glib (linux), pthread (linux) -Supports: !(arm|arm64|uwp|osx) diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index 30d7258a100750..54a25d578610da 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -1,6 +1,6 @@ { "name": "v8", - "version-string": "8.6.395.17", + "version-string": "9.0.257.17", "port-version": 1, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", From f0ae05234208a28ce85fc744c66b1924be8ef401 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 12:30:37 +0200 Subject: [PATCH 172/182] reset fluidsynth to upstream/master --- ports/fluidsynth/portfile.cmake | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 0de37037cc8261..6bb27bb9c37549 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -7,33 +7,17 @@ vcpkg_from_github( PATCHES force-x86-gentables.patch ) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "dbus" enable-dbus - "jack" enable-jack - "libinstpatch" enable-libinstpatch - "libsndfile" enable-libsndfile - "midishare" enable-midishare - "opensles" enable-opensles - "oboe" enable-oboe - "oss" enable-oss - "sdl2" enable-sdl2 - "pulseaudio" enable-pulseaudio - "readline" enable-readline - #platform dependent: - "lash" enable-lash - "alsa" enable-alsa - "systemd" enable-systemd - "coreaudio" enable-coreaudio - "coremidi" enable-coremidi - "dart" enable-dart -) + +set(feature_list dbus jack libinstpatch libsndfile midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart) +set(FEATURE_OPTIONS) +foreach(_feature IN LISTS feature_list) + list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) +endforeach() vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} OPTIONS_DEBUG From f946179fbbc25cdd702af56ed653e00dfd2e836c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 12:37:26 +0200 Subject: [PATCH 173/182] first batch of version-string -> version conversion --- ports/atk/vcpkg.json | 2 +- ports/cartographer/vcpkg.json | 2 +- ports/gdk-pixbuf/vcpkg.json | 2 +- ports/glib/vcpkg.json | 2 +- ports/gmime/vcpkg.json | 2 +- ports/graphene/vcpkg.json | 2 +- ports/gts/vcpkg.json | 2 +- ports/harfbuzz/portfile.cmake | 8 ++++---- ports/harfbuzz/vcpkg.json | 2 +- ports/pango/vcpkg.json | 2 +- ports/pangomm/vcpkg.json | 2 +- ports/pixman/vcpkg.json | 2 +- ports/tesseract/vcpkg.json | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index 57ace73fbadf46..7cbda67be2c68a 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "atk", - "version-string": "2.36.0", + "version": "2.36.0", "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "supports": "!(osx | arm)", diff --git a/ports/cartographer/vcpkg.json b/ports/cartographer/vcpkg.json index b5f5f1076f4524..78acff4dd15afb 100644 --- a/ports/cartographer/vcpkg.json +++ b/ports/cartographer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cartographer", - "version-string": "1.0.0", + "version": "1.0.0", "port-version": 4, "description": "Google 2D & 3D SLAM package", "homepage": "https://github.com/googlecartographer/cartographer", diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index a92376db3b0bfe..c123f6a3e7d015 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdk-pixbuf", - "version-string": "2.42.2", + "version": "2.42.2", "description": "Image loading library.", "homepage": "https://developer.gnome.org/gdk-pixbuf/", "dependencies": [ diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index a0d019694b0bed..16e6b397867f99 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glib", - "version-string": "2.66.4", + "version": "2.66.4", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", diff --git a/ports/gmime/vcpkg.json b/ports/gmime/vcpkg.json index 7681bb85e3ddf5..356f24e44e7277 100644 --- a/ports/gmime/vcpkg.json +++ b/ports/gmime/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gmime", - "version-string": "3.2.6", + "version": "3.2.6", "port-version": 2, "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", "homepage": "https://developer.gnome.org/gmime/", diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index 4caa0c71694f18..8849b4d42d4ce9 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,6 +1,6 @@ { "name": "graphene", - "version-string": "1.10.2", + "version": "1.10.2", "port-version": 1, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json index 2ad1fdd2d04763..45de1e6a448c62 100644 --- a/ports/gts/vcpkg.json +++ b/ports/gts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gts", - "version-string": "0.7.6", + "version": "0.7.6", "port-version": 4, "description": "A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles", "homepage": "https://github.com/finetjul/gts", diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index dcaf22fee3d496..f4522b075329d1 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -39,10 +39,10 @@ else() list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers -# if(VCPKG_TARGET_IS_WINDOWS) - # Link errors in qt5-base. Probably requires changes to the pc files generated by meson - # list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # Enable GDI helpers and Uniscribe shaper backend (Windows only) -# endif() +if(VCPKG_TARGET_IS_WINDOWS) + #link errors in qt5-base. probably requires changes to the pc files generated by meson + list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only) +endif() vcpkg_configure_meson( diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 29196a2e083907..1fc28ff5ad2f1b 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version-string": "2.7.4", + "version": "2.7.4", "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 72f4bf22b4b13a..a1c209d6556d9b 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pango", - "version-string": "1.48.0", + "version": "1.48.0", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "dependencies": [ diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index 4eeccd1114bf9c..9260a460fb91fd 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pangomm", - "version-string": "2.48.0", + "version": "2.48.0", "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pangomm", "dependencies": [ diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json index d63b8be85d3c4e..17284edad02e9f 100644 --- a/ports/pixman/vcpkg.json +++ b/ports/pixman/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pixman", - "version-string": "0.40.0", + "version": "0.40.0", "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", "dependencies": [ diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index d3366a25919175..4418a631100977 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tesseract", - "version-string": "4.1.1", + "version": "4.1.1", "port-version": 8, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", From 4f94418f15168187db7866f250736f73c9bdd713 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 12:41:07 +0200 Subject: [PATCH 174/182] second and last batch of version-string -> version conversions --- ports/lcm/vcpkg.json | 2 +- ports/libcroco/vcpkg.json | 2 +- ports/libnice/vcpkg.json | 2 +- ports/libsigcpp-3/vcpkg.json | 2 +- ports/libsigcpp/vcpkg.json | 2 +- ports/poppler/vcpkg.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/lcm/vcpkg.json b/ports/lcm/vcpkg.json index 5ca564f61c7deb..ec04fd87b91c52 100644 --- a/ports/lcm/vcpkg.json +++ b/ports/lcm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lcm", - "version-string": "1.4.0", + "version": "1.4.0", "port-version": 2, "description": [ "Lightweight Communications and Marshalling (LCM)", diff --git a/ports/libcroco/vcpkg.json b/ports/libcroco/vcpkg.json index 0befe1e7708271..f6781ed63b2675 100644 --- a/ports/libcroco/vcpkg.json +++ b/ports/libcroco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcroco", - "version-string": "0.6.13", + "version": "0.6.13", "port-version": 3, "description": "A standalone css2 parsing and manipulation library", "dependencies": [ diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index c291b1cdf070ad..16802d092bf276 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnice", - "version-string": "0.1.15", + "version": "0.1.15", "port-version": 7, "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "homepage": "https://nice.freedesktop.org", diff --git a/ports/libsigcpp-3/vcpkg.json b/ports/libsigcpp-3/vcpkg.json index 17eb13485e04f0..a52d20dc9c7a3d 100644 --- a/ports/libsigcpp-3/vcpkg.json +++ b/ports/libsigcpp-3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsigcpp-3", - "version-string": "3.0.3", + "version": "3.0.3", "port-version": 1, "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index d83530b95be02e..bf94085c59ab16 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsigcpp", - "version-string": "3.0.3", + "version": "3.0.3", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" } diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 57587f343393a2..b9c59fb01f00bb 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,6 +1,6 @@ { "name": "poppler", - "version-string": "20.12.1", + "version": "20.12.1", "port-version": 5, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", From 4b9983fd7bc71a3cc106ea0c33d5e4adc15dfb2b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 12:42:12 +0200 Subject: [PATCH 175/182] update version stuff --- versions/a-/atk.json | 5 ++ versions/a-/atkmm.json | 5 ++ versions/baseline.json | 94 ++++++++++++++++---------------- versions/c-/cairo.json | 5 ++ versions/c-/cairomm.json | 5 ++ versions/c-/cartographer.json | 5 ++ versions/g-/gdk-pixbuf.json | 5 ++ versions/g-/glib.json | 5 ++ versions/g-/glibmm.json | 5 ++ versions/g-/gmime.json | 5 ++ versions/g-/graphene.json | 5 ++ versions/g-/gtk.json | 5 ++ versions/g-/gtkmm.json | 5 ++ versions/g-/gts.json | 5 ++ versions/h-/harfbuzz.json | 5 ++ versions/i-/ignition-cmake2.json | 5 ++ versions/i-/io2d.json | 5 ++ versions/l-/lcm.json | 5 ++ versions/l-/libcroco.json | 5 ++ versions/l-/libgpod.json | 5 ++ versions/l-/libmicrohttpd.json | 5 ++ versions/l-/libnice.json | 5 ++ versions/l-/libplist.json | 5 ++ versions/l-/librsvg.json | 5 ++ versions/l-/libsigcpp-3.json | 5 ++ versions/l-/libsigcpp.json | 5 ++ versions/l-/libxmlpp.json | 5 ++ versions/p-/pango.json | 5 ++ versions/p-/pangomm.json | 5 ++ versions/p-/pixman.json | 5 ++ versions/p-/poppler.json | 5 ++ versions/t-/tesseract.json | 5 ++ versions/v-/v8.json | 5 ++ 33 files changed, 207 insertions(+), 47 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 163f0e3aed978e..8b94467aa89226 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "800b7a24c356c241de1b17f677cbb4700de1d9ae", + "version": "2.36.0", + "port-version": 0 + }, { "git-tree": "28ffcc285239b3ca0d99752bc740f9349f996ad1", "version-string": "2.24.0-5", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index e239881ae79757..dea5102e4e8506 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8339b44b255349a6e9ba586510c459a0c8b8a09", + "version": "2.36.0", + "port-version": 0 + }, { "git-tree": "6147b7b2b6af5fac8a05e48cb4e624fb2fdde235", "version-string": "2.24.2", diff --git a/versions/baseline.json b/versions/baseline.json index a6d75aacff675f..5d70c0fac10647 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,12 +177,12 @@ "port-version": 0 }, "atk": { - "baseline": "2.24.0-5", - "port-version": 2 + "baseline": "2.36.0", + "port-version": 0 }, "atkmm": { - "baseline": "2.24.2", - "port-version": 5 + "baseline": "2.36.0", + "port-version": 0 }, "atlmfc": { "baseline": "0", @@ -1082,11 +1082,11 @@ }, "cairo": { "baseline": "1.16.0", - "port-version": 10 + "port-version": 11 }, "cairomm": { - "baseline": "1.15.3", - "port-version": 6 + "baseline": "1.16.0", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", @@ -1101,8 +1101,8 @@ "port-version": 1 }, "cartographer": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "casclib": { "baseline": "1.50b-1", @@ -2169,8 +2169,8 @@ "port-version": 0 }, "gdk-pixbuf": { - "baseline": "2.36.9-5", - "port-version": 7 + "baseline": "2.42.2", + "port-version": 0 }, "genann": { "baseline": "2019-07-10", @@ -2261,12 +2261,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.52.3", - "port-version": 27 + "baseline": "2.66.4", + "port-version": 0 }, "glibmm": { - "baseline": "2.52.1", - "port-version": 14 + "baseline": "2.68.0", + "port-version": 0 }, "glm": { "baseline": "0.9.9.8", @@ -2294,7 +2294,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 1 + "port-version": 2 }, "gmmlib": { "baseline": "20.3.1", @@ -2338,7 +2338,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "graphicsmagick": { "baseline": "1.3.36", @@ -2381,16 +2381,16 @@ "port-version": 4 }, "gtk": { - "baseline": "3.22.19-4", + "baseline": "4.0.1", "port-version": 0 }, "gtkmm": { - "baseline": "3.22.2", - "port-version": 5 + "baseline": "4.0.0", + "port-version": 0 }, "gts": { - "baseline": "0.7.6-3", - "port-version": 0 + "baseline": "0.7.6", + "port-version": 4 }, "guetzli": { "baseline": "2020-09-14", @@ -2422,7 +2422,7 @@ }, "harfbuzz": { "baseline": "2.7.4", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", @@ -2522,7 +2522,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-common1": { "baseline": "1.1.1-1", @@ -2646,7 +2646,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "irrlicht": { "baseline": "1.8.4-10", @@ -2902,7 +2902,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 }, "lcms": { "baseline": "2.11", @@ -3002,7 +3002,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 2 + "port-version": 3 }, "libcuckoo": { "baseline": "0.3", @@ -3114,7 +3114,7 @@ }, "libgpod": { "baseline": "2019-08-29", - "port-version": 2 + "port-version": 3 }, "libgta": { "baseline": "1.0.8-1", @@ -3254,7 +3254,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 4 + "port-version": 5 }, "libmikmod": { "baseline": "3.3.11.1-8", @@ -3298,7 +3298,7 @@ }, "libnice": { "baseline": "0.1.15", - "port-version": 6 + "port-version": 7 }, "libnoise": { "baseline": "1.0.0", @@ -3370,7 +3370,7 @@ }, "libplist": { "baseline": "1.3.6", - "port-version": 0 + "port-version": 1 }, "libpmemobj-cpp": { "baseline": "1.12", @@ -3433,8 +3433,8 @@ "port-version": 3 }, "librsvg": { - "baseline": "2.40.20-2", - "port-version": 0 + "baseline": "2.40.20", + "port-version": 3 }, "librsync": { "baseline": "2020-09-16", @@ -3461,12 +3461,12 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "2.10-3", - "port-version": 2 + "baseline": "3.0.3", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsndfile": { "baseline": "1.0.31", @@ -3641,8 +3641,8 @@ "port-version": 0 }, "libxmlpp": { - "baseline": "2.40.1", - "port-version": 8 + "baseline": "5.0.0", + "port-version": 0 }, "libxmp-lite": { "baseline": "4.4.1-6", @@ -4633,16 +4633,16 @@ "port-version": 0 }, "pango": { - "baseline": "1.40.11", - "port-version": 9 + "baseline": "1.48.0", + "port-version": 0 }, "pangolin": { "baseline": "0.5", "port-version": 15 }, "pangomm": { - "baseline": "2.40.1", - "port-version": 4 + "baseline": "2.48.0", + "port-version": 0 }, "parallel-hashmap": { "baseline": "1.32", @@ -4757,8 +4757,8 @@ "port-version": 0 }, "pixman": { - "baseline": "0.38.4", - "port-version": 2 + "baseline": "0.40.0", + "port-version": 0 }, "platform-folders": { "baseline": "4.0.0", @@ -4842,7 +4842,7 @@ }, "poppler": { "baseline": "20.12.1", - "port-version": 4 + "port-version": 5 }, "popsift": { "baseline": "0.9", @@ -5930,7 +5930,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 7 + "port-version": 8 }, "tfhe": { "baseline": "1.0.1-1", @@ -6266,7 +6266,7 @@ }, "v8": { "baseline": "9.0.257.17", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "2018-11-17-1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 833baaa4ea372a..c31cbcbb55d8b4 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5e2e3535796b2fb785709ae2273c1243b4aa2fc", + "version": "1.16.0", + "port-version": 11 + }, { "git-tree": "aa8df97c4b06bf590dc04ad931a08f0bf1e47471", "version-string": "1.16.0", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index eb60a9dcf9fa39..f539897acdc4a4 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ffcb8c2d44c5c46d3e3916606ca06e15ab21c1c", + "version": "1.16.0", + "port-version": 0 + }, { "git-tree": "208a6f99a6fbc0239696b79653d769568ca603cc", "version-string": "1.15.3", diff --git a/versions/c-/cartographer.json b/versions/c-/cartographer.json index 71eb9875c12507..6f59ae5c237a6f 100644 --- a/versions/c-/cartographer.json +++ b/versions/c-/cartographer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec66f22ef7f9e652008269b8419a34350d97accf", + "version": "1.0.0", + "port-version": 4 + }, { "git-tree": "1bd9454fd218a1755ab651e97769f69b2d2fc315", "version-string": "1.0.0-3", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index b97d4dc18f7215..a0edc09c95347b 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "692761d7f22953449550f19170430d673a7b75be", + "version": "2.42.2", + "port-version": 0 + }, { "git-tree": "f6d6e3ba09cf7cf29266570a1b6315f406ca5b09", "version-string": "2.36.9-5", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 6c9cbdbe7c99b2..a29fcb758d13e2 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "341ab01f1a30e270603af6d2b934df9c68673a56", + "version": "2.66.4", + "port-version": 0 + }, { "git-tree": "715922ed1f6f71651f144fbe59d9aab441bd4b10", "version-string": "2.52.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 4cf69bdaf52f74..597c0a4ced7323 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b9a6c830d610bf0063e5b6ef8fce9652f40c663", + "version": "2.68.0", + "port-version": 0 + }, { "git-tree": "14ee726ce8905eca50e9cc6d5a478d9401c5954e", "version-string": "2.52.1", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 2e7e8725fd3c3e..a2c2c75ccd52fb 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "149f972ffe6870c4480e0700e8446f1d1dd358eb", + "version": "3.2.6", + "port-version": 2 + }, { "git-tree": "b44824b9edf5ce5c9870802facff3f3097b7977c", "version-string": "3.2.6", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 3ebae9736547c3..01b1a62dc054ba 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc68a8483d158fab83cc8f448305d4ef8630ddc7", + "version": "1.10.2", + "port-version": 1 + }, { "git-tree": "002959491c215c722047465a93b05d078d743864", "version-string": "1.10.2", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index f56dba6ffdc30e..5ecf1bdf30b4cf 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "643bf0a427ba899a95237f15321dd853ddd0128a", + "version": "4.0.1", + "port-version": 0 + }, { "git-tree": "da7eb978b76a72cf192b98a2740cbfbd23b50bb5", "version-string": "3.22.19-4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 3b53b748c7077b..283c05e3907d4d 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "110c7a19db18df0aceb68d442788e3cd2cdd9af4", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "3db7e5662e816c4a10a625f31a4aa77b2331b2fd", "version-string": "3.22.2", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index 536f7229e8a253..3ac6eb676ddb94 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2e045b3685112306e5fcbd493ea6f97fb35a501", + "version": "0.7.6", + "port-version": 4 + }, { "git-tree": "d353bfe6f51567882c443a76763f94a7f7290563", "version-string": "0.7.6-3", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7bdb4e94c9a0f2..73cd8c8be31e36 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "142e0df7866fad8802d1255a3f7e2a66d1b6c73a", + "version": "2.7.4", + "port-version": 2 + }, { "git-tree": "e985af9b39fb57ee491c1a773c43334665ddb3d3", "version-string": "2.7.4", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index f229c494bdb39e..772e6622e730ad 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc2f4260711853f32ae2a5a8adf2fb8a1df9d4ca", + "version-string": "2.5.0", + "port-version": 1 + }, { "git-tree": "79ed070b59395cdd29bbc781269be3eb1d26bfda", "version-string": "2.5.0", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index dd9370afdbb5b8..6cdd5e12b97ad0 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d0772b90b868ce5a0fe022b7108be8c416b4f4b", + "version-string": "2020-09-14", + "port-version": 2 + }, { "git-tree": "4e68bb018148f239aaccd4bfbc24f6a60c344cd6", "version-string": "2020-09-14", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index fef7df868650a2..a0cb98da0626b5 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2094a87ea105e0b1d78db96519581cda97d527e2", + "version": "1.4.0", + "port-version": 2 + }, { "git-tree": "0b549ce3154b5c20db2e2ffaec65b3d1d80705ab", "version-string": "1.4.0", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 698b3aa5e5e7c7..8a70fca46f44ef 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6235588ad9552c72690a152a0e4e108f0f7d1d64", + "version": "0.6.13", + "port-version": 3 + }, { "git-tree": "b561e15c4bff9ec1fcebcf150f10aa343ce8659f", "version-string": "0.6.13", diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index a9f78ea687d836..b84f9fce9137c1 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b5f8f2439b17ec9264b0eb77879a540d3fc644b", + "version-string": "2019-08-29", + "port-version": 3 + }, { "git-tree": "1cd0507330bb60a05e40c4761afd8e687a43b44e", "version-string": "2019-08-29", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index dc63982f4d9d8c..14d69f741cc0f7 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", + "version-string": "0.9.63", + "port-version": 5 + }, { "git-tree": "cac6e4ea3735af7edab56f44c788bb01c987f2cf", "version-string": "0.9.63", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 8da130a656e44f..a6b3d01b0e7383 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5149e313236cfc0ae0e7352e6d151559564bd657", + "version": "0.1.15", + "port-version": 7 + }, { "git-tree": "bc6867011695c2bf8e1d0f0d5b23f1f7f519c0a8", "version-string": "0.1.15", diff --git a/versions/l-/libplist.json b/versions/l-/libplist.json index ad060ee201e27a..7cc06986502d29 100644 --- a/versions/l-/libplist.json +++ b/versions/l-/libplist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75eb83284f3361bf04af84e67e0ed0439432c3f5", + "version": "1.3.6", + "port-version": 1 + }, { "git-tree": "cc421616ea793446b014a26c4132c4648372e398", "version-string": "1.3.6", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 8ec19294d84978..dd7bd19b72388f 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0de6b9c0d9dc0ada7b9223669bb08e9ef146aa7a", + "version": "2.40.20", + "port-version": 3 + }, { "git-tree": "a2517e6695683ed935c8b0e5f4690c51fc2390cb", "version-string": "2.40.20-2", diff --git a/versions/l-/libsigcpp-3.json b/versions/l-/libsigcpp-3.json index 2ac14dd336ea2e..a81ecd827baf29 100644 --- a/versions/l-/libsigcpp-3.json +++ b/versions/l-/libsigcpp-3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62a25fda6418ec8fcf938d39662062aee707edb1", + "version": "3.0.3", + "port-version": 1 + }, { "git-tree": "6956e6da9d0cd0c772810b1ec9bc7815d44474f5", "version-string": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 8b666ff86ef141..e6e8aa269dbc88 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96d31a67a67991ae2449c25ad1dae38858c7b6d7", + "version": "3.0.3", + "port-version": 0 + }, { "git-tree": "01d944fb87f11bec271ba87fe808b5949603f32e", "version-string": "2.10-3", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 0bdfeffe82817a..7f267720f7013a 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d07dfcf7dec94fb335a4470a19796af791094671", + "version": "5.0.0", + "port-version": 0 + }, { "git-tree": "cf3bbc6a0547601cd247497eb4778f11b16c6839", "version-string": "2.40.1", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 45c690134486d1..58d38aa4d9b4a4 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6ec5171759b00868129c32cf99473b1a9ac63e7", + "version": "1.48.0", + "port-version": 0 + }, { "git-tree": "6b8dd172fe2f62afd4508431bd89c50d2510e997", "version-string": "1.40.11", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 5bca77f4691273..309190511eb45a 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e53293199548cf4f5f4686acdd2397ceb4ffe204", + "version": "2.48.0", + "port-version": 0 + }, { "git-tree": "8b74ee567be2a328e81e5afa8a29563b052e846c", "version-string": "2.40.1", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 6daee6513416f1..d75ee619e5d097 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2590ad8d141227ef7ef74c6ec1896459ba09fc42", + "version": "0.40.0", + "port-version": 0 + }, { "git-tree": "3cb6610f632460553bb2ae5fe3838e15880dc7e2", "version-string": "0.38.4", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index aa5ea95145df5f..4ee0511e4a0e8d 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a864cfe9349a7922e6ce0d44a28f6845a40597e0", + "version": "20.12.1", + "port-version": 5 + }, { "git-tree": "39df7895fae1b7440dd7c453679f6e0d782a8a5a", "version-string": "20.12.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 6fa7f4fa614b18..08d629cf1c986e 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0ab88788617df5c670d6c372f431a0356713d3d", + "version": "4.1.1", + "port-version": 8 + }, { "git-tree": "486def9d5e02e287825fb8a27227f2b965a3e109", "version-string": "4.1.1", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index b74a8df5c39690..06644fc6763b11 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c95acd67f1f8b99aada4af754b4608c9ee80661", + "version-string": "9.0.257.17", + "port-version": 1 + }, { "git-tree": "6c755ec3da82205827403e58b0dbaa1549334a3a", "version-string": "9.0.257.17", From b905094ed90c5b2021884f54c183a5f5415c805f Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 20:22:03 +0200 Subject: [PATCH 176/182] disable gdi feature in harfbuzz (missing user32 linkage in qt5-base) --- ports/harfbuzz/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index f4522b075329d1..ad30ce7101d8a0 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -39,10 +39,10 @@ else() list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers -if(VCPKG_TARGET_IS_WINDOWS) +#if(VCPKG_TARGET_IS_WINDOWS) #link errors in qt5-base. probably requires changes to the pc files generated by meson - list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only) -endif() + #list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only) +#endif() vcpkg_configure_meson( From 02cb43fde22bbcee4f02f59c33c9d6abf8879db3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 20 Apr 2021 20:22:35 +0200 Subject: [PATCH 177/182] version stuff --- versions/h-/harfbuzz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 73cd8c8be31e36..c42f365a15f346 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "142e0df7866fad8802d1255a3f7e2a66d1b6c73a", + "git-tree": "3f1e0749ade6fb27bbb6103e1faab23b2719dcda", "version": "2.7.4", "port-version": 2 }, From e54449dc02ff45529de6fc5aae96ff8047512a5a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:34:49 +0200 Subject: [PATCH 178/182] Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/atkmm/portfile.cmake | 10 ++++++---- ports/cairomm/portfile.cmake | 2 -- ports/gdk-pixbuf/portfile.cmake | 3 +-- ports/glibmm/portfile.cmake | 5 +++-- ports/gtk/portfile.cmake | 3 +-- ports/gtkmm/portfile.cmake | 7 ++++--- ports/libxmlpp/portfile.cmake | 15 ++++++++------- ports/pango/portfile.cmake | 1 - 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake index 267c484608cf1e..9f7a7256002306 100644 --- a/ports/atkmm/portfile.cmake +++ b/ports/atkmm/portfile.cmake @@ -14,10 +14,12 @@ vcpkg_extract_source_archive_ex( PATCHES ) -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_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() vcpkg_fixup_pkgconfig() diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index da3d88d93420d0..c20887b0da9064 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -16,9 +16,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -Dbuild-examples=false -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 ) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index a87bf0c93775c1..f235c5b312e27a 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -64,7 +64,6 @@ endif() vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/COPYING ${CURRENT_PACKAGES_DIR}/share/gdk-pixbuf/copyright) +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/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 9880325a837786..5e0dd354318e76 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -14,8 +14,9 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -Dbuild-examples=false - -Dmsvc14x-parallel-installable=false + OPTIONS + -Dbuild-examples=false + -Dmsvc14x-parallel-installable=false ) vcpkg_install_meson() vcpkg_copy_pdbs() diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 37bf387d3f6571..7055090117219d 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -112,8 +112,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtk) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/gtk/COPYING ${CURRENT_PACKAGES_DIR}/share/gtk/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) set(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 68820556413fca..be4a2d2daf0876 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -11,8 +11,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES build.patch - gtkapi.patch #upstream patch to fix dllimport issue + PATCHES + build.patch + gtkapi.patch #upstream patch to fix dllimport issue ) vcpkg_configure_meson( @@ -31,4 +32,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gtkmm" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index 6c951f270cfa94..1620e79b38995d 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -14,13 +14,14 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -Dbuild-documentation=false - -Dvalidation=false # Validate the tutorial XML file - -Dbuild-examples=false - -Dbuild-tests=false - -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 - -Dbuild-deprecated-api=true # Build deprecated API and include it in the library - ) + OPTIONS + -Dbuild-documentation=false + -Dvalidation=false # Validate the tutorial XML file + -Dbuild-examples=false + -Dbuild-tests=false + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dbuild-deprecated-api=true # Build deprecated API and include it in the library +) vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 3830c545d1c6f9..21af6bb0f76883 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Dintrospection=disabled # Build the GObject introspection data for Pango -Dfontconfig=enabled # Build with FontConfig support. From a2110b16fca859b35ee16a12f7b7adbff5636fc3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:41:32 +0200 Subject: [PATCH 179/182] Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/atk/portfile.cmake | 2 +- ports/libsigcpp/portfile.cmake | 5 +++-- ports/pangomm/portfile.cmake | 1 - ports/pixman/portfile.cmake | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index d6d3f1882c7221..c7db3633489d9d 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_configure_meson( OPTIONS -Dintrospection=false 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' + 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_meson() diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 91d869d0ea0d67..7dceaa2f4550e8 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -4,8 +4,9 @@ vcpkg_from_github( REF 7e20b36bddab74faed39aa3768d07fd372fce596 SHA512 6220a3974ee90afb5028a5b60ffcbff353fffbbfcf1570d8db05b6d91604324a73badcb17c73c852d6c5265e2b31e1c2de1b3ea20c0e60ecdb17ce90c9ca40bd HEAD_REF master - PATCHES disable_tests_enable_static_build.patch - version.patch + PATCHES + disable_tests_enable_static_build.patch + version.patch ) vcpkg_configure_cmake( diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index c77eaf88649248..85580c78ca5909 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Dmsvc14x-parallel-installable=false ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index 298912f041e203..43f4f3ddbaf08b 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -45,7 +45,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} - -Dlibpng=enabled + -Dlibpng=enabled ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() From 8d406868a39f9ceabcb9021e5d6e50b12f3f5bc8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 21 Apr 2021 17:42:42 +0200 Subject: [PATCH 180/182] more CR stuff --- ports/graphene/portfile.cmake | 36 ++----------- ports/gtkmm/portfile.cmake | 4 +- ports/ignition-cmake2/vcpkg.json | 2 +- ports/io2d/vcpkg.json | 2 +- ports/libgpod/vcpkg.json | 2 +- ports/pango/0002-remove-hb-glib.diff | 75 ---------------------------- ports/pango/portfile.cmake | 1 - 7 files changed, 8 insertions(+), 114 deletions(-) delete mode 100644 ports/pango/0002-remove-hb-glib.diff diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake index 39c090d3fb5a3e..8b50663679bb62 100644 --- a/ports/graphene/portfile.cmake +++ b/ports/graphene/portfile.cmake @@ -15,9 +15,9 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -Dgtk_doc=false - -Dgobject_types=true - -Dintrospection=false + -Dgtk_doc=false #Enable generating the API reference (depends on GTK-Doc) + -Dgobject_types=true #Enable GObject types (depends on GObject) + -Dintrospection=false #Enable GObject Introspection (depends on GObject)' -Dtests=false -Dinstalled_tests=false ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' @@ -32,32 +32,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) - -# option('gtk_doc', type: 'boolean', - # value: false, - # description: 'Enable generating the API reference (depends on GTK-Doc)') -# option('gobject_types', type: 'boolean', - # value: true, - # description: 'Enable GObject types (depends on GObject)') -# option('introspection', type: 'boolean', - # value: true, - # description: 'Enable GObject Introspection (depends on GObject)') -# option('gcc_vector', type: 'boolean', - # value: true, - # description: 'Enable GCC vector fast paths (requires GCC)') -# option('sse2', type: 'boolean', - # value: true, - # description: 'Enable SSE2 fast paths (requires SSE2 or later)') -# option('arm_neon', type: 'boolean', - # value: true, - # description: 'Enable ARM NEON fast paths (requires ARM)') -# option('tests', type: 'boolean', - # value: true, - # description: 'Build the test suite (requires GObject)') -# option('installed_tests', type: 'boolean', - # value: true, - # description: 'Install tests') - - +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index be4a2d2daf0876..b1964c2455b58e 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -1,6 +1,4 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Error: UWP builds are currently not supported.") -endif() +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.0/gtkmm-4.0.0.tar.xz" diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json index 9cbc55e6927392..52c91489255fb7 100644 --- a/ports/ignition-cmake2/vcpkg.json +++ b/ports/ignition-cmake2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ignition-cmake2", - "version-string": "2.5.0", + "version": "2.5.0", "port-version": 1, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", diff --git a/ports/io2d/vcpkg.json b/ports/io2d/vcpkg.json index 68278bb8c70e99..876616dd9460d6 100644 --- a/ports/io2d/vcpkg.json +++ b/ports/io2d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "io2d", - "version-string": "2020-09-14", + "version-date": "2020-09-14", "port-version": 2, "description": "a lightweight, cross platform drawing library", "dependencies": [ diff --git a/ports/libgpod/vcpkg.json b/ports/libgpod/vcpkg.json index 7538dfb49c07bf..3915e50b11d2bb 100644 --- a/ports/libgpod/vcpkg.json +++ b/ports/libgpod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgpod", - "version-string": "2019-08-29", + "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", diff --git a/ports/pango/0002-remove-hb-glib.diff b/ports/pango/0002-remove-hb-glib.diff deleted file mode 100644 index 10234ae861bd0e..00000000000000 --- 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 - #include - - #include - #include - #include --#include - - #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 --#include -+#include - - /* 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/portfile.cmake b/ports/pango/portfile.cmake index 21af6bb0f76883..ba68c0541f0c5f 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -8,7 +8,6 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PANGO_VERSION} - #PATCHES 0001-fix-static-symbols-export.diff ) vcpkg_configure_meson( From c97b7366e573e9725a424d4a09e061c04c5e7b16 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 21 Apr 2021 17:43:59 +0200 Subject: [PATCH 181/182] update versions --- versions/a-/atk.json | 2 +- versions/a-/atkmm.json | 2 +- versions/c-/cairomm.json | 2 +- versions/g-/gdk-pixbuf.json | 2 +- versions/g-/glibmm.json | 2 +- versions/g-/graphene.json | 2 +- versions/g-/gtk.json | 2 +- versions/g-/gtkmm.json | 2 +- versions/i-/ignition-cmake2.json | 4 ++-- versions/i-/io2d.json | 4 ++-- versions/l-/libgpod.json | 4 ++-- versions/l-/libsigcpp.json | 2 +- versions/l-/libxmlpp.json | 2 +- versions/p-/pango.json | 2 +- versions/p-/pangomm.json | 2 +- versions/p-/pixman.json | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 8b94467aa89226..996b6367fb9d97 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "800b7a24c356c241de1b17f677cbb4700de1d9ae", + "git-tree": "b8ace143cf9715262f419c85a5840fa15a4cf0ce", "version": "2.36.0", "port-version": 0 }, diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index dea5102e4e8506..2f5195231d040e 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f8339b44b255349a6e9ba586510c459a0c8b8a09", + "git-tree": "1feae8dc89c99e89b47bb8a028cca2e77d9d4352", "version": "2.36.0", "port-version": 0 }, diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index f539897acdc4a4..d56ab293ba059c 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3ffcb8c2d44c5c46d3e3916606ca06e15ab21c1c", + "git-tree": "0e16b66d1552c1cbda240f8a11d65895c607e6b5", "version": "1.16.0", "port-version": 0 }, diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index a0edc09c95347b..60824653dd46b6 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "692761d7f22953449550f19170430d673a7b75be", + "git-tree": "609b77f244ec0d76aac5616cd8654dfcbc608297", "version": "2.42.2", "port-version": 0 }, diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 597c0a4ced7323..d2a5d666801d5e 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6b9a6c830d610bf0063e5b6ef8fce9652f40c663", + "git-tree": "6074f2bdadef39758cbfc1238b03dc5051bf774d", "version": "2.68.0", "port-version": 0 }, diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 01b1a62dc054ba..2a1efbf32a4a3a 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dc68a8483d158fab83cc8f448305d4ef8630ddc7", + "git-tree": "1cd3ae48053d2f9b26c2ee6e2e01a413ea6bd0d2", "version": "1.10.2", "port-version": 1 }, diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 5ecf1bdf30b4cf..8641efa67931fa 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "643bf0a427ba899a95237f15321dd853ddd0128a", + "git-tree": "5df8abca385bd61477f2da4217d0a88c3659db82", "version": "4.0.1", "port-version": 0 }, diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 283c05e3907d4d..4ca4b634282208 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "110c7a19db18df0aceb68d442788e3cd2cdd9af4", + "git-tree": "9ba1569a4f12bb1a9aab5fe14c6f6ae23cea20f8", "version": "4.0.0", "port-version": 0 }, diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index 772e6622e730ad..42b3ed6132b782 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "cc2f4260711853f32ae2a5a8adf2fb8a1df9d4ca", - "version-string": "2.5.0", + "git-tree": "6c12bb698575d2b7cff16d177c2601ab195041fa", + "version": "2.5.0", "port-version": 1 }, { diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index 6cdd5e12b97ad0..2d2a519c965d4f 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "7d0772b90b868ce5a0fe022b7108be8c416b4f4b", - "version-string": "2020-09-14", + "git-tree": "b2307aa077fedc3960898d59e9512416be69d25f", + "version-date": "2020-09-14", "port-version": 2 }, { diff --git a/versions/l-/libgpod.json b/versions/l-/libgpod.json index b84f9fce9137c1..09cdc08bd65a7f 100644 --- a/versions/l-/libgpod.json +++ b/versions/l-/libgpod.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "7b5f8f2439b17ec9264b0eb77879a540d3fc644b", - "version-string": "2019-08-29", + "git-tree": "5adfcf9af0bb6d32ba1d2f28df12216795406115", + "version-date": "2019-08-29", "port-version": 3 }, { diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index e6e8aa269dbc88..52173cb9034c9e 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "96d31a67a67991ae2449c25ad1dae38858c7b6d7", + "git-tree": "398cf35cc5235b326dda845e568295841aecc461", "version": "3.0.3", "port-version": 0 }, diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 7f267720f7013a..843b85447034a5 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d07dfcf7dec94fb335a4470a19796af791094671", + "git-tree": "f70632020762c80c63290e7f627e00a0614c0d06", "version": "5.0.0", "port-version": 0 }, diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 58d38aa4d9b4a4..016bed13ac0901 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f6ec5171759b00868129c32cf99473b1a9ac63e7", + "git-tree": "9369409e9dfac69c6eaa6ed5862178dc0d71680f", "version": "1.48.0", "port-version": 0 }, diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 309190511eb45a..58e56d91347bca 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e53293199548cf4f5f4686acdd2397ceb4ffe204", + "git-tree": "d751b0dbf773ade4811729e3a55a8828dac8a78a", "version": "2.48.0", "port-version": 0 }, diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index d75ee619e5d097..9d4faf2fd5ada0 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2590ad8d141227ef7ef74c6ec1896459ba09fc42", + "git-tree": "9fa31a3aa7682c205028903d0b2d2df269a95db5", "version": "0.40.0", "port-version": 0 }, From 793073195b6e22ea0638f80386a51904f9d2bf2c Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 24 Apr 2021 20:00:28 +0200 Subject: [PATCH 182/182] back out provision changes so that pr can be merged. --- scripts/azure-pipelines/linux/provision-image.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index fec17ec9df738f..c04f4b3caac191 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -42,9 +42,6 @@ APT_PACKAGES="$APT_PACKAGES libasound2-dev" # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60" -# Required by libgpod -APT_PACKAGES="$APT_PACKAGES gtk-doc-tools" - sudo apt -y install $APT_PACKAGES # Install newer version of nasm than the apt package, required by intel-ipsec