using font-index

configure.ac

@@ -3934,7 +3934,7 @@ if test "${HAVE_X11}" = "yes"; then
     fi
   fi
 else # "${HAVE_X11}" != "yes"
-  if test $window_system = pgtk; then
+  if test $window_system = pgtk && test "${with_webrender}" != "yes"; then
     EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
     EMACS_CHECK_MODULES([FREETYPE], [freetype2])
     if test "$HAVE_FONTCONFIG" != yes -o "$HAVE_FREETYPE" != yes; then
@@ -3972,9 +3972,9 @@ if test "${HAVE_W32}" = "yes"; then
 else
   harfbuzz_required_ver=0.9.42
 fi
-if test "${HAVE_X11}" = "yes" && test "${HAVE_FREETYPE}" = "yes" \
+if (test "${HAVE_X11}" = "yes" && test "${HAVE_FREETYPE}" = "yes" \
         || test "$window_system" = "pgtk" \
-        || test "${HAVE_W32}" = "yes"; then
+        || test "${HAVE_W32}" = "yes") && test "${with_webrender}" != "yes"; then
   if test "${with_harfbuzz}" != "no"; then
     EMACS_CHECK_MODULES([HARFBUZZ], [harfbuzz >= $harfbuzz_required_ver])
     if test "$HAVE_HARFBUZZ" = "yes"; then
@@ -6346,7 +6346,9 @@ if test "${HAVE_X_WINDOWS}" = "yes" ; then
 fi
 
 if test "${window_system}" = "pgtk"; then
-   FONT_OBJ="ftfont.o ftcrfont.o"
+  if test "$HAVE_FREETYPE" = "yes"; then
+    FONT_OBJ="ftfont.o ftcrfont.o"
+  fi
 fi
 
 if test "${HAVE_BE_APP}" = "yes" ; then
@@ -6412,14 +6414,6 @@ if test "${with_webrender}" = "yes" ; then
 
   AC_DEFINE(HAVE_NATIVE_IMAGE_API, 1, [Define to use native OS APIs for images.])
             NATIVE_IMAGE_API="yes (webrender)"
-
-  if test "${opsys}" = gnu-linux; then
-    EMACS_CHECK_MODULES([FREETYPE], [freetype2])
-    test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(webrender requires libfreetype)
-
-    EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
-    test "$HAVE_FONTCONFIG" = "no" && AC_MSG_ERROR(webrender requires libfontconfig)
-  fi
 fi
 AC_SUBST(WEBRENDER_LIBS)
 
@@ -6944,6 +6938,7 @@ AS_ECHO(["  Does Emacs use -lXaw3d?                                 ${HAVE_XAW3D
   Does Emacs use -lwebp?                                  ${HAVE_WEBP}
   Does Emacs use -lsqlite3?                               ${HAVE_SQLITE3}
   Does Emacs use cairo?                                   ${HAVE_CAIRO}
+  Does Emacs use webrender?                               ${with_webrender}
   Does Emacs use -llcms2?                                 ${HAVE_LCMS2}
   Does Emacs use imagemagick?                             ${HAVE_IMAGEMAGICK}
   Does Emacs use native APIs for images?                  ${NATIVE_IMAGE_API}
@@ -6975,7 +6970,6 @@ AS_ECHO(["  Does Emacs use -lXaw3d?                                 ${HAVE_XAW3D
   Does Emacs support legacy unexec dumping?               ${with_unexec}
   Which dumping strategy does Emacs use?                  ${with_dumping}
   Does Emacs have native lisp compiler?                   ${HAVE_NATIVE_COMP}
-  Does Emacs use webrender?                               ${with_webrender}
   Does Emacs include JavaScript?                          ${with_javascript}
   Does Emacs use version 2 of the X Input Extension?      ${HAVE_XINPUT2}
   Does Emacs generate a smaller-size Japanese dictionary? ${with_small_ja_dic}

rust_src/crates/webrender/Cargo.toml

@@ -34,7 +34,7 @@ glutin = { version = "0.30.6", optional = true }
 ouroboros = "0.15.5"
 tiny-skia = "0.8"
 parking_lot = "0.12"
-swash = "0.1.8"
+swash = "0.1"
 
 [dependencies.nix]
 optional = true
@@ -49,6 +49,10 @@ features = ["signal"]
 path = "/shared/src/webrender/webrender"
 default-features = false
 
+[dependencies.font-index]
+path = "/home/declan/src/Fonts/font-index"
+default-features = false
+
 [dependencies.webrender_surfman]
 git = "https://github.com/declantsien/webrender_surfman.git"
 rev = "8b1f8a5e001c3cdabb49c7affda483343a2f792f"