summarylogtreecommitdiffstats
path: root/sip415_fix.patch
diff options
context:
space:
mode:
authornezumisama2015-06-14 18:11:16 +0200
committernezumisama2015-06-14 18:11:16 +0200
commitc800dba419a85c7420c292975447fa813a40ab23 (patch)
tree10293beb4e320458a38fe74215f7ed1ddea6cfa6 /sip415_fix.patch
downloadaur-c800dba419a85c7420c292975447fa813a40ab23.tar.gz
Initial commit.
Diffstat (limited to 'sip415_fix.patch')
-rw-r--r--sip415_fix.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/sip415_fix.patch b/sip415_fix.patch
new file mode 100644
index 000000000000..205500a0163b
--- /dev/null
+++ b/sip415_fix.patch
@@ -0,0 +1,30 @@
+From: hpj@urpla.net
+
+This patch allows PyQt 3.18.1 to build with sip 4.15+.
+
+--- sip/qt/qlayout.sip~ 2009-06-16 10:47:31.000000000 +0200
++++ sip/qt/qlayout.sip 2013-11-19 23:34:01.451326665 +0100
+@@ -328,8 +328,8 @@ public:
+ QSizePolicy::ExpandData expanding() const;
+ QSize minimumSize() const;
+ QSize maximumSize() const;
+- void setGeometry(const QRect &) = 0;
+- QLayoutIterator iterator() = 0;
++ virtual void setGeometry(const QRect &) = 0;
++ virtual QLayoutIterator iterator() = 0;
+ bool isEmpty() const;
+
+ int totalHeightForWidth(int) const;
+
+--- sip/qtnetwork/qftp.sip~ 2009-06-16 10:47:31.000000000 +0200
++++ sip/qtnetwork/qftp.sip 2013-11-20 11:22:25.710338805 +0100
+@@ -177,6 +177,9 @@ protected:
+ virtual void operationRename(QNetworkOperation *);
+ virtual void operationGet(QNetworkOperation *);
+ virtual void operationPut(QNetworkOperation *);
++
++private:
++ virtual bool checkConnection(QNetworkOperation *);
+ };
+
+ %End