From b923632d78183ad0bbe134ea7f65eac23e1487ea Mon Sep 17 00:00:00 2001 From: sibel Date: Thu, 7 Oct 2010 11:07:10 +0200 Subject: maj de pyqt#4.7.7-2 --- extra/pyqt/.md5sum | 1 + extra/pyqt/Pkgfile | 8 ++++++-- extra/pyqt/fix-kdebindings-4.5.2.patch | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 extra/pyqt/fix-kdebindings-4.5.2.patch 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. -- cgit v1.2.3-70-g09d2