Deal with compilers that are strict about template instantiation rules.

3 files changed, 65 insertions, 1 deletions

diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index ac03565c9cd..62786836401 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2011/11/29 15:30:27 hans Exp $
+$NetBSD: distinfo,v 1.39 2012/05/04 16:15:33 joerg Exp $
 
 SHA1 (kdegames-3.5.10.tar.bz2) = 287aa0d1ae19b8f04d64c4449fed6a7cec58844d
 RMD160 (kdegames-3.5.10.tar.bz2) = a185104b0048b0554f4638b482e69455eb10daa5
@@ -6,4 +6,6 @@ Size (kdegames-3.5.10.tar.bz2) = 10783059 bytes
 SHA1 (patch-kfouleggs_Makefile.in) = 53fc5088a5f6221f17f766fd37095950643da7e3
 SHA1 (patch-klickety_Makefile.in) = eac00e6ac57e5e6c0a5fadb5cb2d03e72f263a4d
 SHA1 (patch-kmines_Makefile.in) = 279c24b558b48323a25ff1e4e50d2b942b96b1b2
+SHA1 (patch-kpat_dealer.cpp) = 29bf8e5681413a851a900485a620974be506e807
+SHA1 (patch-kpat_dealer.h) = 14f0c0fc03122db1a23a38f1c384b0e1258be3a6
 SHA1 (patch-ksirtet_ksirtet_Makefile.in) = cc9b7c9bba6039d5d5291e6e53c7afdf289b36b9
diff --git a/games/kdegames3/patches/patch-kpat_dealer.cpp b/games/kdegames3/patches/patch-kpat_dealer.cpp
new file mode 100644
index 00000000000..a78b991eec6
--- /dev/null
+++ b/games/kdegames3/patches/patch-kpat_dealer.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-kpat_dealer.cpp,v 1.1 2012/05/04 16:15:33 joerg Exp $
+
+--- kpat/dealer.cpp.orig	2012-04-27 19:43:49.000000000 +0000
++++ kpat/dealer.cpp
+@@ -715,12 +715,26 @@ public:
+     }
+ };
+ 
++typedef QValueList<CardState> CardStateList;
++
++struct State
++{
++    CardStateList cards;
++    QString gameData;
++};
++
+ typedef class QValueList<CardState> CardStateList;
+ 
+ bool operator==( const State & st1, const State & st2) {
+     return st1.cards == st2.cards && st1.gameData == st2.gameData;
+ }
+ 
++int
++Dealer::getMoves()
++{
++    return undoList.count();
++}
++
+ State *Dealer::getState()
+ {
+     QCanvasItemList list = canvas()->allItems();
diff --git a/games/kdegames3/patches/patch-kpat_dealer.h b/games/kdegames3/patches/patch-kpat_dealer.h
new file mode 100644
index 00000000000..eab6dc3bc24
--- /dev/null
+++ b/games/kdegames3/patches/patch-kpat_dealer.h
@@ -0,0 +1,31 @@
+$NetBSD: patch-kpat_dealer.h,v 1.1 2012/05/04 16:15:33 joerg Exp $
+
+--- kpat/dealer.h.orig	2012-04-27 19:43:39.000000000 +0000
++++ kpat/dealer.h
+@@ -38,16 +38,7 @@ public:
+     virtual Dealer *createGame(KMainWindow *parent) = 0;
+ };
+ 
+-class CardState;
+-
+-typedef QValueList<CardState> CardStateList;
+-
+-struct State
+-{
+-    CardStateList cards;
+-    QString gameData;
+-};
+-
++struct State;
+ 
+ /***************************************************************
+ 
+@@ -114,7 +105,7 @@ public:
+     void setAutoDropEnabled(bool a);
+     bool autoDrop() const { return _autodrop; }
+ 
+-    int getMoves() const { return undoList.count(); }
++    int getMoves();
+ 
+ public slots:
+