diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2011-01-07 00:32:11 +0100 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-01-07 00:32:11 +0100 |
| commit | 11ad60dbb8676cfce8e1145b4be31053eb940f8a (patch) | |
| tree | a8023e1fe049faa603a8a26b3fcb6565b38d2fb0 /kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch | |
| parent | 02e912cd81275206f75b83c0de9b7d52ed0bc5ec (diff) | |
| parent | 63fc8b1181aaabfe6dfbad592a758574819f17e9 (diff) | |
| download | kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.tar.gz kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.tar.bz2 kde-11ad60dbb8676cfce8e1145b4be31053eb940f8a.zip | |
Merge branch 'master' into kde-git
Conflicts:
kde-base/pykde4/Manifest
kde-base/pykde4/pykde4-9999.ebuild
Diffstat (limited to 'kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch')
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch b/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch deleted file mode 100644 index 570eb15fc90..00000000000 --- a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip ---- pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip 2010-05-27 19:21:46.000000000 +0200 -+++ pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip 2010-07-15 06:36:27.000000000 +0200 -@@ -19,7 +19,7 @@ - - namespace Akonadi - { --class AddressAttribute : Akonadi::Attribute -+class AddressAttribute : Akonadi::Attribute /NoDefaultCtors/ - { - %TypeHeaderCode - #include <akonadi/kmime/addressattribute.h> |