[patch] qmake >=5.10 and fixes additional freetype2 error

01-qmake-freetype.patch (text/plain), 1.16 KB, created by William T Wilson on 2018-08-09 14:00:59 UTC

--- a/configure	2018-08-09 07:49:10.658929854 -0600
+++ b/configure	2018-08-09 07:45:36.856987334 -0600
@@ -1592,12 +1592,12 @@
     func=$4
     shift 4
     disable $cfg
-    check_cmd ${pkg}-config --version
+    check_cmd $pkg_config --version
     err=$?
     if test "$err" = 0; then
         backup_cflags=$CFLAGS
-        temp_extralibs=$(${pkg}-config --libs)
-        add_cflags $(${pkg}-config --cflags)
+        temp_extralibs=$($pkg_config --libs $pkg)
+        add_cflags $($pkg_config --cflags $pkg)
         check_lib "$@" $header $func $temp_extralibs && enable $cfg
         CFLAGS=$backup_cflags
     fi
@@ -5907,7 +5907,7 @@
 enabled pic && enable_weak_pic
 
 is_qmake5(){
-    $1 --version 2>&1 | egrep -q -e "Qt version 5\.[2-9]\.[0-9]"
+    $1 --version 2>&1 | egrep -q -e 'Qt version 5\.(([1-9][0-9]+)|[2-9])\.[0-9]'
 }
 
 # qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
@@ -6902,7 +6902,7 @@
 EOF
 done
 
-check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType
+check_foo_config freetype2 freetype2 ft2build.h FT_Init_FreeType
 
 enabled freetype2 ||
     die "ERROR! You must have FreeType installed to compile MythTV."