diff options
| author | Bor Kraljič | 2010-10-07 09:24:31 +0200 |
|---|---|---|
| committer | Bor Kraljič | 2010-10-07 09:24:31 +0200 |
| commit | f3f64107541795c30c1d1515a74d864a60eecc2e (patch) | |
| tree | c4c8f1a3cabc9a8fbe231f9a124b921a2130cba0 | |
| parent | d996bd81654a5d910fa7646e2af2763dff90ec47 (diff) | |
pyqt4: added patch to fix kdebindings4 compile error
Patch was taken from arch:
http://repos.archlinux.org/wsvn/packages/pyqt/repos/extra-i686/fix-kdebindings-4.5.2.patch
| -rw-r--r-- | libs/pyqt4/HISTORY | 3 | ||||
| -rwxr-xr-x | libs/pyqt4/PRE_BUILD | 3 | ||||
| -rw-r--r-- | libs/pyqt4/fix-kdebindings-4.5.2.patch | 17 |
3 files changed, 23 insertions, 0 deletions
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY index bb37242fda..10e9a675cc 100644 --- a/libs/pyqt4/HISTORY +++ b/libs/pyqt4/HISTORY @@ -1,3 +1,6 @@ +2010-10-07 Bor Kraljič <pyrobor@ver.si> + * fix-kdebindings-4.5.2.patch: added to fix kdebindings4 compile error + 2010-09-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.7.7 diff --git a/libs/pyqt4/PRE_BUILD b/libs/pyqt4/PRE_BUILD new file mode 100755 index 0000000000..89d70e8aed --- /dev/null +++ b/libs/pyqt4/PRE_BUILD @@ -0,0 +1,3 @@ +mk_source_dir $SOURCE_DIRECTORY && + unpack_file && +patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-kdebindings-4.5.2.patch diff --git a/libs/pyqt4/fix-kdebindings-4.5.2.patch b/libs/pyqt4/fix-kdebindings-4.5.2.patch new file mode 100644 index 0000000000..49a915f095 --- /dev/null +++ b/libs/pyqt4/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. |