Yi Zhao 5a293cf439 tk: upgrade 8.6.9 -> 8.6.10
Drop patches that were merged upstream:
  configure.use.fontconfig.with.xft.patch
  non-linux.diff
  tklibrary.diff

Refresh patches:
  confsearch.diff
  fix-xft.diff

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-12-13 18:29:14 -08:00

17 lines
738 B
Diff

--- /tmp/configure.in 2010-05-19 13:29:03.000000000 +0200
+++ unix/configure.in 2010-05-19 13:42:05.000000000 +0200
@@ -526,13 +526,9 @@
found_xft="yes"
dnl make sure package configurator (xft-config or pkg-config
dnl says that xft is present.
- XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
- if test "$found_xft" = "no" ; then
found_xft=yes
XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
- fi
AC_MSG_RESULT([$found_xft])
dnl make sure that compiling against Xft header file doesn't bomb
if test "$found_xft" = "yes" ; then