diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46bb0f81a..560031115 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,7 +54,7 @@ jobs:
executor: autotools-executor
steps:
- checkout
- - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools gobject-introspection libfontconfig1-dev libfreetype6-dev libglib2.0-dev libgirepository1.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip
+ - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools gobject-introspection libfreetype6-dev libglib2.0-dev libgirepository1.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip
- run: pip3 install fonttools meson --upgrade
- run: ./autogen.sh
- run: make -j32
diff --git a/Makefile.am b/Makefile.am
index 9f34c5f1a..aee0f530c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@ EXTRA_DIST = \
meson.build \
meson_options.txt \
subprojects/expat.wrap \
- subprojects/fontconfig.wrap \
subprojects/freetype2.wrap \
subprojects/glib.wrap \
subprojects/libffi.wrap \
diff --git a/configure.ac b/configure.ac
index db596bc4c..2ef6cc656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,24 +214,6 @@ AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft)
dnl ==========================================================================
-AC_ARG_WITH(fontconfig,
- [AS_HELP_STRING([--with-fontconfig=@<:@yes/no/auto@:>@],
- [Use fontconfig @<:@default=auto@:>@])],,
- [with_fontconfig=auto])
-have_fontconfig=false
-if test "x$with_fontconfig" = "xyes" -o "x$with_fontconfig" = "xauto"; then
- PKG_CHECK_MODULES(FONTCONFIG, fontconfig, have_fontconfig=true, :)
-fi
-if test "x$with_fontconfig" = "xyes" -a "x$have_fontconfig" != "xtrue"; then
- AC_MSG_ERROR([fontconfig support requested but not found])
-fi
-if $have_fontconfig; then
- AC_DEFINE(HAVE_FONTCONFIG, 1, [Have fontconfig library])
-fi
-AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig)
-
-dnl ==========================================================================
-
AC_ARG_WITH(icu,
[AS_HELP_STRING([--with-icu=@<:@yes/no/builtin/auto@:>@],
[Use ICU @<:@default=auto@:>@])],,
@@ -466,7 +448,6 @@ Font callbacks (the more the merrier):
Tools used for command-line utilities:
Cairo: ${have_cairo}
- Fontconfig: ${have_fontconfig}
Additional shapers:
Graphite2: ${have_graphite2}
diff --git a/docs/usermanual-install-harfbuzz.xml b/docs/usermanual-install-harfbuzz.xml
index ada6f74ce..a7ec0035c 100644
--- a/docs/usermanual-install-harfbuzz.xml
+++ b/docs/usermanual-install-harfbuzz.xml
@@ -238,26 +238,6 @@
-
- -Dfontconfig=enabled
-
-
- Use Fontconfig. (Default = auto)
-
-
- This option enables or disables usage of the Fontconfig
- library, which provides font-matching functions and
- provides access to font properties. The default setting
- is to check for the presence of Fontconfig and, if it is
- found, build with Fontconfig support.
-
-
- Note: Fontconfig is used only by the HarfBuzz
- command-line utilities, and not by the HarfBuzz library.
-
-
-
-
-Dicu=enabled
diff --git a/meson.build b/meson.build
index f08720f19..09320826a 100644
--- a/meson.build
+++ b/meson.build
@@ -95,8 +95,6 @@ glib_dep = dependency('glib-2.0', required: get_option('glib'),
fallback: ['glib', 'libglib_dep'])
gobject_dep = dependency('gobject-2.0', required: get_option('gobject'),
fallback: ['glib', 'libgobject_dep'])
-fontconfig_dep = dependency('fontconfig', required: get_option('fontconfig'),
- fallback: ['fontconfig', 'fontconfig_dep'])
graphite2_dep = dependency('graphite2', required: get_option('graphite'))
icu_dep = null_dep
@@ -217,10 +215,6 @@ if freetype_dep.found()
endif
endif
-if fontconfig_dep.found()
- conf.set('HAVE_FONTCONFIG', 1)
-endif
-
gdi_uniscribe_deps = []
# GDI (Uniscribe) (Windows)
if host_machine.system() == 'windows' and not get_option('gdi').disabled()
@@ -369,7 +363,6 @@ build_summary = {
},
'Dependencies used for command-line utilities':
{'Cairo': conf.get('HAVE_CAIRO', 0) == 1,
- 'Fontconfig': conf.get('HAVE_FONTCONFIG', 0) == 1,
},
'Additional shapers':
{'Graphite2': conf.get('HAVE_GRAPHITE2', 0) == 1,
diff --git a/meson_options.txt b/meson_options.txt
index 980099f51..700407689 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,8 +5,6 @@ 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',
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index c5ba926e2..269debb3e 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -1,7 +1,6 @@
/expat-2.2.5
/freetype2
/glib
-/fontconfig
/libffi
/proxy-libintl
/zlib
diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap
deleted file mode 100644
index 39caa2e79..000000000
--- a/subprojects/fontconfig.wrap
+++ /dev/null
@@ -1,6 +0,0 @@
-[wrap-git]
-directory=fontconfig
-url=https://gitlab.freedesktop.org/fontconfig/fontconfig.git
-depth=1
-push-url=git@gitlab.freedesktop.org/fontconfig/fontconfig.git
-revision=2.13.93