Salome HOME
spns #32755 : TopIIVolMesh: move back to master branch
[tools/sat_salome.git] / products / patches / PyQt-4.9.1.patch
1 diff -pruN PyQt-x11-gpl-4.9.1/sip/QtDBus/qpydbuspendingreply.sip PyQt-x11-gpl-4.9.1_new/sip/QtDBus/qpydbuspendingreply.sip
2 --- PyQt-x11-gpl-4.9.1/sip/QtDBus/qpydbuspendingreply.sip       2012-02-10 11:35:14.000000000 +0100
3 +++ PyQt-x11-gpl-4.9.1_new/sip/QtDBus/qpydbuspendingreply.sip   2012-04-12 14:04:48.000000000 +0200
4 @@ -23,6 +23,8 @@
5  // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
6  
7  
8 +%If (Qt_4_7_0 -)
9 +
10  class QPyDBusPendingReply : QDBusPendingCall /PyName=QDBusPendingReply/
11  {
12  %TypeHeaderCode
13 @@ -47,3 +49,5 @@ public:
14  
15      SIP_PYOBJECT value(SIP_PYOBJECT type /DocValue="None"/ = 0) const /HoldGIL/;
16  };
17 +
18 +%End
19 diff -pruN PyQt-x11-gpl-4.9.1/sip/QtDBus/qpydbusreply.sip PyQt-x11-gpl-4.9.1_new/sip/QtDBus/qpydbusreply.sip
20 --- PyQt-x11-gpl-4.9.1/sip/QtDBus/qpydbusreply.sip      2012-02-10 11:35:14.000000000 +0100
21 +++ PyQt-x11-gpl-4.9.1_new/sip/QtDBus/qpydbusreply.sip  2012-04-12 14:04:48.000000000 +0200
22 @@ -23,6 +23,8 @@
23  // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24  
25  
26 +%If (Qt_4_7_0 -)
27 +
28  class QPyDBusReply /PyName=QDBusReply/
29  {
30  %TypeHeaderCode
31 @@ -241,3 +243,5 @@ template<TYPE>
32      return 0;
33  %End
34  };
35 +
36 +%End
37
38 diff -pruN PyQt-x11-gpl-4.9.1_old/configure.py PyQt-x11-gpl-4.9.1_new/configure.py
39 --- PyQt-x11-gpl-4.9.1_old/configure.py 2013-07-22 15:50:59.000000000 +0200
40 +++ PyQt-x11-gpl-4.9.1_new/configure.py 2013-07-22 15:42:12.000000000 +0200
41 @@ -375,8 +375,8 @@ class ConfigurePyQt4:
42          check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
43          check_module("QtXml", "qdom.h", "new QDomDocument()")
44          check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
45 -        check_module("phonon", "phonon/videowidget.h",
46 -                "new Phonon::VideoWidget()")
47 +        #check_module("phonon", "phonon/videowidget.h",
48 +        #        "new Phonon::VideoWidget()")
49          check_module("QtAssistant", "qassistantclient.h",
50                  "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
51                  extra_libs=ass_libs)