Sat Dec 22 20:01:45 2012 UTC ()
Fix template look up.


(joerg)
diff -r1.7 -r1.8 pkgsrc/graphics/kphotoalbum/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/kphotoalbum/patches/patch-src_Utilities_Set.cpp
diff -r0 -r1.1 pkgsrc/graphics/kphotoalbum/patches/patch-src_Utilities_Set.h
cvs diff -r1.7 -r1.8 pkgsrc/graphics/kphotoalbum/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/kphotoalbum/Attic/distinfo 2011/11/24 14:00:53 1.7
+++ pkgsrc/graphics/kphotoalbum/Attic/distinfo 2012/12/22 20:01:44 1.8
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.7 2011/11/24 14:00:53 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2012/12/22 20:01:44 joerg Exp $
2 2
3SHA1 (kphotoalbum-3.1.1.tar.bz2) = 28957f177adda08caba1935e05b7e3dc20e7649e 3SHA1 (kphotoalbum-3.1.1.tar.bz2) = 28957f177adda08caba1935e05b7e3dc20e7649e
4RMD160 (kphotoalbum-3.1.1.tar.bz2) = 8bda36262a160f8f0db994698bf337ee89b95a7b 4RMD160 (kphotoalbum-3.1.1.tar.bz2) = 8bda36262a160f8f0db994698bf337ee89b95a7b
5Size (kphotoalbum-3.1.1.tar.bz2) = 15503061 bytes 5Size (kphotoalbum-3.1.1.tar.bz2) = 15503061 bytes
6SHA1 (patch-aa) = 8ff3f4b51f45098c907497897f5e63c6d36bf767 6SHA1 (patch-aa) = 8ff3f4b51f45098c907497897f5e63c6d36bf767
7SHA1 (patch-ab) = f80b02e6705b82202827a230c3a568f97eb59056 7SHA1 (patch-ab) = f80b02e6705b82202827a230c3a568f97eb59056
8SHA1 (patch-src_MainWindow_Window.cpp) = dec64f9c3651c7d13cb2b6402bfc86fbf27dbc28 8SHA1 (patch-src_MainWindow_Window.cpp) = dec64f9c3651c7d13cb2b6402bfc86fbf27dbc28
9SHA1 (patch-src_Utilities_Set.cpp) = c8960cd10a05cebfb65570907cca41f9c2b49e13 9SHA1 (patch-src_Utilities_Set.cpp) = 00c3478fa36d1f1e2fe1012985f4d0fb4047edc3
 10SHA1 (patch-src_Utilities_Set.h) = abbdefb666460ea899ec29768097db3bc77c38a6
cvs diff -r1.1 -r1.2 pkgsrc/graphics/kphotoalbum/patches/Attic/patch-src_Utilities_Set.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/kphotoalbum/patches/Attic/patch-src_Utilities_Set.cpp 2011/11/24 14:00:53 1.1
+++ pkgsrc/graphics/kphotoalbum/patches/Attic/patch-src_Utilities_Set.cpp 2012/12/22 20:01:45 1.2
@@ -1,22 +1,27 @@ @@ -1,22 +1,27 @@
1$NetBSD: patch-src_Utilities_Set.cpp,v 1.1 2011/11/24 14:00:53 joerg Exp $ 1$NetBSD: patch-src_Utilities_Set.cpp,v 1.2 2012/12/22 20:01:45 joerg Exp $
2 2
3--- src/Utilities/Set.cpp.orig 2011-11-24 02:03:09.000000000 +0000 3--- src/Utilities/Set.cpp.orig 2008-03-17 18:56:18.000000000 +0000
4+++ src/Utilities/Set.cpp 4+++ src/Utilities/Set.cpp
5@@ -39,7 +39,7 @@ QValueList<T> Utilities::Set<T>::toList( 5@@ -39,7 +39,7 @@ QValueList<T> Utilities::Set<T>::toList(
6 } 6 }
7  7
8 template <class T> 8 template <class T>
9-Utilities::Set<T>::Set<T>& Utilities::Set<T>::operator+=(const Set<T>& other) 9-Utilities::Set<T>::Set<T>& Utilities::Set<T>::operator+=(const Set<T>& other)
10+Utilities::Set<T>& Utilities::Set<T>::operator+=(const Set<T>& other) 10+Utilities::Set<T>& Utilities::Set<T>::operator+=(const Set<T>& other)
11 { 11 {
12 for (typename Set<T>::const_iterator i = other.begin(); 12 for (typename Set<T>::const_iterator i = other.begin();
13 i != other.end(); ++i) 13 i != other.end(); ++i)
14@@ -48,7 +48,7 @@ Utilities::Set<T>::Set<T>& Utilities::Se 14@@ -48,11 +48,11 @@ Utilities::Set<T>::Set<T>& Utilities::Se
15 } 15 }
16  16
17 template <class T> 17 template <class T>
18-Utilities::Set<T>::Set<T>& Utilities::Set<T>::operator-=(const Set<T>& other) 18-Utilities::Set<T>::Set<T>& Utilities::Set<T>::operator-=(const Set<T>& other)
19+Utilities::Set<T>& Utilities::Set<T>::operator-=(const Set<T>& other) 19+Utilities::Set<T>& Utilities::Set<T>::operator-=(const Set<T>& other)
20 { 20 {
21 for (typename Set<T>::const_iterator i = other.begin(); 21 for (typename Set<T>::const_iterator i = other.begin();
22 i != other.end(); ++i) 22 i != other.end(); ++i)
 23- erase(*i);
 24+ this->erase(*i);
 25 return *this;
 26 }
 27
File Added: pkgsrc/graphics/kphotoalbum/patches/Attic/patch-src_Utilities_Set.h
$NetBSD: patch-src_Utilities_Set.h,v 1.1 2012/12/22 20:01:45 joerg Exp $

--- src/Utilities/Set.h.orig	2012-12-22 19:04:37.000000000 +0000
+++ src/Utilities/Set.h
@@ -50,7 +50,7 @@ namespace Utilities
 
         bool contains(const T& x) const
         {
-            return count(x) > 0;
+            return this->count(x) > 0;
         }
 
         Set<T>& operator+=(const Set<T>& other);