SALOME 6.5.0 preparation: update PyQt script for version 4.9.1 (currect version is...

diff --git a/config_files/PyQt.sh b/config_files/PyQt.sh
index e3e70fd041dbed3fac95d9a4b4b5e9f68d6b151d..148d2111f21ab079e40ebbb262a35d7b01550740 100755 (executable)
--- a/config_files/PyQt.sh
+++ b/config_files/PyQt.sh
@@ -80,6 +80,9 @@ if [ "$apply_patch_for_phonon" == "1" ] ; then
     ( cd ${PRODUCT_SRC_DIR}/sip/phonon && for f in `find . -name "*.sip"` ; do sed -i "s%^#include <%#include <phonon/%g" $f ; done )
 fi
 
+# apply additional patch (if there's any)
+( test -f patches/PyQt-${PYQT_VERSION}.patch && cp patches/PyQt-${PYQT_VERSION}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < PyQt-${PYQT_VERSION}.patch )
+
 # to generate environment scripts
 try_preinstalled
 }

diff --git a/config_files/patches/PyQt-4.9.1.patch b/config_files/patches/PyQt-4.9.1.patch
new file mode 100644 (file)
index 0000000..caea281
--- /dev/null
+++ b/config_files/patches/PyQt-4.9.1.patch
@@ -0,0 +1,36 @@
+diff -Naur --exclude=CVS PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbuspendingreply.sip PyQt-4.9.1_SRC/sip/QtDBus/qpydbuspendingreply.sip
+--- PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbuspendingreply.sip     2012-02-10 14:35:14.000000000 +0400
++++ PyQt-4.9.1_SRC/sip/QtDBus/qpydbuspendingreply.sip  2012-04-04 15:21:35.000000000 +0400
+@@ -23,6 +23,8 @@
+ // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ 
++%If (Qt_4_7_0 -)
++
+ class QPyDBusPendingReply : QDBusPendingCall /PyName=QDBusPendingReply/
+ {
+ %TypeHeaderCode
+@@ -47,3 +49,5 @@
+ 
+     SIP_PYOBJECT value(SIP_PYOBJECT type /DocValue="None"/ = 0) const /HoldGIL/;
+ };
++
++%End
+diff -Naur --exclude=CVS PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbusreply.sip PyQt-4.9.1_SRC/sip/QtDBus/qpydbusreply.sip
+--- PyQt-4.9.1_SRC.orig/sip/QtDBus/qpydbusreply.sip    2012-02-10 14:35:14.000000000 +0400
++++ PyQt-4.9.1_SRC/sip/QtDBus/qpydbusreply.sip 2012-04-04 15:21:40.000000000 +0400
+@@ -23,6 +23,8 @@
+ // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ 
++%If (Qt_4_7_0 -)
++
+ class QPyDBusReply /PyName=QDBusReply/
+ {
+ %TypeHeaderCode
+@@ -241,3 +243,5 @@
+     return 0;
+ %End
+ };
++
++%End