mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 18:32:47 +08:00
[fontconfig] Enable tool CLI option handling (#24553)
* [fontconfig] Enable tool CLI option handling (microsoft#24552) * [fontconfig] fix non-windows systems (microsoft#24552) * [fontconfig] regenerate version registries (microsoft#24552)
This commit is contained in:
parent
d4bc451ce6
commit
3e53ba7ea9
130
ports/fontconfig/libgetopt.patch
Normal file
130
ports/fontconfig/libgetopt.patch
Normal 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')
|
||||
|
@ -9,6 +9,7 @@ vcpkg_from_gitlab(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
no-etc-symlinks.patch
|
||||
libgetopt.patch
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(GPERF)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "fontconfig",
|
||||
"version": "2.14.0",
|
||||
"port-version": 1,
|
||||
"description": "Library for configuring and customizing font access.",
|
||||
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
|
||||
"license": "MIT",
|
||||
@ -8,6 +9,7 @@
|
||||
"dirent",
|
||||
"expat",
|
||||
"freetype",
|
||||
"getopt",
|
||||
"gettext",
|
||||
"libiconv",
|
||||
{
|
||||
|
@ -2286,7 +2286,7 @@
|
||||
},
|
||||
"fontconfig": {
|
||||
"baseline": "2.14.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"foonathan-memory": {
|
||||
"baseline": "2019-07-21",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b1b1de99dba230f78c88bb9d73329bed77227ad4",
|
||||
"version": "2.14.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb",
|
||||
"version": "2.14.0",
|
||||
|
Loading…
Reference in New Issue
Block a user