Merge remote-tracking branch 'upstream/master'

2023-11-12 12:18:09 -05:00
parent 91ded7cbaa 817db8c3ca
commit bd29edf9c0
33 changed files with 396 additions and 87 deletions
--- a/config.mk
+++ b/config.mk
@@ -52,8 +52,8 @@ XCBLIBS = -lX11-xcb -lxcb -lxcb-res
 #IMLIB2LIBS = -lImlib2

 # Uncomment for the bidi patch
-#BDINC = -I/usr/include/fribidi
-#BDLIBS = -lfribidi
+#BDINC = `pkg-config --cflags fribidi`
+#BDLIBS = `pkg-config --libs fribidi`

 # includes and libs
 INCS = -I${X11INC} -I${FREETYPEINC} ${YAJLINC} ${PANGOINC} ${BDINC}