diff options
author | rakuco <rakuco@FreeBSD.org> | 2012-04-16 02:44:17 +0800 |
---|---|---|
committer | rakuco <rakuco@FreeBSD.org> | 2012-04-16 02:44:17 +0800 |
commit | 5b05d377fb99aab972e1e6ac51d2ba90ce475e5f (patch) | |
tree | fdffbf393b56ec19c549c7e6bee6b4426f780c04 /deskutils/kdepimlibs4 | |
parent | 4712707269fcf43a3d679a80dd4e9e99cb5cd1f6 (diff) | |
download | freebsd-ports-gnome-5b05d377fb99aab972e1e6ac51d2ba90ce475e5f.tar.gz freebsd-ports-gnome-5b05d377fb99aab972e1e6ac51d2ba90ce475e5f.tar.zst freebsd-ports-gnome-5b05d377fb99aab972e1e6ac51d2ba90ce475e5f.zip |
Fix build with clang.
Import upstream commit b886894bd1afc515947c24883169d0a5107a86d5, which
fixes the build with clang.
Shouldn't be needed anymore when 4.8.x hits the tree.
PR: 166271
Diffstat (limited to 'deskutils/kdepimlibs4')
-rw-r--r-- | deskutils/kdepimlibs4/files/patch-git_b886894 | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/deskutils/kdepimlibs4/files/patch-git_b886894 b/deskutils/kdepimlibs4/files/patch-git_b886894 new file mode 100644 index 000000000000..5f3130884712 --- /dev/null +++ b/deskutils/kdepimlibs4/files/patch-git_b886894 @@ -0,0 +1,32 @@ +commit b886894bd1afc515947c24883169d0a5107a86d5 +Author: Till Adam <till@kdab.com> +Date: Fri Sep 9 20:29:39 2011 +0200 + + Disambiguations necessary for building with clang. + +diff --git a/kcal/listbase.h b/kcal/listbase.h +index c246cc0..80acc23 100644 +--- kcal/listbase.h ++++ kcal/listbase.h +@@ -115,7 +115,7 @@ class ListBase : public QList<T *> + */ + bool removeRef( T *t ) + { +- if ( !contains( t ) ) { ++ if ( !this->contains( t ) ) { + return false; + } else { + if ( mAutoDelete ) { +diff --git a/kmime/kautodeletehash.h b/kmime/kautodeletehash.h +index 2e24c3a..67cb1dd 100644 +--- kmime/kautodeletehash.h ++++ kmime/kautodeletehash.h +@@ -64,7 +64,7 @@ public: + */ + ~KAutoDeleteHash() { while ( ! QHash<Key, T *>::isEmpty() ) { + T *value = *QHash<Key, T *>::begin(); +- erase( QHash<Key, T *>::begin() ); ++ this->erase( QHash<Key, T *>::begin() ); + delete value; + } + } |