diff --git a/manifest/armv7l/c/cairo.filelist b/manifest/armv7l/c/cairo.filelist
index d93209f68..d77aacaab 100644
--- a/manifest/armv7l/c/cairo.filelist
+++ b/manifest/armv7l/c/cairo.filelist
@@ -1,6 +1,45 @@
 /usr/local/bin/cairo-sphinx
+/usr/local/bin/cairo-trace
+/usr/local/include/cairo/cairo-deprecated.h
+/usr/local/include/cairo/cairo-features.h
+/usr/local/include/cairo/cairo-ft.h
+/usr/local/include/cairo/cairo-gobject.h
+/usr/local/include/cairo/cairo.h
+/usr/local/include/cairo/cairo-pdf.h
+/usr/local/include/cairo/cairo-ps.h
+/usr/local/include/cairo/cairo-script.h
+/usr/local/include/cairo/cairo-script-interpreter.h
+/usr/local/include/cairo/cairo-svg.h
 /usr/local/include/cairo/cairo-tee.h
+/usr/local/include/cairo/cairo-version.h
+/usr/local/include/cairo/cairo-xcb.h
+/usr/local/include/cairo/cairo-xlib.h
+/usr/local/include/cairo/cairo-xlib-xrender.h
 /usr/local/lib/cairo/libcairo-fdr.so
 /usr/local/lib/cairo/libcairo-sphinx.so
+/usr/local/lib/cairo/libcairo-trace.so
+/usr/local/lib/libcairo-gobject.so
+/usr/local/lib/libcairo-gobject.so.2
+/usr/local/lib/libcairo-gobject.so.2.11709.0
+/usr/local/lib/libcairo-script-interpreter.so
+/usr/local/lib/libcairo-script-interpreter.so.2
+/usr/local/lib/libcairo-script-interpreter.so.2.11709.0
+/usr/local/lib/libcairo.so
+/usr/local/lib/libcairo.so.2
+/usr/local/lib/libcairo.so.2.11709.0
+/usr/local/lib/pkgconfig/cairo-fc.pc
+/usr/local/lib/pkgconfig/cairo-ft.pc
+/usr/local/lib/pkgconfig/cairo-gobject.pc
+/usr/local/lib/pkgconfig/cairo.pc
+/usr/local/lib/pkgconfig/cairo-pdf.pc
+/usr/local/lib/pkgconfig/cairo-png.pc
+/usr/local/lib/pkgconfig/cairo-ps.pc
+/usr/local/lib/pkgconfig/cairo-script-interpreter.pc
+/usr/local/lib/pkgconfig/cairo-script.pc
+/usr/local/lib/pkgconfig/cairo-svg.pc
 /usr/local/lib/pkgconfig/cairo-tee.pc
+/usr/local/lib/pkgconfig/cairo-xcb.pc
+/usr/local/lib/pkgconfig/cairo-xcb-shm.pc
+/usr/local/lib/pkgconfig/cairo-xlib.pc
 /usr/local/lib/pkgconfig/cairo-xlib-xcb.pc
+/usr/local/lib/pkgconfig/cairo-xlib-xrender.pc
diff --git a/manifest/armv7l/f/fontconfig.filelist b/manifest/armv7l/f/fontconfig.filelist
index e69de29bb..665b63d12 100644
--- a/manifest/armv7l/f/fontconfig.filelist
+++ b/manifest/armv7l/f/fontconfig.filelist
@@ -0,0 +1,86 @@
+/usr/local/bin/fc-cache
+/usr/local/bin/fc-cat
+/usr/local/bin/fc-conflist
+/usr/local/bin/fc-list
+/usr/local/bin/fc-match
+/usr/local/bin/fc-pattern
+/usr/local/bin/fc-query
+/usr/local/bin/fc-scan
+/usr/local/bin/fc-validate
+/usr/local/etc/fonts/conf.d/10-hinting-slight.conf
+/usr/local/etc/fonts/conf.d/10-scale-bitmap-fonts.conf
+/usr/local/etc/fonts/conf.d/10-sub-pixel-none.conf
+/usr/local/etc/fonts/conf.d/10-yes-antialias.conf
+/usr/local/etc/fonts/conf.d/11-lcdfilter-default.conf
+/usr/local/etc/fonts/conf.d/20-unhint-small-vera.conf
+/usr/local/etc/fonts/conf.d/30-metric-aliases.conf
+/usr/local/etc/fonts/conf.d/40-nonlatin.conf
+/usr/local/etc/fonts/conf.d/45-generic.conf
+/usr/local/etc/fonts/conf.d/45-latin.conf
+/usr/local/etc/fonts/conf.d/48-spacing.conf
+/usr/local/etc/fonts/conf.d/49-sansserif.conf
+/usr/local/etc/fonts/conf.d/50-user.conf
+/usr/local/etc/fonts/conf.d/51-local.conf
+/usr/local/etc/fonts/conf.d/60-generic.conf
+/usr/local/etc/fonts/conf.d/60-latin.conf
+/usr/local/etc/fonts/conf.d/65-fonts-persian.conf
+/usr/local/etc/fonts/conf.d/65-nonlatin.conf
+/usr/local/etc/fonts/conf.d/69-unifont.conf
+/usr/local/etc/fonts/conf.d/80-delicious.conf
+/usr/local/etc/fonts/conf.d/90-synthetic.conf
+/usr/local/etc/fonts/conf.d/README
+/usr/local/etc/fonts/fonts.conf
+/usr/local/include/fontconfig/fcfreetype.h
+/usr/local/include/fontconfig/fcprivate.h
+/usr/local/include/fontconfig/fontconfig.h
+/usr/local/lib/libfontconfig.so
+/usr/local/lib/libfontconfig.so.1
+/usr/local/lib/libfontconfig.so.1.13.0
+/usr/local/lib/pkgconfig/fontconfig.pc
+/usr/local/share/fontconfig/conf.avail/05-reset-dirs-sample.conf
+/usr/local/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf
+/usr/local/share/fontconfig/conf.avail/10-autohint.conf
+/usr/local/share/fontconfig/conf.avail/10-hinting-full.conf
+/usr/local/share/fontconfig/conf.avail/10-hinting-medium.conf
+/usr/local/share/fontconfig/conf.avail/10-hinting-none.conf
+/usr/local/share/fontconfig/conf.avail/10-hinting-slight.conf
+/usr/local/share/fontconfig/conf.avail/10-no-antialias.conf
+/usr/local/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
+/usr/local/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
+/usr/local/share/fontconfig/conf.avail/10-sub-pixel-none.conf
+/usr/local/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
+/usr/local/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
+/usr/local/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
+/usr/local/share/fontconfig/conf.avail/10-unhinted.conf
+/usr/local/share/fontconfig/conf.avail/10-yes-antialias.conf
+/usr/local/share/fontconfig/conf.avail/11-lcdfilter-default.conf
+/usr/local/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
+/usr/local/share/fontconfig/conf.avail/11-lcdfilter-light.conf
+/usr/local/share/fontconfig/conf.avail/20-unhint-small-vera.conf
+/usr/local/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
+/usr/local/share/fontconfig/conf.avail/30-metric-aliases.conf
+/usr/local/share/fontconfig/conf.avail/35-lang-normalize.conf
+/usr/local/share/fontconfig/conf.avail/40-nonlatin.conf
+/usr/local/share/fontconfig/conf.avail/45-generic.conf
+/usr/local/share/fontconfig/conf.avail/45-latin.conf
+/usr/local/share/fontconfig/conf.avail/48-spacing.conf
+/usr/local/share/fontconfig/conf.avail/49-sansserif.conf
+/usr/local/share/fontconfig/conf.avail/50-user.conf
+/usr/local/share/fontconfig/conf.avail/51-local.conf
+/usr/local/share/fontconfig/conf.avail/60-generic.conf
+/usr/local/share/fontconfig/conf.avail/60-latin.conf
+/usr/local/share/fontconfig/conf.avail/65-fonts-persian.conf
+/usr/local/share/fontconfig/conf.avail/65-khmer.conf
+/usr/local/share/fontconfig/conf.avail/65-nonlatin.conf
+/usr/local/share/fontconfig/conf.avail/69-unifont.conf
+/usr/local/share/fontconfig/conf.avail/70-no-bitmaps.conf
+/usr/local/share/fontconfig/conf.avail/70-yes-bitmaps.conf
+/usr/local/share/fontconfig/conf.avail/80-delicious.conf
+/usr/local/share/fontconfig/conf.avail/90-synthetic.conf
+/usr/local/share/gettext/its/fontconfig.its
+/usr/local/share/gettext/its/fontconfig.loc
+/usr/local/share/locale/ka/LC_MESSAGES/fontconfig-conf.mo
+/usr/local/share/locale/ka/LC_MESSAGES/fontconfig.mo
+/usr/local/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
+/usr/local/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
+/usr/local/share/xml/fontconfig/fonts.dtd
diff --git a/manifest/armv7l/f/freetype.filelist b/manifest/armv7l/f/freetype.filelist
index 1914a9214..79a903f9f 100644
--- a/manifest/armv7l/f/freetype.filelist
+++ b/manifest/armv7l/f/freetype.filelist
@@ -55,5 +55,5 @@
 /usr/local/lib/libfreetype.la
 /usr/local/lib/libfreetype.so
 /usr/local/lib/libfreetype.so.6
-/usr/local/lib/libfreetype.so.6.19.0
+/usr/local/lib/libfreetype.so.6.20.0
 /usr/local/lib/pkgconfig/freetype2.pc
diff --git a/manifest/armv7l/h/harfbuzz.filelist b/manifest/armv7l/h/harfbuzz.filelist
index 9302e7562..d962f5ccb 100644
--- a/manifest/armv7l/h/harfbuzz.filelist
+++ b/manifest/armv7l/h/harfbuzz.filelist
@@ -1,13 +1,3 @@
-/usr/local/bin/cairo-trace
-/usr/local/bin/fc-cache
-/usr/local/bin/fc-cat
-/usr/local/bin/fc-conflist
-/usr/local/bin/fc-list
-/usr/local/bin/fc-match
-/usr/local/bin/fc-pattern
-/usr/local/bin/fc-query
-/usr/local/bin/fc-scan
-/usr/local/bin/fc-validate
 /usr/local/bin/hb-info
 /usr/local/bin/hb-ot-shape-closure
 /usr/local/bin/hb-shape
@@ -37,23 +27,60 @@
 /usr/local/etc/fonts/conf.d/90-synthetic.conf
 /usr/local/etc/fonts/conf.d/README
 /usr/local/etc/fonts/fonts.conf
-/usr/local/include/cairo/cairo-deprecated.h
-/usr/local/include/cairo/cairo-features.h
-/usr/local/include/cairo/cairo-ft.h
-/usr/local/include/cairo/cairo-gobject.h
-/usr/local/include/cairo/cairo.h
-/usr/local/include/cairo/cairo-pdf.h
-/usr/local/include/cairo/cairo-ps.h
-/usr/local/include/cairo/cairo-script.h
-/usr/local/include/cairo/cairo-script-interpreter.h
-/usr/local/include/cairo/cairo-svg.h
-/usr/local/include/cairo/cairo-version.h
-/usr/local/include/cairo/cairo-xcb.h
-/usr/local/include/cairo/cairo-xlib.h
-/usr/local/include/cairo/cairo-xlib-xrender.h
-/usr/local/include/fontconfig/fcfreetype.h
-/usr/local/include/fontconfig/fcprivate.h
-/usr/local/include/fontconfig/fontconfig.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftconfig.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftheader.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftmodule.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftoption.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftstdlib.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/integer-types.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/mac-support.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/public-macros.h
+/usr/local/include/harfbuzz-freetype2/freetype/freetype.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftadvanc.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbbox.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbdf.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbitmap.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbzip2.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftcache.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftchapters.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftcid.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftcolor.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftdriver.h
+/usr/local/include/harfbuzz-freetype2/freetype/fterrdef.h
+/usr/local/include/harfbuzz-freetype2/freetype/fterrors.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftfntfmt.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftgasp.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftglyph.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftgxval.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftgzip.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftimage.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftincrem.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftlcdfil.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftlist.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftlzw.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmac.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmm.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmodapi.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmoderr.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftotval.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftoutln.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftparams.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftpfr.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftrender.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsizes.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsnames.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftstroke.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsynth.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsystem.h
+/usr/local/include/harfbuzz-freetype2/freetype/fttrigon.h
+/usr/local/include/harfbuzz-freetype2/freetype/fttypes.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftwinfnt.h
+/usr/local/include/harfbuzz-freetype2/freetype/otsvg.h
+/usr/local/include/harfbuzz-freetype2/freetype/t1tables.h
+/usr/local/include/harfbuzz-freetype2/freetype/ttnameid.h
+/usr/local/include/harfbuzz-freetype2/freetype/tttables.h
+/usr/local/include/harfbuzz-freetype2/freetype/tttags.h
+/usr/local/include/harfbuzz-freetype2/ft2build.h
 /usr/local/include/harfbuzz/hb-aat.h
 /usr/local/include/harfbuzz/hb-aat-layout.h
 /usr/local/include/harfbuzz/hb-blob.h
@@ -95,113 +122,46 @@
 /usr/local/include/harfbuzz/hb-subset-repacker.h
 /usr/local/include/harfbuzz/hb-unicode.h
 /usr/local/include/harfbuzz/hb-version.h
-/usr/local/lib/cairo/libcairo-trace.a
-/usr/local/lib/cairo/libcairo-trace.so
 /usr/local/lib/cmake/harfbuzz/harfbuzz-config.cmake
 /usr/local/lib/girepository-1.0/HarfBuzz-0.0.typelib
-/usr/local/lib/libcairo.a
-/usr/local/lib/libcairo-gobject.a
-/usr/local/lib/libcairo-gobject.so
-/usr/local/lib/libcairo-gobject.so.2
-/usr/local/lib/libcairo-gobject.so.2.11708.0
-/usr/local/lib/libcairo-script-interpreter.a
-/usr/local/lib/libcairo-script-interpreter.so
-/usr/local/lib/libcairo-script-interpreter.so.2
-/usr/local/lib/libcairo-script-interpreter.so.2.11708.0
-/usr/local/lib/libcairo.so
-/usr/local/lib/libcairo.so.2
-/usr/local/lib/libcairo.so.2.11708.0
-/usr/local/lib/libfontconfig.a
-/usr/local/lib/libfontconfig.so
-/usr/local/lib/libfontconfig.so.1
-/usr/local/lib/libfontconfig.so.1.13.0
-/usr/local/lib/libfreetype.a
+/usr/local/lib/harfbuzz-libcairo.a
+/usr/local/lib/harfbuzz-libcairo.so
+/usr/local/lib/harfbuzz-libcairo.so.2
+/usr/local/lib/harfbuzz-libcairo.so.2.11708.0
+/usr/local/lib/harfbuzz-libfontconfig.a
+/usr/local/lib/harfbuzz-libfontconfig.so
+/usr/local/lib/harfbuzz-libfontconfig.so.1
+/usr/local/lib/harfbuzz-libfontconfig.so.1.13.0
 /usr/local/lib/libharfbuzz.a
 /usr/local/lib/libharfbuzz-cairo.a
 /usr/local/lib/libharfbuzz-cairo.so
 /usr/local/lib/libharfbuzz-cairo.so.0
-/usr/local/lib/libharfbuzz-cairo.so.0.60710.0
+/usr/local/lib/libharfbuzz-cairo.so.0.60730.0
+/usr/local/lib/libharfbuzz-freetype.a
+/usr/local/lib/libharfbuzz-freetype.so
+/usr/local/lib/libharfbuzz-freetype.so.6
+/usr/local/lib/libharfbuzz-freetype.so.6.20.0
 /usr/local/lib/libharfbuzz-gobject.a
 /usr/local/lib/libharfbuzz-gobject.so
 /usr/local/lib/libharfbuzz-gobject.so.0
-/usr/local/lib/libharfbuzz-gobject.so.0.60710.0
+/usr/local/lib/libharfbuzz-gobject.so.0.60730.0
 /usr/local/lib/libharfbuzz-icu.a
 /usr/local/lib/libharfbuzz-icu.so
 /usr/local/lib/libharfbuzz-icu.so.0
-/usr/local/lib/libharfbuzz-icu.so.0.60710.0
+/usr/local/lib/libharfbuzz-icu.so.0.60730.0
 /usr/local/lib/libharfbuzz.la
 /usr/local/lib/libharfbuzz.so
 /usr/local/lib/libharfbuzz.so.0
-/usr/local/lib/libharfbuzz.so.0.60710.0
+/usr/local/lib/libharfbuzz.so.0.60730.0
 /usr/local/lib/libharfbuzz-subset.a
 /usr/local/lib/libharfbuzz-subset.so
 /usr/local/lib/libharfbuzz-subset.so.0
-/usr/local/lib/libharfbuzz-subset.so.0.60710.0
-/usr/local/lib/pkgconfig/cairo-fc.pc
-/usr/local/lib/pkgconfig/cairo-ft.pc
-/usr/local/lib/pkgconfig/cairo-gobject.pc
+/usr/local/lib/libharfbuzz-subset.so.0.60730.0
 /usr/local/lib/pkgconfig/cairo.pc
-/usr/local/lib/pkgconfig/cairo-pdf.pc
-/usr/local/lib/pkgconfig/cairo-png.pc
-/usr/local/lib/pkgconfig/cairo-ps.pc
-/usr/local/lib/pkgconfig/cairo-script-interpreter.pc
-/usr/local/lib/pkgconfig/cairo-script.pc
-/usr/local/lib/pkgconfig/cairo-svg.pc
-/usr/local/lib/pkgconfig/cairo-xcb.pc
-/usr/local/lib/pkgconfig/cairo-xcb-shm.pc
-/usr/local/lib/pkgconfig/cairo-xlib.pc
-/usr/local/lib/pkgconfig/cairo-xlib-xrender.pc
-/usr/local/lib/pkgconfig/fontconfig.pc
+/usr/local/lib/pkgconfig/freetype2.pc
 /usr/local/lib/pkgconfig/harfbuzz-cairo.pc
 /usr/local/lib/pkgconfig/harfbuzz-gobject.pc
 /usr/local/lib/pkgconfig/harfbuzz-icu.pc
 /usr/local/lib/pkgconfig/harfbuzz.pc
 /usr/local/lib/pkgconfig/harfbuzz-subset.pc
-/usr/local/share/fontconfig/conf.avail/05-reset-dirs-sample.conf
-/usr/local/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf
-/usr/local/share/fontconfig/conf.avail/10-autohint.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-full.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-medium.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-none.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-slight.conf
-/usr/local/share/fontconfig/conf.avail/10-no-antialias.conf
-/usr/local/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-none.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
-/usr/local/share/fontconfig/conf.avail/10-unhinted.conf
-/usr/local/share/fontconfig/conf.avail/10-yes-antialias.conf
-/usr/local/share/fontconfig/conf.avail/11-lcdfilter-default.conf
-/usr/local/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
-/usr/local/share/fontconfig/conf.avail/11-lcdfilter-light.conf
-/usr/local/share/fontconfig/conf.avail/20-unhint-small-vera.conf
-/usr/local/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
-/usr/local/share/fontconfig/conf.avail/30-metric-aliases.conf
-/usr/local/share/fontconfig/conf.avail/35-lang-normalize.conf
-/usr/local/share/fontconfig/conf.avail/40-nonlatin.conf
-/usr/local/share/fontconfig/conf.avail/45-generic.conf
-/usr/local/share/fontconfig/conf.avail/45-latin.conf
-/usr/local/share/fontconfig/conf.avail/48-spacing.conf
-/usr/local/share/fontconfig/conf.avail/49-sansserif.conf
-/usr/local/share/fontconfig/conf.avail/50-user.conf
-/usr/local/share/fontconfig/conf.avail/51-local.conf
-/usr/local/share/fontconfig/conf.avail/60-generic.conf
-/usr/local/share/fontconfig/conf.avail/60-latin.conf
-/usr/local/share/fontconfig/conf.avail/65-fonts-persian.conf
-/usr/local/share/fontconfig/conf.avail/65-khmer.conf
-/usr/local/share/fontconfig/conf.avail/65-nonlatin.conf
-/usr/local/share/fontconfig/conf.avail/69-unifont.conf
-/usr/local/share/fontconfig/conf.avail/70-no-bitmaps.conf
-/usr/local/share/fontconfig/conf.avail/70-yes-bitmaps.conf
-/usr/local/share/fontconfig/conf.avail/80-delicious.conf
-/usr/local/share/fontconfig/conf.avail/90-synthetic.conf
-/usr/local/share/gettext/its/fontconfig.its
-/usr/local/share/gettext/its/fontconfig.loc
 /usr/local/share/gir-1.0/HarfBuzz-0.0.gir
-/usr/local/share/locale/ka/LC_MESSAGES/fontconfig-conf.mo
-/usr/local/share/locale/ka/LC_MESSAGES/fontconfig.mo
-/usr/local/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
-/usr/local/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
-/usr/local/share/xml/fontconfig/fonts.dtd
diff --git a/manifest/x86_64/c/cairo.filelist b/manifest/x86_64/c/cairo.filelist
index 5e4e9771c..dc31e5ec0 100644
--- a/manifest/x86_64/c/cairo.filelist
+++ b/manifest/x86_64/c/cairo.filelist
@@ -1,6 +1,45 @@
 /usr/local/bin/cairo-sphinx
+/usr/local/bin/cairo-trace
+/usr/local/include/cairo/cairo-deprecated.h
+/usr/local/include/cairo/cairo-features.h
+/usr/local/include/cairo/cairo-ft.h
+/usr/local/include/cairo/cairo-gobject.h
+/usr/local/include/cairo/cairo.h
+/usr/local/include/cairo/cairo-pdf.h
+/usr/local/include/cairo/cairo-ps.h
+/usr/local/include/cairo/cairo-script.h
+/usr/local/include/cairo/cairo-script-interpreter.h
+/usr/local/include/cairo/cairo-svg.h
 /usr/local/include/cairo/cairo-tee.h
+/usr/local/include/cairo/cairo-version.h
+/usr/local/include/cairo/cairo-xcb.h
+/usr/local/include/cairo/cairo-xlib.h
+/usr/local/include/cairo/cairo-xlib-xrender.h
 /usr/local/lib64/cairo/libcairo-fdr.so
 /usr/local/lib64/cairo/libcairo-sphinx.so
+/usr/local/lib64/cairo/libcairo-trace.so
+/usr/local/lib64/libcairo-gobject.so
+/usr/local/lib64/libcairo-gobject.so.2
+/usr/local/lib64/libcairo-gobject.so.2.11709.0
+/usr/local/lib64/libcairo-script-interpreter.so
+/usr/local/lib64/libcairo-script-interpreter.so.2
+/usr/local/lib64/libcairo-script-interpreter.so.2.11709.0
+/usr/local/lib64/libcairo.so
+/usr/local/lib64/libcairo.so.2
+/usr/local/lib64/libcairo.so.2.11709.0
+/usr/local/lib64/pkgconfig/cairo-fc.pc
+/usr/local/lib64/pkgconfig/cairo-ft.pc
+/usr/local/lib64/pkgconfig/cairo-gobject.pc
+/usr/local/lib64/pkgconfig/cairo.pc
+/usr/local/lib64/pkgconfig/cairo-pdf.pc
+/usr/local/lib64/pkgconfig/cairo-png.pc
+/usr/local/lib64/pkgconfig/cairo-ps.pc
+/usr/local/lib64/pkgconfig/cairo-script-interpreter.pc
+/usr/local/lib64/pkgconfig/cairo-script.pc
+/usr/local/lib64/pkgconfig/cairo-svg.pc
 /usr/local/lib64/pkgconfig/cairo-tee.pc
+/usr/local/lib64/pkgconfig/cairo-xcb.pc
+/usr/local/lib64/pkgconfig/cairo-xcb-shm.pc
+/usr/local/lib64/pkgconfig/cairo-xlib.pc
 /usr/local/lib64/pkgconfig/cairo-xlib-xcb.pc
+/usr/local/lib64/pkgconfig/cairo-xlib-xrender.pc
diff --git a/manifest/x86_64/f/freetype.filelist b/manifest/x86_64/f/freetype.filelist
index b3b86ab59..7aa9f6d57 100644
--- a/manifest/x86_64/f/freetype.filelist
+++ b/manifest/x86_64/f/freetype.filelist
@@ -55,5 +55,5 @@
 /usr/local/lib64/libfreetype.la
 /usr/local/lib64/libfreetype.so
 /usr/local/lib64/libfreetype.so.6
-/usr/local/lib64/libfreetype.so.6.19.0
+/usr/local/lib64/libfreetype.so.6.20.0
 /usr/local/lib64/pkgconfig/freetype2.pc
diff --git a/manifest/x86_64/h/harfbuzz.filelist b/manifest/x86_64/h/harfbuzz.filelist
index c8b51b45e..283e22875 100644
--- a/manifest/x86_64/h/harfbuzz.filelist
+++ b/manifest/x86_64/h/harfbuzz.filelist
@@ -1,13 +1,3 @@
-/usr/local/bin/cairo-trace
-/usr/local/bin/fc-cache
-/usr/local/bin/fc-cat
-/usr/local/bin/fc-conflist
-/usr/local/bin/fc-list
-/usr/local/bin/fc-match
-/usr/local/bin/fc-pattern
-/usr/local/bin/fc-query
-/usr/local/bin/fc-scan
-/usr/local/bin/fc-validate
 /usr/local/bin/hb-info
 /usr/local/bin/hb-ot-shape-closure
 /usr/local/bin/hb-shape
@@ -37,23 +27,60 @@
 /usr/local/etc/fonts/conf.d/90-synthetic.conf
 /usr/local/etc/fonts/conf.d/README
 /usr/local/etc/fonts/fonts.conf
-/usr/local/include/cairo/cairo-deprecated.h
-/usr/local/include/cairo/cairo-features.h
-/usr/local/include/cairo/cairo-ft.h
-/usr/local/include/cairo/cairo-gobject.h
-/usr/local/include/cairo/cairo.h
-/usr/local/include/cairo/cairo-pdf.h
-/usr/local/include/cairo/cairo-ps.h
-/usr/local/include/cairo/cairo-script.h
-/usr/local/include/cairo/cairo-script-interpreter.h
-/usr/local/include/cairo/cairo-svg.h
-/usr/local/include/cairo/cairo-version.h
-/usr/local/include/cairo/cairo-xcb.h
-/usr/local/include/cairo/cairo-xlib.h
-/usr/local/include/cairo/cairo-xlib-xrender.h
-/usr/local/include/fontconfig/fcfreetype.h
-/usr/local/include/fontconfig/fcprivate.h
-/usr/local/include/fontconfig/fontconfig.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftconfig.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftheader.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftmodule.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftoption.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/ftstdlib.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/integer-types.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/mac-support.h
+/usr/local/include/harfbuzz-freetype2/freetype/config/public-macros.h
+/usr/local/include/harfbuzz-freetype2/freetype/freetype.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftadvanc.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbbox.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbdf.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbitmap.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftbzip2.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftcache.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftchapters.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftcid.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftcolor.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftdriver.h
+/usr/local/include/harfbuzz-freetype2/freetype/fterrdef.h
+/usr/local/include/harfbuzz-freetype2/freetype/fterrors.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftfntfmt.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftgasp.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftglyph.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftgxval.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftgzip.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftimage.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftincrem.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftlcdfil.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftlist.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftlzw.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmac.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmm.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmodapi.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftmoderr.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftotval.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftoutln.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftparams.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftpfr.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftrender.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsizes.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsnames.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftstroke.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsynth.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftsystem.h
+/usr/local/include/harfbuzz-freetype2/freetype/fttrigon.h
+/usr/local/include/harfbuzz-freetype2/freetype/fttypes.h
+/usr/local/include/harfbuzz-freetype2/freetype/ftwinfnt.h
+/usr/local/include/harfbuzz-freetype2/freetype/otsvg.h
+/usr/local/include/harfbuzz-freetype2/freetype/t1tables.h
+/usr/local/include/harfbuzz-freetype2/freetype/ttnameid.h
+/usr/local/include/harfbuzz-freetype2/freetype/tttables.h
+/usr/local/include/harfbuzz-freetype2/freetype/tttags.h
+/usr/local/include/harfbuzz-freetype2/ft2build.h
 /usr/local/include/harfbuzz/hb-aat.h
 /usr/local/include/harfbuzz/hb-aat-layout.h
 /usr/local/include/harfbuzz/hb-blob.h
@@ -95,113 +122,46 @@
 /usr/local/include/harfbuzz/hb-subset-repacker.h
 /usr/local/include/harfbuzz/hb-unicode.h
 /usr/local/include/harfbuzz/hb-version.h
-/usr/local/lib64/cairo/libcairo-trace.a
-/usr/local/lib64/cairo/libcairo-trace.so
 /usr/local/lib64/cmake/harfbuzz/harfbuzz-config.cmake
 /usr/local/lib64/girepository-1.0/HarfBuzz-0.0.typelib
-/usr/local/lib64/libcairo.a
-/usr/local/lib64/libcairo-gobject.a
-/usr/local/lib64/libcairo-gobject.so
-/usr/local/lib64/libcairo-gobject.so.2
-/usr/local/lib64/libcairo-gobject.so.2.11708.0
-/usr/local/lib64/libcairo-script-interpreter.a
-/usr/local/lib64/libcairo-script-interpreter.so
-/usr/local/lib64/libcairo-script-interpreter.so.2
-/usr/local/lib64/libcairo-script-interpreter.so.2.11708.0
-/usr/local/lib64/libcairo.so
-/usr/local/lib64/libcairo.so.2
-/usr/local/lib64/libcairo.so.2.11708.0
-/usr/local/lib64/libfontconfig.a
-/usr/local/lib64/libfontconfig.so
-/usr/local/lib64/libfontconfig.so.1
-/usr/local/lib64/libfontconfig.so.1.13.0
-/usr/local/lib64/libfreetype.a
+/usr/local/lib64/harfbuzz-libcairo.a
+/usr/local/lib64/harfbuzz-libcairo.so
+/usr/local/lib64/harfbuzz-libcairo.so.2
+/usr/local/lib64/harfbuzz-libcairo.so.2.11708.0
+/usr/local/lib64/harfbuzz-libfontconfig.a
+/usr/local/lib64/harfbuzz-libfontconfig.so
+/usr/local/lib64/harfbuzz-libfontconfig.so.1
+/usr/local/lib64/harfbuzz-libfontconfig.so.1.13.0
 /usr/local/lib64/libharfbuzz.a
 /usr/local/lib64/libharfbuzz-cairo.a
 /usr/local/lib64/libharfbuzz-cairo.so
 /usr/local/lib64/libharfbuzz-cairo.so.0
-/usr/local/lib64/libharfbuzz-cairo.so.0.60710.0
+/usr/local/lib64/libharfbuzz-cairo.so.0.60730.0
+/usr/local/lib64/libharfbuzz-freetype.a
+/usr/local/lib64/libharfbuzz-freetype.so
+/usr/local/lib64/libharfbuzz-freetype.so.6
+/usr/local/lib64/libharfbuzz-freetype.so.6.20.0
 /usr/local/lib64/libharfbuzz-gobject.a
 /usr/local/lib64/libharfbuzz-gobject.so
 /usr/local/lib64/libharfbuzz-gobject.so.0
-/usr/local/lib64/libharfbuzz-gobject.so.0.60710.0
+/usr/local/lib64/libharfbuzz-gobject.so.0.60730.0
 /usr/local/lib64/libharfbuzz-icu.a
 /usr/local/lib64/libharfbuzz-icu.so
 /usr/local/lib64/libharfbuzz-icu.so.0
-/usr/local/lib64/libharfbuzz-icu.so.0.60710.0
+/usr/local/lib64/libharfbuzz-icu.so.0.60730.0
 /usr/local/lib64/libharfbuzz.la
 /usr/local/lib64/libharfbuzz.so
 /usr/local/lib64/libharfbuzz.so.0
-/usr/local/lib64/libharfbuzz.so.0.60710.0
+/usr/local/lib64/libharfbuzz.so.0.60730.0
 /usr/local/lib64/libharfbuzz-subset.a
 /usr/local/lib64/libharfbuzz-subset.so
 /usr/local/lib64/libharfbuzz-subset.so.0
-/usr/local/lib64/libharfbuzz-subset.so.0.60710.0
-/usr/local/lib64/pkgconfig/cairo-fc.pc
-/usr/local/lib64/pkgconfig/cairo-ft.pc
-/usr/local/lib64/pkgconfig/cairo-gobject.pc
+/usr/local/lib64/libharfbuzz-subset.so.0.60730.0
 /usr/local/lib64/pkgconfig/cairo.pc
-/usr/local/lib64/pkgconfig/cairo-pdf.pc
-/usr/local/lib64/pkgconfig/cairo-png.pc
-/usr/local/lib64/pkgconfig/cairo-ps.pc
-/usr/local/lib64/pkgconfig/cairo-script-interpreter.pc
-/usr/local/lib64/pkgconfig/cairo-script.pc
-/usr/local/lib64/pkgconfig/cairo-svg.pc
-/usr/local/lib64/pkgconfig/cairo-xcb.pc
-/usr/local/lib64/pkgconfig/cairo-xcb-shm.pc
-/usr/local/lib64/pkgconfig/cairo-xlib.pc
-/usr/local/lib64/pkgconfig/cairo-xlib-xrender.pc
-/usr/local/lib64/pkgconfig/fontconfig.pc
+/usr/local/lib64/pkgconfig/freetype2.pc
 /usr/local/lib64/pkgconfig/harfbuzz-cairo.pc
 /usr/local/lib64/pkgconfig/harfbuzz-gobject.pc
 /usr/local/lib64/pkgconfig/harfbuzz-icu.pc
 /usr/local/lib64/pkgconfig/harfbuzz.pc
 /usr/local/lib64/pkgconfig/harfbuzz-subset.pc
-/usr/local/share/fontconfig/conf.avail/05-reset-dirs-sample.conf
-/usr/local/share/fontconfig/conf.avail/09-autohint-if-no-hinting.conf
-/usr/local/share/fontconfig/conf.avail/10-autohint.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-full.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-medium.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-none.conf
-/usr/local/share/fontconfig/conf.avail/10-hinting-slight.conf
-/usr/local/share/fontconfig/conf.avail/10-no-antialias.conf
-/usr/local/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-none.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
-/usr/local/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
-/usr/local/share/fontconfig/conf.avail/10-unhinted.conf
-/usr/local/share/fontconfig/conf.avail/10-yes-antialias.conf
-/usr/local/share/fontconfig/conf.avail/11-lcdfilter-default.conf
-/usr/local/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
-/usr/local/share/fontconfig/conf.avail/11-lcdfilter-light.conf
-/usr/local/share/fontconfig/conf.avail/20-unhint-small-vera.conf
-/usr/local/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
-/usr/local/share/fontconfig/conf.avail/30-metric-aliases.conf
-/usr/local/share/fontconfig/conf.avail/35-lang-normalize.conf
-/usr/local/share/fontconfig/conf.avail/40-nonlatin.conf
-/usr/local/share/fontconfig/conf.avail/45-generic.conf
-/usr/local/share/fontconfig/conf.avail/45-latin.conf
-/usr/local/share/fontconfig/conf.avail/48-spacing.conf
-/usr/local/share/fontconfig/conf.avail/49-sansserif.conf
-/usr/local/share/fontconfig/conf.avail/50-user.conf
-/usr/local/share/fontconfig/conf.avail/51-local.conf
-/usr/local/share/fontconfig/conf.avail/60-generic.conf
-/usr/local/share/fontconfig/conf.avail/60-latin.conf
-/usr/local/share/fontconfig/conf.avail/65-fonts-persian.conf
-/usr/local/share/fontconfig/conf.avail/65-khmer.conf
-/usr/local/share/fontconfig/conf.avail/65-nonlatin.conf
-/usr/local/share/fontconfig/conf.avail/69-unifont.conf
-/usr/local/share/fontconfig/conf.avail/70-no-bitmaps.conf
-/usr/local/share/fontconfig/conf.avail/70-yes-bitmaps.conf
-/usr/local/share/fontconfig/conf.avail/80-delicious.conf
-/usr/local/share/fontconfig/conf.avail/90-synthetic.conf
-/usr/local/share/gettext/its/fontconfig.its
-/usr/local/share/gettext/its/fontconfig.loc
 /usr/local/share/gir-1.0/HarfBuzz-0.0.gir
-/usr/local/share/locale/ka/LC_MESSAGES/fontconfig-conf.mo
-/usr/local/share/locale/ka/LC_MESSAGES/fontconfig.mo
-/usr/local/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
-/usr/local/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
-/usr/local/share/xml/fontconfig/fonts.dtd
diff --git a/packages/cairo.rb b/packages/cairo.rb
index d47c7cb5a..82a0fa630 100644
--- a/packages/cairo.rb
+++ b/packages/cairo.rb
@@ -3,28 +3,30 @@ require 'package'
 class Cairo < Package
   description 'Cairo is a 2D graphics library with support for multiple output devices.'
   homepage 'https://www.cairographics.org'
-  version '1.17.8-af5a25a'
+  version '1.17.8-d68eb3c'
   license 'LGPL-2.1 or MPL-1.1'
-  compatibility 'all'
+  compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://gitlab.freedesktop.org/cairo/cairo.git'
-  git_hashtag 'af5a25a7f19e8fe6242c50f17bd246f98b6fdf87'
+  git_hashtag 'd68eb3c8df22694e9f25bb62b9cfa28b488f5a29'
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_armv7l/cairo-1.17.8-af5a25a-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_armv7l/cairo-1.17.8-af5a25a-chromeos-armv7l.tar.zst',
        i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_i686/cairo-1.17.8-af5a25a-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-af5a25a_x86_64/cairo-1.17.8-af5a25a-chromeos-x86_64.tar.zst'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-d68eb3c_armv7l/cairo-1.17.8-d68eb3c-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-d68eb3c_armv7l/cairo-1.17.8-d68eb3c-chromeos-armv7l.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/cairo/1.17.8-d68eb3c_x86_64/cairo-1.17.8-d68eb3c-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
-    aarch64: '9e8b8dc46bc173ca21a45b5f0c500c96e1cfcadd1985548568adecb25ff96ec0',
-     armv7l: '9e8b8dc46bc173ca21a45b5f0c500c96e1cfcadd1985548568adecb25ff96ec0',
        i686: 'e5e7549bbedbb0dd1f49488f253deb11b504147e39adf99733ce5c664d237022',
-     x86_64: 'ded85aef72c1c263d094b18a95201cd9e933c39b880e6ff41782c14090b8a9be'
+    aarch64: '1d5c582b9520310fc02ff59dc37eaf2b9b745710b0d08a623a8389626272932b',
+     armv7l: '1d5c582b9520310fc02ff59dc37eaf2b9b745710b0d08a623a8389626272932b',
+     x86_64: '13bae402fc0e840ed26a5681be2fc98ef74febd98839aafe513baa8c682a741c'
   })
 
+  depends_on 'fontconfig' # R
+  depends_on 'freetype' # R
   depends_on 'gcc_lib' # R
-  depends_on 'glib' # R
   depends_on 'glibc' # R
+  depends_on 'glib' # R
   depends_on 'harfbuzz' # R
   depends_on 'libpng' # R
   depends_on 'libx11' # R
diff --git a/packages/fontconfig.rb b/packages/fontconfig.rb
index cd1121969..2d9ecda8b 100644
--- a/packages/fontconfig.rb
+++ b/packages/fontconfig.rb
@@ -1,54 +1,53 @@
 require 'package'
-# build order: harfbuzz => freetype => fontconfig => pango
+# build order: harfbuzz => freetype => fontconfig => cairo => pango
 
 class Fontconfig < Package
   description 'Fontconfig is a library for configuring and customizing font access.'
   homepage 'https://www.freedesktop.org/wiki/Software/fontconfig/'
-  version '2.14.2'
+  @_ver = '2.14.2'
+  version "#{@_ver}-1"
   license 'MIT'
-  compatibility 'all'
+  compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://gitlab.freedesktop.org/fontconfig/fontconfig.git'
-  git_hashtag version
+  git_hashtag @_ver
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_armv7l/fontconfig-2.14.2-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_armv7l/fontconfig-2.14.2-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_i686/fontconfig-2.14.2-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2_x86_64/fontconfig-2.14.2-chromeos-x86_64.tar.zst'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2-1_armv7l/fontconfig-2.14.2-1-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2-1_armv7l/fontconfig-2.14.2-1-chromeos-armv7l.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/fontconfig/2.14.2-1_x86_64/fontconfig-2.14.2-1-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
-    aarch64: '8bf542223e21a4c683aa148fa2b98f0f66758676fb64b01f819239cf0c6de686',
-     armv7l: '8bf542223e21a4c683aa148fa2b98f0f66758676fb64b01f819239cf0c6de686',
-       i686: '93a0f764c5352cf888849d4212519c06338b65cdc7099f2a01b9bdc28ee022e7',
-     x86_64: '24a0a1cd2cc53c56bb7256e410592ac9b6398eecf02effc6c3944554dc840c77'
+    aarch64: '9be6e2ad2bae395de354b1a1daad812a60bf0706fe429aa6eb3c50ac16de4001',
+     armv7l: '9be6e2ad2bae395de354b1a1daad812a60bf0706fe429aa6eb3c50ac16de4001',
+     x86_64: '312be51a3f24e688489a30efaf61027d257998814be2fd670d403b0a88d5e818'
   })
 
   depends_on 'expat' # R
-  depends_on 'jsonc' => :build
-  depends_on 'gperf' => :build
   depends_on 'freetype' # R
+  depends_on 'gcc_lib' # R
+  depends_on 'glibc' # R
+  depends_on 'gperf' => :build
+  depends_on 'graphite' => :build
+  depends_on 'harfbuzz' # R
+  depends_on 'jsonc' => :build
   depends_on 'libpng' => :build
   depends_on 'util_linux' => :build
-  depends_on 'graphite' => :build
-  depends_on 'glibc' # R
-  depends_on 'harfbuzz' # R
 
   no_fhs
-  conflicts_ok # allowed to overwrite harfbuzz
 
   def self.build
-    system "meson setup #{CREW_MESON_OPTIONS} \
+    system "mold -run meson setup #{CREW_MESON_OPTIONS} \
       --wrap-mode=default \
       -Dlocalstatedir=#{CREW_PREFIX}/cache \
       -Dtests=disabled \
       builddir"
     system 'meson configure builddir'
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
     system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install"
-    # The following are included the libpng package.
+    # The following are included in the libpng package.
     FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/libpng*"]
     FileUtils.rm Dir["#{CREW_DEST_PREFIX}/include/libpng16/png*"]
     FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/pkgconfig/libpng*"]
diff --git a/packages/freetype.rb b/packages/freetype.rb
index 5375634b7..98e5020f3 100644
--- a/packages/freetype.rb
+++ b/packages/freetype.rb
@@ -1,27 +1,24 @@
 require 'package'
-# build order: harfbuzz => freetype => fontconfig => pango
+# build order: harfbuzz => freetype => fontconfig => cairo => pango
 
 class Freetype < Package
   description 'FreeType is a freely available software library to render fonts.'
   homepage 'https://www.freetype.org/'
-  @_ver = '2.13.0' # Update freetype in harfbuzz when updating freetype
-  version "#{@_ver}-1" # Update freetype in harfbuzz when updating freetype
+  version '2.13.1' # Update freetype in harfbuzz when updating freetype
   license 'FTL or GPL-2+'
-  compatibility 'all'
+  compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://gitlab.freedesktop.org/freetype/freetype.git'
-  git_hashtag "VER-#{@_ver.tr('.', '-')}"
+  git_hashtag "VER-#{version.tr('.', '-')}"
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_armv7l/freetype-2.13.0-1-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_armv7l/freetype-2.13.0-1-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_i686/freetype-2.13.0-1-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.0-1_x86_64/freetype-2.13.0-1-chromeos-x86_64.tar.zst'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.1_armv7l/freetype-2.13.1-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.1_armv7l/freetype-2.13.1-chromeos-armv7l.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/freetype/2.13.1_x86_64/freetype-2.13.1-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
-    aarch64: '5dfea8476173a297a87f2c697a661fe79395b7d65179fbd5079c456a22052571',
-     armv7l: '5dfea8476173a297a87f2c697a661fe79395b7d65179fbd5079c456a22052571',
-       i686: '08ec3e9ef14be4aff807b56b6ad416a42107009c048256a89a630a64b9876a6a',
-     x86_64: 'a67976b71b703e33708410238d4c987ed7a37d4033f12515dfea01ecdb2fcb0b'
+    aarch64: '32d644934a6727c0ea8a0e8e13ed70de49e9c0337651818566dbd91d4cd52fd7',
+     armv7l: '32d644934a6727c0ea8a0e8e13ed70de49e9c0337651818566dbd91d4cd52fd7',
+     x86_64: '7f137b4b0bdcf332afe470d32c2cfb8b1a3464ed66cc9d7d1a20fe925ddca1f8'
   })
 
   depends_on 'brotli'
@@ -29,20 +26,13 @@ class Freetype < Package
   depends_on 'expat'
   depends_on 'gcc_lib'
   depends_on 'glib'
+  depends_on 'glibc' # R
   depends_on 'graphite'
   depends_on 'harfbuzz'
-  # depends_on 'librsvg'
-  depends_on 'pcre'
-  depends_on 'zlibpkg'
-  depends_on 'glibc' # R
   depends_on 'libpng' # R
+  depends_on 'pcre'
   depends_on 'py3_docwriter'
-
-  # to avoid resetting mold usage
-  no_env_options
-  # This overwrites the freetype in harfbuzz, which have
-  # epicircular dependencies on each other.
-  conflicts_ok # allowed to overwrite harfbuzz
+  depends_on 'zlibpkg'
 
   def self.build
     system "meson setup #{CREW_MESON_OPTIONS} \
@@ -113,31 +103,4 @@ class Freetype < Package
     LIBTOOLEOF
     File.write("#{CREW_DEST_LIB_PREFIX}/#{@libname}.la", @libtool_file)
   end
-
-  def self.postinstall
-    # make sure to delete downloaded files
-    system "find #{CREW_BREW_DIR}/* -name freetype*.tar -exec rm -rf {} +"
-    # This should become a function.
-    # check for conflicts with other installed files
-    @override_allowed = %w[fontconfig harfbuzz]
-    puts 'Checking for conflicts with files from installed packages...'
-    conflicts = []
-    conflictscmd = `grep --exclude #{CREW_META_PATH}#{name}.filelist -Fxf #{CREW_META_PATH}#{name}.filelist #{CREW_META_PATH}*.filelist`
-    conflicts << conflictscmd.gsub(/(\.filelist|#{CREW_META_PATH})/, '').split("\n")
-    conflicts.reject!(&:empty?)
-    unless conflicts.empty?
-      if conflicts_ok?
-        puts 'Handling conflict with the same file in another package.'.orange
-      else
-        puts 'Error: There is a conflict with the same file in another package.'.lightred
-        @_errors = 1
-      end
-      conflicts.each do |conflict|
-        conflict.each do |thisconflict|
-          singleconflict = thisconflict.split(':', -1)
-          system "sed -i '\\?^#{singleconflict[1]}?d'  #{CREW_META_PATH}/#{singleconflict[0]}.filelist" if @override_allowed.include?(singleconflict[0])
-        end
-      end
-    end
-  end
 end
diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb
index 60cd9c7df..7ed90a19c 100644
--- a/packages/harfbuzz.rb
+++ b/packages/harfbuzz.rb
@@ -1,26 +1,25 @@
 require 'package'
-# build order: harfbuzz => freetype => fontconfig => pango
+require_relative 'freetype'
+# build order: harfbuzz => freetype => fontconfig => cairo => pango
 
 class Harfbuzz < Package
   description 'HarfBuzz is an OpenType text shaping engine.'
   homepage 'https://www.freedesktop.org/wiki/Software/HarfBuzz/'
-  version '7.1.0'
+  version '7.3.0'
   license 'Old-MIT, ISC and icu'
-  compatibility 'all'
+  compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://github.com/harfbuzz/harfbuzz.git'
   git_hashtag version
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_armv7l/harfbuzz-7.1.0-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_armv7l/harfbuzz-7.1.0-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_i686/harfbuzz-7.1.0-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.1.0_x86_64/harfbuzz-7.1.0-chromeos-x86_64.tar.zst'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.3.0_armv7l/harfbuzz-7.3.0-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.3.0_armv7l/harfbuzz-7.3.0-chromeos-armv7l.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/harfbuzz/7.3.0_x86_64/harfbuzz-7.3.0-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
-    aarch64: '4f7a52a90c3ba072e520ce35d1f3ae98d5673394703ef2af3bc11ecc59be653e',
-     armv7l: '4f7a52a90c3ba072e520ce35d1f3ae98d5673394703ef2af3bc11ecc59be653e',
-       i686: '51ff026b275866174cf2e3b3b86f5351c542ae6bd62763124eba9ea69d8f8471',
-     x86_64: '6403cc02542560d51c9e64ab8ab502774a8324f59f8e936956dc3425565c67b5'
+    aarch64: '8eae2341b560a92f4e214b369e670e9d1cb195cbcc60489d9718fb7bfec615b0',
+     armv7l: '8eae2341b560a92f4e214b369e670e9d1cb195cbcc60489d9718fb7bfec615b0',
+     x86_64: '4bd7fadc454ddc205e67884bef2c926399174344ee70c1cbcb0d59828933d044'
   })
 
   depends_on 'brotli' # R
@@ -33,6 +32,7 @@ class Harfbuzz < Package
   depends_on 'glibc' # R
   depends_on 'glib' # R
   depends_on 'gobject_introspection' => :build
+  depends_on 'gperf' => :build
   depends_on 'graphite' # R
   depends_on 'icu4c' # R
   depends_on 'libffi' => :build
@@ -42,15 +42,13 @@ class Harfbuzz < Package
   depends_on 'libxext' # R
   depends_on 'libxrender' # R
   depends_on 'lzo' # R
+  depends_on 'patchelf' => :build
   depends_on 'pcre' => :build
   depends_on 'pixman' # R Needed for cairo subproject.
   depends_on 'zlibpkg' # R
 
   # provides freetype (sans harfbuzz), ragel, and a non-x11 cairo stub
 
-  no_env_options
-  conflicts_ok
-
   def self.prebuild
     %w[fontconfig freetype].each do |build_exclusion|
       next unless File.exist? "#{CREW_PREFIX}/etc/crew/meta/#{build_exclusion}.filelist"
@@ -59,9 +57,23 @@ class Harfbuzz < Package
     end
   end
 
+  def self.patch
+    File.write 'subprojects/freetype2.wrap', <<~FREETYPE2_WRAP_EOF
+      [wrap-git]
+      directory = freetype-#{Freetype.version}
+      url=https://gitlab.freedesktop.org/freetype/freetype.git
+      revision=VER-#{Freetype.version.tr('.', '-')}
+      depth=1
+
+      [provide]
+      freetype2 = freetype_dep
+      freetype = freetype_dep
+    FREETYPE2_WRAP_EOF
+  end
+
   def self.build
     system 'update-ca-certificates --fresh'
-    system "meson setup #{CREW_MESON_OPTIONS} \
+    system "mold -run meson setup #{CREW_MESON_OPTIONS} \
       --wrap-mode=default \
       --default-library=both \
       -Dbenchmark=disabled \
@@ -74,11 +86,124 @@ class Harfbuzz < Package
       -Dtests=disabled \
       builddir"
     system 'meson configure builddir'
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
     system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install"
+    # As per https://chromium-review.googlesource.com/c/chromium/src/+/696241
+    # Rename the freetype libaries included, and then use patchelf to redirect
+    # the harfbuzz libaries to those libraries.
+    # Rename the freetype libraries in this package.
+
+    # Handle Cairo files & libraries
+    @cairo_libs = Dir["#{CREW_DEST_LIB_PREFIX}/libcairo.*"]
+    @dest_links = []
+    @cairo_libs.each do |s|
+      @dest = s.gsub('libcairo', 'harfbuzz-libcairo')
+      FileUtils.mv s, @dest
+      @dest_file = `file #{@dest}`.chomp
+      if @dest_file.include?('LSB shared object')
+        @dest_so = @dest if @dest.include?('libcairo')
+      elsif @dest_file.include?('symbolic link')
+        @dest_links.push @dest
+      end
+    end
+    # Fix broken links
+    @dest_links.each do |broken_link|
+      Dir.chdir(CREW_DEST_LIB_PREFIX) do
+        FileUtils.ln_sf File.basename(@dest_so), File.basename(broken_link)
+      end
+    end
+
+    # Remove other cairo files.
+    FileUtils.rm_rf "#{CREW_DEST_PREFIX}/bin/cairo-trace"
+    FileUtils.rm_rf "#{CREW_DEST_PREFIX}/include/cairo"
+    FileUtils.rm_rf Dir["#{CREW_DEST_LIB_PREFIX}/pkgconfig/cairo-*"]
+    FileUtils.rm_rf Dir["#{CREW_DEST_LIB_PREFIX}/libcairo-*"]
+    FileUtils.rm_rf Dir["#{CREW_DEST_LIB_PREFIX}/cairo"]
+
+    # Set needed cairo library to our renamed package.
+    # Only libharfbuzz-cairo needs replacement with patchelf.
+    @harfbuzz_lib = Dir["#{CREW_DEST_LIB_PREFIX}/libharfbuzz-cairo.so.0.*.0"]
+    @harfbuzz_lib.each do |s|
+      system "patchelf --replace-needed libcairo.so.2 harfbuzz-libcairo.so.2 #{s}"
+    end
+
+    # Handle Freetype files & libraries
+    @freetype_libs = Dir["#{CREW_DEST_LIB_PREFIX}/libfreetype.*"]
+    @dest_links = []
+    @freetype_libs.each do |s|
+      @dest = s.gsub('libfreetype', 'libharfbuzz-freetype')
+      FileUtils.mv s, @dest
+      @dest_file = `file #{@dest}`.chomp
+      if @dest_file.include?('LSB shared object')
+        @dest_so = @dest
+      elsif @dest_file.include?('symbolic link')
+        @dest_links.push @dest
+      end
+    end
+    # Fix broken links
+    @dest_links.each do |broken_link|
+      Dir.chdir(CREW_DEST_LIB_PREFIX) do
+        FileUtils.ln_sf File.basename(@dest_so), File.basename(broken_link)
+      end
+    end
+
+    # Adjust other freetype files to avoid conflicts.
+    FileUtils.mv "#{CREW_DEST_PREFIX}/include/freetype2", "#{CREW_DEST_PREFIX}/include/harfbuzz-freetype2"
+    system "sed -i 's/lfreetype/lharfbuzz-freetype/g' #{CREW_DEST_LIB_PREFIX}/pkgconfig/freetype2.pc"
+    system "sed -i 's/freetype2/harfbuzz-freetype2/g' #{CREW_DEST_LIB_PREFIX}/pkgconfig/freetype2.pc"
+
+    # Set needed freetype library to our renamed package.
+    # Only libharfbuzz needs replacement with patchelf.
+    @libharfbuzz = Dir["#{CREW_DEST_LIB_PREFIX}/libharfbuzz.so.0.*.0"]
+    @libharfbuzz.each do |s|
+      system "patchelf --replace-needed libfreetype.so.6 libharfbuzz-freetype.so.6 #{s}"
+    end
+
+    # Handle Fontconfig files & libraries
+    @fontconfig_libs = Dir["#{CREW_DEST_LIB_PREFIX}/libfontconfig.*"]
+    @dest_links = []
+    @fontconfig_libs.each do |s|
+      @dest = s.gsub('libfontconfig', 'harfbuzz-libfontconfig')
+      FileUtils.mv s, @dest
+      @dest_file = `file #{@dest}`.chomp
+      if @dest_file.include?('LSB shared object')
+        @dest_so = @dest if @dest.include?('libfontconfig')
+      elsif @dest_file.include?('symbolic link')
+        @dest_links.push @dest
+      end
+    end
+    # Fix broken links
+    @dest_links.each do |broken_link|
+      Dir.chdir(CREW_DEST_LIB_PREFIX) do
+        FileUtils.ln_sf File.basename(@dest_so), File.basename(broken_link)
+      end
+    end
+
+    # Remove other fontconfig files.
+    FileUtils.rm_rf Dir["#{CREW_DEST_PREFIX}/bin/fc-*"]
+    FileUtils.rm_rf "#{CREW_DEST_PREFIX}/include/fontconfig"
+    FileUtils.rm_rf "#{CREW_DEST_PREFIX}/share/fontconfig"
+    FileUtils.rm_rf Dir["#{CREW_DEST_PREFIX}/share/gettext/its/fontconfig*"]
+    FileUtils.rm_rf Dir["#{CREW_DEST_PREFIX}/share/*/*/*/fontconfig*"]
+    FileUtils.rm_rf "#{CREW_DEST_PREFIX}/share/xml/fontconfig"
+    FileUtils.rm_rf "#{CREW_DEST_LIB_PREFIX}/pkgconfig/fontconfig.pc"
+
+    # Set needed fontconfig libraries to our renamed package.
+    # Only libharfbuzz-cairo * libcairo need replacements with patchelf.
+    # This is for the cairo library built as a subproject.
+    @libharfbuzz_cairo = Dir["#{CREW_DEST_LIB_PREFIX}/libharfbuzz-cairo.so.0.*.0"]
+    @libharfbuzz_cairo.each do |s|
+      system "patchelf --replace-needed libfontconfig.so.1 harfbuzz-libfontconfig.so.1 #{s}"
+    end
+    # This is for the libcairo library built as part of harfbuzz itself.
+    @harfbuzz_libcairo = Dir["#{CREW_DEST_LIB_PREFIX}/harfbuzz-libcairo.so.0.*.0"]
+    @harfbuzz_libcairo.each do |s|
+      system "patchelf --replace-needed libfontconfig.so.1 harfbuzz-libfontconfig.so.1 #{s}"
+    end
+
     # The following are included the libpng package.
     FileUtils.rm Dir["#{CREW_DEST_LIB_PREFIX}/libpng*"]
     FileUtils.rm Dir["#{CREW_DEST_PREFIX}/include/libpng16/png*"]
@@ -142,37 +267,4 @@ class Harfbuzz < Package
     LIBTOOLEOF
     File.write("#{CREW_DEST_LIB_PREFIX}/#{@libname}.la", @libtool_file)
   end
-
-  def self.preinstall
-    @device = JSON.parse(File.read("#{CREW_CONFIG_PATH}device.json"), symbolize_names: true)
-    return unless @device[:installed_packages].any? { |elem| elem[:name] == 'freetype' }
-
-    system "sed -i '/freetype2/d;/libfreetype/d' filelist"
-    system "sed -i '/freetype2/d;/libfreetype/d' dlist"
-  end
-
-  def self.postinstall
-    # This should become a function.
-    # check for conflicts with other installed files
-    @override_allowed = %w[fontconfig cairo]
-    puts 'Checking for conflicts with files from installed packages...'
-    conflicts = []
-    conflictscmd = `grep --exclude #{CREW_META_PATH}#{name}.filelist -Fxf #{CREW_META_PATH}#{name}.filelist #{CREW_META_PATH}*.filelist`
-    conflicts << conflictscmd.gsub(/(\.filelist|#{CREW_META_PATH})/, '').split("\n")
-    conflicts.reject!(&:empty?)
-    return if conflicts.empty?
-
-    if conflicts_ok?
-      puts 'Warning: There is a conflict with the same file in another package.'.orange
-    else
-      puts 'Error: There is a conflict with the same file in another package.'.lightred
-      @_errors = 1
-    end
-    conflicts.each do |conflict|
-      conflict.each do |thisconflict|
-        singleconflict = thisconflict.split(':', -1)
-        system "sed -i '\\?^#{singleconflict[1]}?d'  #{CREW_META_PATH}/#{singleconflict[0]}.filelist" if @override_allowed.include?(singleconflict[0])
-      end
-    end
-  end
 end
diff --git a/packages/pango.rb b/packages/pango.rb
index ad77ef818..f51afae51 100644
--- a/packages/pango.rb
+++ b/packages/pango.rb
@@ -1,62 +1,56 @@
 require 'package'
-# build order: harfbuzz => freetype => fontconfig => pango.
+# build order: harfbuzz => freetype => fontconfig => cairo => pango
 
 class Pango < Package
   description 'Pango is a library for laying out and rendering of text, with an emphasis on internationalization.'
   homepage 'https://pango.gnome.org/'
-  version '1.50.14'
+  @_ver = '1.50.14'
+  version "#{@_ver}-1"
   license 'LGPL-2+ and FTL'
-  compatibility 'all'
+  compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://gitlab.gnome.org/GNOME/pango.git'
-  git_hashtag version
+  git_hashtag @_ver
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_armv7l/pango-1.50.14-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_armv7l/pango-1.50.14-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_i686/pango-1.50.14-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14_x86_64/pango-1.50.14-chromeos-x86_64.tar.zst'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14-1_armv7l/pango-1.50.14-1-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14-1_armv7l/pango-1.50.14-1-chromeos-armv7l.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pango/1.50.14-1_x86_64/pango-1.50.14-1-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
-    aarch64: '1ce1cf1f0c7caf921d5d0781ae6758ee907e39d6f305653d761e0be63e152964',
-     armv7l: '1ce1cf1f0c7caf921d5d0781ae6758ee907e39d6f305653d761e0be63e152964',
-       i686: '488189887047f561ab1bd02065fab5781c3178ff6ea430bf07dad9db5c420b8a',
-     x86_64: 'c984d03b58e8bcfb5a35e44be3be61f37efb3ceef4554fe9dab4a7cf86cf6b43'
+    aarch64: '223a3d19029d1a31182fc300d346108ca9b9540fafc314e8783de62405cef8b5',
+     armv7l: '223a3d19029d1a31182fc300d346108ca9b9540fafc314e8783de62405cef8b5',
+     x86_64: '05fe571aa075b48305b79ccf41adce94b0f53a4a0c4ccbd757897c5dca40abc8'
   })
 
-  depends_on 'cairo' => :build
-  depends_on 'fribidi' # R
-  depends_on 'glib' # R
-  depends_on 'glibc' # R
-  depends_on 'gobject_introspection' => :build # add this package to build gtk+, avoid compilation error
+  depends_on 'cairo' # R
   depends_on 'fontconfig' # R
   depends_on 'freetype' # R
+  depends_on 'fribidi' # R
+  depends_on 'gcc_lib' # R
+  depends_on 'glibc' # R
+  depends_on 'glib' # R
+  depends_on 'gobject_introspection' => :build # add this package to build gtk+, avoid compilation error
   depends_on 'harfbuzz' # R
   depends_on 'libx11' # R
   depends_on 'libxdmcp' => :build
   depends_on 'libxft' # R
   depends_on 'libxrender' # R
   depends_on 'xorg_proto' => :build
-  depends_on 'cairo' # R
 
   def self.build
     system "meson setup #{CREW_MESON_OPTIONS} \
-    -Dinstall-tests=false \
-    -Dcairo=enabled \
-    -Dfreetype=enabled \
-    -Dfontconfig=enabled \
-    -Dlibthai=disabled \
-    -Dgtk_doc=false builddir"
-    # gtk-doc is set to false because I (@saltedcofii) am not
-    # convinced anyone is reading them; it's accessable online anyway
+      -Dinstall-tests=false \
+      -Dcairo=enabled \
+      -Dfreetype=enabled \
+      -Dfontconfig=enabled \
+      -Dlibthai=disabled \
+      -Dgtk_doc=false \
+      builddir"
     system 'meson configure builddir'
-    system "mold -run #{CREW_NINJA} -C builddir"
+    system "#{CREW_NINJA} -C builddir"
   end
 
   def self.install
     system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install"
   end
-
-  def self.check
-    system "#{CREW_NINJA} -C builddir test || true"
-  end
 end