From cdac78a41a209ffe7c474f424b11282e89f93dee Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 5 Apr 2012 15:19:24 +0000
Subject: [PATCH] Change the way to set PyQt options, tio avoid problems with
 compiling GUI module with newer versions of PyQt

---
 adm_local/unix/config_files/check_pyqt.m4 | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4
index d441bf46c..2be88b289 100644
--- a/adm_local/unix/config_files/check_pyqt.m4
+++ b/adm_local/unix/config_files/check_pyqt.m4
@@ -226,17 +226,18 @@ if test "x$pyqt_ok" == "xyes" ; then
                     PYQT_INCLUDES="${PYQT_INCLUDES} -I ${d}/QtSvg -I ${d}/QtTest"
 
                     # check compatibility with Qt
-                    SUPPORTED=`grep -e "[[[:space:]]]*Qt_[[[:digit:]_]]\+}" ${PYQT_SIPS}/QtCore/QtCoremod.sip | sed -e "s/\(.*\)[[[:space:]]]*\(Qt_[[[:digit:]_]]\+\)}/\2/g"`
-                    SUPPORTED=`echo $SUPPORTED | sed -e "s/Qt_//g" -e "s/_/./g"`
-                    SUPPORTED_ID=`echo $SUPPORTED | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'`
-                    if test $SUPPORTED_ID -lt $QT_VERSION_ID ; then 
-                        AC_MSG_RESULT(Warning! Used Qt version ($QT_VERSION) is not supported by PyQt)
-                        AC_MSG_RESULT(Latest supported Qt version is ${SUPPORTED})
-                    else
-                        SUPPORTED=${QT_VERSION}
-                    fi
-                    SUPPORTED="Qt_`echo ${SUPPORTED} | sed -e 's/\./_/g'`"
-                    PYQT_SIPFLAGS="-x VendorID -x PyQt_NoPrintRangeBug -t WS_X11 -t ${SUPPORTED} -g -s ".cc" -c . ${PYQT_INCLUDES}"
+                    #SUPPORTED=`grep -e "[[[:space:]]]*Qt_[[[:digit:]_]]\+}" ${PYQT_SIPS}/QtCore/QtCoremod.sip | sed -e "s/\(.*\)[[[:space:]]]*\(Qt_[[[:digit:]_]]\+\)}/\2/g"`
+                    #SUPPORTED=`echo $SUPPORTED | sed -e "s/Qt_//g" -e "s/_/./g"`
+                    #SUPPORTED_ID=`echo $SUPPORTED | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'`
+                    #if test $SUPPORTED_ID -lt $QT_VERSION_ID ; then 
+                    #    AC_MSG_RESULT(Warning! Used Qt version ($QT_VERSION) is not supported by PyQt)
+                    #    AC_MSG_RESULT(Latest supported Qt version is ${SUPPORTED})
+                    #else
+                    #    SUPPORTED=${QT_VERSION}
+                    #fi
+                    #SUPPORTED="Qt_`echo ${SUPPORTED} | sed -e 's/\./_/g'`"
+		    PYQT_SIPFLAGS=`python -c "import pyqtconfig; print pyqtconfig.Configuration().pyqt_sip_flags"`
+                    PYQT_SIPFLAGS="${PYQT_SIPFLAGS} -s .cc -c . ${PYQT_INCLUDES}"
                     break
                 fi
             fi
-- 
2.39.2