TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS with libfreetype6 >= 2.5.x

Browse Source 
This resolves Bug 1765
(cherry picked from commit 1ee1ffbae6)
v3.5.13-sru
Slávek Banko 11 years ago
parent f16757db87
commit 13859714fd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File

5
config.tests/x11/xfreetype.test
Unescape View File

@ -116,12 +116,15 @@ fi
# check for freetype2 headers # check for freetype2 headers
FREETYPE2_INCDIR= FREETYPE2_INCDIR=
if [ "$XFT" = "yes" ]; then if [ "$XFT" = "yes" ]; then
INC="freetype2/freetype/freetype.h"
XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
F= F=
for INCDIR in $INCDIRS; do for INCDIR in $INCDIRS; do
INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1
if ! [ -f $INCDIR/$INC ]; then
INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1
fi
if [ -f $INCDIR/$INC ]; then if [ -f $INCDIR/$INC ]; then
# detect major version of freetype2 # detect major version of freetype2
FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`

Write Preview
Loading…
Cancel
Save