summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-10-07 11:07:10 +0200
committersibel <lesibel at free dot fr>2010-10-07 11:07:10 +0200
commitb923632d78183ad0bbe134ea7f65eac23e1487ea (patch)
tree508dce8df0a05bb3cbd0a556543651be3cfd768c
parent79afcfb7cc5e44faa9743c40b3463e2c09e71c27 (diff)
downloadnutyx-extra-b923632d78183ad0bbe134ea7f65eac23e1487ea.tar.gz
nutyx-extra-b923632d78183ad0bbe134ea7f65eac23e1487ea.tar.bz2
nutyx-extra-b923632d78183ad0bbe134ea7f65eac23e1487ea.tar.xz
nutyx-extra-b923632d78183ad0bbe134ea7f65eac23e1487ea.zip
maj de pyqt#4.7.7-2
-rw-r--r--extra/pyqt/.md5sum1
-rw-r--r--extra/pyqt/Pkgfile8
-rw-r--r--extra/pyqt/fix-kdebindings-4.5.2.patch17
3 files changed, 24 insertions, 2 deletions
diff --git a/extra/pyqt/.md5sum b/extra/pyqt/.md5sum
index 804011490..e26d276c1 100644
--- a/extra/pyqt/.md5sum
+++ b/extra/pyqt/.md5sum
@@ -1 +1,2 @@
b7b30ab25ee976407b37052f2f724bce PyQt-x11-gpl-4.7.7.tar.gz
+8484f787214d55d23bc3b790fc80b450 fix-kdebindings-4.5.2.patch
diff --git a/extra/pyqt/Pkgfile b/extra/pyqt/Pkgfile
index 173d75f47..b4733e95a 100644
--- a/extra/pyqt/Pkgfile
+++ b/extra/pyqt/Pkgfile
@@ -6,11 +6,15 @@
name=pyqt
version=4.7.7
-release=1
-source=(http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-$version.tar.gz)
+release=2
+source=(http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-$version.tar.gz
+ fix-kdebindings-4.5.2.patch)
build() {
cd PyQt-x11-gpl-$version
+
+ patch -Np0 -i ../fix-kdebindings-4.5.2.patch
+
echo yes | python configure.py -b /usr/bin \
-d /usr/lib/python2.6/site-packages \
-v /usr/share/sip
diff --git a/extra/pyqt/fix-kdebindings-4.5.2.patch b/extra/pyqt/fix-kdebindings-4.5.2.patch
new file mode 100644
index 000000000..49a915f09
--- /dev/null
+++ b/extra/pyqt/fix-kdebindings-4.5.2.patch
@@ -0,0 +1,17 @@
+--- sip/QtCore/qglobal.sip~ 2010-09-20 15:10:28.000000000 +0200
++++ sip/QtCore/qglobal.sip 2010-09-30 15:00:13.804577344 +0200
+@@ -312,12 +312,12 @@ public:
+ // Qt.Alignment class.
+ QFlags operator|(int f);
+ %MethodCode
+- sipRes = new QFlags(*a0 | (ENUM(a1)));
++ sipRes = new QFlags(*a0 | a1);
+ %End
+
+ QFlags operator^(int f);
+ %MethodCode
+- sipRes = new QFlags(*a0 ^ (ENUM(a1)));
++ sipRes = new QFlags(*a0 ^ a1);
+ %End
+
+ // These are necessary to prevent Python comparing object IDs.