You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.8 KiB
68 lines
2.8 KiB
diff -Naur qt-x11-free-3.2.3.orig/configure qt-x11-free-3.2.3/configure |
|
--- qt-x11-free-3.2.3.orig/configure 2003-10-21 12:04:20.000000000 +0200 |
|
+++ qt-x11-free-3.2.3/configure 2003-11-19 11:40:38.000000000 +0100 |
|
@@ -1684,21 +1684,6 @@ |
|
CFG_FREETYPE=yes |
|
fi |
|
fi |
|
- # add freetype2 include path |
|
- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then |
|
- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\"" |
|
- fi |
|
- rm -f $outpath/config.tests/x11/xft.inc |
|
- # add Xft specific libraries |
|
- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then |
|
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\"" |
|
- fi |
|
- rm -f $outpath/config.tests/x11/xft.lib |
|
- # add Xft specific config options |
|
- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then |
|
- QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`" |
|
- fi |
|
- rm -f $outpath/config.tests/x11/xft.cfg |
|
# auto-detect Session Management support |
|
if [ "$CFG_SM" = "auto" ]; then |
|
if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then |
|
@@ -2692,6 +2677,21 @@ |
|
if [ "$CFG_XKB" = "yes" ]; then |
|
QMAKE_CONFIG="$QMAKE_CONFIG xkb" |
|
fi |
|
+ # add freetype2 include path |
|
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then |
|
+ QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\"" |
|
+ fi |
|
+ rm -f $outpath/config.tests/x11/xft.inc |
|
+ # add Xft specific libraries |
|
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then |
|
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\"" |
|
+ fi |
|
+ rm -f $outpath/config.tests/x11/xft.lib |
|
+ # add Xft specific config options |
|
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then |
|
+ QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`" |
|
+ fi |
|
+ rm -f $outpath/config.tests/x11/xft.cfg |
|
fi |
|
|
|
[ '!' -z "$D_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"DEFINES+=$D_FLAGS\"" |
|
diff -Naur qt-x11-free-3.2.3.orig/config.tests/x11/xfreetype.test qt-x11-free-3.2.3/config.tests/x11/xfreetype.test |
|
--- qt-x11-free-3.2.3.orig/config.tests/x11/xfreetype.test Wed Nov 19 11:45:11 2003 |
|
+++ qt-x11-free-3.2.3/config.tests/x11/xfreetype.test Wed Nov 19 12:59:54 2003 |
|
@@ -56,7 +56,7 @@ |
|
XFT=no |
|
[ "$VERBOSE" = "yes" ] && echo " Could not find Xft lib anywhere in $LIBDIRS" |
|
fi |
|
-LIBXFT="-l$F -lfreetype" |
|
+LIBXFT="-l$F -lfontconfig -lexpat -lfreetype" |
|
|
|
# check for X11/Xft/Xft.h |
|
XFT_H= |
|
@@ -89,7 +89,7 @@ |
|
[ "$VERBOSE" = "yes" ] && echo " Found Xft version $XFT_MAJOR.$XFT_MINOR" |
|
if [ "$XFT_MAJOR" = "2" ]; then |
|
XFT2=yes |
|
- LIBXFT="$LIBXFT -lfontconfig" |
|
+ LIBXFT="$LIBXFT" |
|
fi |
|
fi |
|
|
|
|