diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-04-12 10:11:01 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-04-12 10:11:01 +0200 |
| commit | a4937b110c2c19699a179e4ae17b5d3864168561 (patch) | |
| tree | 5c54e70b81bb074f994a678e667231cddc88892f /opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff | |
| parent | bb94b933beb07ad9ebe9af255ee2fa8d91df7896 (diff) | |
| download | tde-packaging-a4937b110c2c19699a179e4ae17b5d3864168561.tar.gz tde-packaging-a4937b110c2c19699a179e4ae17b5d3864168561.zip | |
RPM Packaging: update QT3
Diffstat (limited to 'opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff')
| -rw-r--r-- | opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff b/opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff deleted file mode 100644 index 3adbc7bf4..000000000 --- a/opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff +++ /dev/null @@ -1,28 +0,0 @@ -commit 1ee1ffbae69dc78721af139f0794628571fd35ef -Author: Slávek Banko <slavek.banko@axis.cz> -Date: 1386900429 +0100 - - Fix FTBFS with libfreetype6 >= 2.5.x - This resolves Bug 1765 - -diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test -index 5cabc32..d4cb4ba 100755 ---- a/config.tests/x11/xfreetype.test -+++ b/config.tests/x11/xfreetype.test -@@ -116,12 +116,15 @@ fi - # check for freetype2 headers - FREETYPE2_INCDIR= - if [ "$XFT" = "yes" ]; then -- INC="freetype2/freetype/freetype.h" - 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` - INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" - F= - 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 - # detect major version of freetype2 - FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |