early-access version 2853
This commit is contained in:
130
externals/vcpkg/ports/fontconfig/libgetopt.patch
vendored
Executable file
130
externals/vcpkg/ports/fontconfig/libgetopt.patch
vendored
Executable file
@@ -0,0 +1,130 @@
|
||||
diff --git a/fc-cache/meson.build b/fc-cache/meson.build
|
||||
index 5e40fac..3c3e46b 100644
|
||||
--- a/fc-cache/meson.build
|
||||
+++ b/fc-cache/meson.build
|
||||
@@ -1,6 +1,7 @@
|
||||
fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
+ dependencies: [getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-cat/meson.build b/fc-cat/meson.build
|
||||
index f26e4b8..476c0f9 100644
|
||||
--- a/fc-cat/meson.build
|
||||
+++ b/fc-cat/meson.build
|
||||
@@ -1,6 +1,7 @@
|
||||
fccat = executable('fc-cat', ['fc-cat.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
+ dependencies: [getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-conflist/meson.build b/fc-conflist/meson.build
|
||||
index f543cf9..f06640b 100644
|
||||
--- a/fc-conflist/meson.build
|
||||
+++ b/fc-conflist/meson.build
|
||||
@@ -1,6 +1,7 @@
|
||||
fcconflist = executable('fc-conflist', ['fc-conflist.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
+ dependencies: [getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-list/meson.build b/fc-list/meson.build
|
||||
index 2f679d5..4b0fb62 100644
|
||||
--- a/fc-list/meson.build
|
||||
+++ b/fc-list/meson.build
|
||||
@@ -1,6 +1,7 @@
|
||||
fclist = executable('fc-list', ['fc-list.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
+ dependencies: [getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-match/meson.build b/fc-match/meson.build
|
||||
index aca8bc8..cab4f09 100644
|
||||
--- a/fc-match/meson.build
|
||||
+++ b/fc-match/meson.build
|
||||
@@ -1,6 +1,7 @@
|
||||
fcmatch = executable('fc-match', ['fc-match.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
+ dependencies: [getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-pattern/meson.build b/fc-pattern/meson.build
|
||||
index 07de245..b957c67 100644
|
||||
--- a/fc-pattern/meson.build
|
||||
+++ b/fc-pattern/meson.build
|
||||
@@ -1,6 +1,7 @@
|
||||
fcpattern = executable('fc-pattern', ['fc-pattern.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
+ dependencies: [getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-query/meson.build b/fc-query/meson.build
|
||||
index d0f2dd4..940b021 100644
|
||||
--- a/fc-query/meson.build
|
||||
+++ b/fc-query/meson.build
|
||||
@@ -1,7 +1,7 @@
|
||||
fcquery = executable('fc-query', ['fc-query.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
- dependencies: [freetype_dep],
|
||||
+ dependencies: [freetype_dep, getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-scan/meson.build b/fc-scan/meson.build
|
||||
index 4de2134..c5b2b67 100644
|
||||
--- a/fc-scan/meson.build
|
||||
+++ b/fc-scan/meson.build
|
||||
@@ -1,7 +1,7 @@
|
||||
fcscan = executable('fc-scan', ['fc-scan.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
- dependencies: [freetype_dep],
|
||||
+ dependencies: [freetype_dep, getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/fc-validate/meson.build b/fc-validate/meson.build
|
||||
index e2b956e..8902d59 100644
|
||||
--- a/fc-validate/meson.build
|
||||
+++ b/fc-validate/meson.build
|
||||
@@ -1,7 +1,7 @@
|
||||
fcvalidate = executable('fc-validate', ['fc-validate.c', fcstdint_h, alias_headers, ft_alias_headers],
|
||||
include_directories: [incbase, incsrc],
|
||||
link_with: [libfontconfig],
|
||||
- dependencies: [freetype_dep],
|
||||
+ dependencies: [freetype_dep, getopt_dep],
|
||||
c_args: c_args,
|
||||
install: true,
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index f616600..6d82a16 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -202,6 +202,14 @@ if cc.links(files('meson-cc-tests/solaris-atomic-operations.c'), name: 'Solaris
|
||||
conf.set('HAVE_SOLARIS_ATOMIC_OPS', 1)
|
||||
endif
|
||||
|
||||
+if host_machine.system() == 'windows'
|
||||
+ conf.set('HAVE_GETOPT', 1)
|
||||
+ conf.set('HAVE_GETOPT_LONG', 1)
|
||||
+ getopt_dep = cc.find_library('getopt', required: true)
|
||||
+else
|
||||
+ getopt_dep = dependency('', required: false)
|
||||
+endif
|
||||
+
|
||||
|
||||
prefix = get_option('prefix')
|
||||
|
||||
19
externals/vcpkg/ports/fontconfig/no-etc-symlinks.patch
vendored
Executable file
19
externals/vcpkg/ports/fontconfig/no-etc-symlinks.patch
vendored
Executable file
@@ -0,0 +1,19 @@
|
||||
--- a/conf.d/link_confs.py 2022-03-24 04:13:59.000982000 +0900
|
||||
+++ b/conf.d/link_confs.py 2022-03-24 04:14:46.271964000 +0900
|
||||
@@ -4,6 +4,7 @@
|
||||
import sys
|
||||
import argparse
|
||||
import platform
|
||||
+import shutil
|
||||
|
||||
if __name__=='__main__':
|
||||
parser = argparse.ArgumentParser()
|
||||
@@ -32,7 +33,7 @@
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
try:
|
||||
- os.symlink(src, dst)
|
||||
+ shutil.copyfile(src, dst)
|
||||
except NotImplementedError:
|
||||
# Not supported on this version of Windows
|
||||
break
|
||||
79
externals/vcpkg/ports/fontconfig/portfile.cmake
vendored
Executable file
79
externals/vcpkg/ports/fontconfig/portfile.cmake
vendored
Executable file
@@ -0,0 +1,79 @@
|
||||
set(FONTCONFIG_VERSION 2.14.0)
|
||||
|
||||
vcpkg_from_gitlab(
|
||||
GITLAB_URL https://gitlab.freedesktop.org
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO fontconfig/fontconfig
|
||||
REF ${FONTCONFIG_VERSION}
|
||||
SHA512 0f36fa503c0277750ff253534f9305c9b4c86fd0d88a470e3b666080951714c51f13a69eecab382d0a7883a07494fc71730213e6086194a92aa5dfc075789e85
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
no-etc-symlinks.patch
|
||||
libgetopt.patch
|
||||
)
|
||||
|
||||
vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
|
||||
|
||||
vcpkg_configure_meson(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS
|
||||
-Ddoc=disabled
|
||||
-Dcache-build=disabled
|
||||
-Dtests=disabled
|
||||
)
|
||||
vcpkg_install_meson(ADD_BIN_TO_PATH)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
#Fix missing libintl static dependency
|
||||
if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
|
||||
if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc" "-liconv" "-liconv -lintl")
|
||||
endif()
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fontconfig.pc" "-liconv" "-liconv -lintl")
|
||||
endif()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
# Fix paths in debug pc file.
|
||||
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc")
|
||||
if(EXISTS "${_file}")
|
||||
file(READ "${_file}" _contents)
|
||||
string(REPLACE "/etc" "/../etc" _contents "${_contents}")
|
||||
string(REPLACE "/var" "/../var" _contents "${_contents}")
|
||||
file(WRITE "${_file}" "${_contents}")
|
||||
endif()
|
||||
|
||||
# Make path to cache in fonts.conf relative
|
||||
set(_file "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
|
||||
if(EXISTS "${_file}")
|
||||
vcpkg_replace_string("${_file}" "${CURRENT_PACKAGES_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig")
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/etc")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
set(DEFINE_FC_PUBLIC "#define FcPublic __declspec(dllimport)")
|
||||
else()
|
||||
set(DEFINE_FC_PUBLIC "#define FcPublic __attribute__((visibility(\"default\")))")
|
||||
endif()
|
||||
foreach(HEADER fcfreetype.h fontconfig.h)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}"
|
||||
"#define FcPublic"
|
||||
"${DEFINE_FC_PUBLIC}"
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
if(NOT VCPKG_TARGET_IS_LINUX)
|
||||
set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper
|
||||
endif()
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
||||
|
||||
vcpkg_copy_tools(
|
||||
TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist
|
||||
AUTO_CLEAN
|
||||
)
|
||||
46
externals/vcpkg/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in
vendored
Executable file
46
externals/vcpkg/ports/fontconfig/vcpkg-cmake-wrapper.cmake.in
vendored
Executable file
@@ -0,0 +1,46 @@
|
||||
_find_package(${ARGS})
|
||||
if(Fontconfig_FOUND) # theoretically this could be skipped. If the wrapper is installed it should be found!
|
||||
find_package(Freetype)
|
||||
if(Freetype_FOUND AND TARGET Fontconfig::Fontconfig)
|
||||
if(TARGET Freetype::Freetype)
|
||||
set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Freetype::Freetype")
|
||||
else()
|
||||
# TODO link Freetype libraries to the target if the target Freetype::Freetype is not defined;
|
||||
endif()
|
||||
endif()
|
||||
if(FREETYPE_LIBRARIES)
|
||||
list(APPEND Fontconfig_LIBRARIES "${FREETYPE_LIBRARIES}")
|
||||
endif()
|
||||
find_package(EXPAT)
|
||||
if(EXPAT_FOUND AND TARGET Fontconfig::Fontconfig)
|
||||
set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "EXPAT::EXPAT")
|
||||
endif()
|
||||
if(EXPAT_LIBRARIES)
|
||||
list(APPEND Fontconfig_LIBRARIES "${EXPAT_LIBRARIES}")
|
||||
endif()
|
||||
include(SelectLibraryConfigurations)
|
||||
find_library(Fontconfig_LIBRARY_DEBUG NAMES fontconfig fontconfigd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
|
||||
find_library(Fontconfig_LIBRARY_RELEASE NAMES fontconfig NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
|
||||
select_library_configurations(Fontconfig)
|
||||
if(@VCPKG_TARGET_IS_LINUX@)
|
||||
find_library(UUID_LIBRARY_DEBUG NAMES uuid uuidd uuid_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
|
||||
find_library(UUID_LIBRARY_RELEASE NAMES uuid NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
|
||||
select_library_configurations(UUID)
|
||||
endif()
|
||||
if(Fontconfig_LIBRARY_DEBUG AND TARGET Fontconfig::Fontconfig)
|
||||
set_target_properties(Fontconfig::Fontconfig PROPERTIES IMPORTED_LOCATION_DEBUG "${Fontconfig_LIBRARY_DEBUG}")
|
||||
if(UUID_LIBRARY_DEBUG AND @VCPKG_TARGET_IS_LINUX@)
|
||||
set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$<CONFIG:DEBUG>:${UUID_LIBRARY_DEBUG}>")
|
||||
endif()
|
||||
endif()
|
||||
if(Fontconfig_LIBRARY_RELEASE AND TARGET Fontconfig::Fontconfig)
|
||||
set_target_properties(Fontconfig::Fontconfig PROPERTIES IMPORTED_LOCATION_RELEASE "${Fontconfig_LIBRARY_RELEASE}")
|
||||
if(UUID_LIBRARY_RELEASE AND @VCPKG_TARGET_IS_LINUX@)
|
||||
set_property(TARGET Fontconfig::Fontconfig APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$<NOT:$<CONFIG:DEBUG>>:${UUID_LIBRARY_RELEASE}>")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(UUID_LIBRARIES AND @VCPKG_TARGET_IS_LINUX@)
|
||||
list(APPEND Fontconfig_LIBRARIES "${UUID_LIBRARIES}")
|
||||
endif()
|
||||
endif()
|
||||
29
externals/vcpkg/ports/fontconfig/vcpkg.json
vendored
Executable file
29
externals/vcpkg/ports/fontconfig/vcpkg.json
vendored
Executable file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"name": "fontconfig",
|
||||
"version": "2.14.0",
|
||||
"port-version": 2,
|
||||
"description": "Library for configuring and customizing font access.",
|
||||
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
|
||||
"license": "MIT",
|
||||
"dependencies": [
|
||||
"dirent",
|
||||
"expat",
|
||||
"freetype",
|
||||
"getopt",
|
||||
"gettext",
|
||||
{
|
||||
"name": "gperf",
|
||||
"host": true
|
||||
},
|
||||
"libiconv",
|
||||
{
|
||||
"name": "libuuid",
|
||||
"platform": "!windows & !osx & !mingw"
|
||||
},
|
||||
"pthread",
|
||||
{
|
||||
"name": "vcpkg-tool-meson",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user