[fltk] undo changes, xft pkgconfig already requires fontconfig
Rex Dieter
rdieter at fedoraproject.org
Tue Dec 7 18:57:54 UTC 2010
commit 82bdac2cb400d86ecbd352497653e176a4422c2e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Dec 7 12:56:51 2010 -0600
undo changes, xft pkgconfig already requires fontconfig
fltk-1.1.10-pkgconfig_xft.patch | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/fltk-1.1.10-pkgconfig_xft.patch b/fltk-1.1.10-pkgconfig_xft.patch
index d348122..145a43a 100644
--- a/fltk-1.1.10-pkgconfig_xft.patch
+++ b/fltk-1.1.10-pkgconfig_xft.patch
@@ -7,8 +7,8 @@ diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure
if test "x$FTCONFIG" != x; then
- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
-+ CPPFLAGS="`pkg-config --cflags xft fontconfig` $CPPFLAGS"
-+ CXXFLAGS="`pkg-config --cflags xft fontconfig` $CXXFLAGS"
++ CPPFLAGS="`pkg-config --cflags xft` $CPPFLAGS"
++ CXXFLAGS="`pkg-config --cflags xft` $CXXFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@@ -17,7 +17,7 @@ diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXft $LIBS"
-+LIBS="`pkg-config --libs xft fontconfig` $LIBS"
++LIBS="`pkg-config --libs xft` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
More information about the scm-commits
mailing list