games compiles as well

x11/kde4/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/01/21 21:47:56 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/21 22:08:14 espie Exp $
 
 #     SUBDIR += accessibility
 #     SUBDIR += admin
@@ -7,7 +7,7 @@
      SUBDIR += base-runtime
      SUBDIR += base-workspace
 #     SUBDIR += edu
-#     SUBDIR += games
+     SUBDIR += games
 #     SUBDIR += graphics
      SUBDIR += libs
 #     SUBDIR += network

x11/kde4/games/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 20:04:22 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2008/01/21 22:08:14 espie Exp $
 
-COMMENT=		K Desktop Environment, games
-DISTNAME=		kdegames-${VERSION}
-PKGNAME=		${DISTNAME}p0
+COMMENT =		K Desktop Environment, games
+DISTNAME =		kdegames-${VERSION}
+PKGNAME =		${DISTNAME}
 
 SHARED_LIBS +=	atlantic             5.0      # .4.0
 SHARED_LIBS +=	atlantikclient       5.0      # .4.0
@@ -11,13 +11,21 @@ SHARED_LIBS +=	kdegames             5.0      # .4.0
 SHARED_LIBS +=	kmahjongglib         0.0      # .1.0
 SHARED_LIBS +=	kolflib              0.0      # .1.2
 SHARED_LIBS +=	ksirtetlib           0.0      # .1.2
+SHARED_LIBS +=	kggzgames            0.0      # .4.0
+SHARED_LIBS +=	kggzmod              0.0      # .4.0
+SHARED_LIBS +=	kggznet              0.0      # .4.0
+SHARED_LIBS +=	kolfprivate          0.0      # .4.0
 
-LIB_DEPENDS+=	kdecore.>=8,kde3support,kdefx,kdeprint,kdesu,kdeui,kdnssd,kio,knotifyconfig,kparts,kutils,kwalletclient,phononcore::x11/kde4/libs
+
+LIB_DEPENDS +=	kdecore.>=8,kde3support,kdeui,kdnssd,kio,knotifyconfig,kparts,kfile,knewstuff2,kpty,phonon,solid::x11/kde4/libs
 
 WANTLIB += ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama Xpm
 WANTLIB += Xrandr Xrender Xtst c fontconfig freetype m png pthread
 WANTLIB += stdc++ util z
 WANTLIB += Qt3Support QtDBus QtGui QtNetwork QtOpenGL QtSvg QtXml
 WANTLIB += bz2
+WANTLIB += GL GLU Xfixes dbus-1 fam glib-2.0 gthread-2.0 iconv
+WANTLIB += intl streamanalyzer streams
+
 
 .include <bsd.port.mk>

x11/kde4/games/distinfo

@@ -1,5 +1,5 @@
-MD5 (kde/kdegames-3.80.3.tar.bz2) = Xf3aYM7dTQ/jMkfnHEwgfw==
-RMD160 (kde/kdegames-3.80.3.tar.bz2) = oAF7/d7JAXaJ6T/rnYjp02b5n5g=
-SHA1 (kde/kdegames-3.80.3.tar.bz2) = IyQfan7zfUuDpXVS095Akz38S+0=
-SHA256 (kde/kdegames-3.80.3.tar.bz2) = 9QzA8pf0vTFmHldRA1pT8+X0uxEpKZtUWQ3Q5GfnWVQ=
-SIZE (kde/kdegames-3.80.3.tar.bz2) = 19886473
+MD5 (kde/kdegames-4.0.0.tar.bz2) = YmTAA09jiaKAek4XI7ocgQ==
+RMD160 (kde/kdegames-4.0.0.tar.bz2) = kitnm61TT+5kc43cSvJhJPVaQm0=
+SHA1 (kde/kdegames-4.0.0.tar.bz2) = zhFX70YYxBI3Jh2roISAf96z/6s=
+SHA256 (kde/kdegames-4.0.0.tar.bz2) = 1tpIoPojOlHdYY0h27rJww6V0c4O+qm3egTrQk18NCY=
+SIZE (kde/kdegames-4.0.0.tar.bz2) = 23803729

x11/kde4/games/patches/patch-ksudoku_src_logic_sksolver_cpp

@@ -0,0 +1,39 @@
+$OpenBSD: patch-ksudoku_src_logic_sksolver_cpp,v 1.1 2008/01/21 22:08:14 espie Exp $
+--- ksudoku/src/logic/sksolver.cpp.orig	Sun Jan 20 13:03:17 2008
++++ ksudoku/src/logic/sksolver.cpp	Sun Jan 20 13:18:45 2008
+@@ -40,7 +40,7 @@ SKPuzzle stack[625+1];
+ using namespace ksudoku;
+ using namespace std;
+ 
+-class SolverState {
++class ksudoku::SolverState {
+ public:
+ 	SolverState(uint size, uint order)
+ 		: m_size(size), m_order(order), m_values(size, 0), m_flags(order),
+@@ -144,7 +144,7 @@ SKSolver::SKSolver(SKGraph* gr)
+ 
+ SKSolver::SKSolver(int n, bool threedimensionalf)
+ {
+-	base = static_cast<int>(sqrt(n));
++	base = static_cast<int>(sqrt(static_cast<double>(n)));
+ 	order=n;
+ 	m_type = threedimensionalf ? roxdoku : sudoku;
+ 	           ///@TODO fix above so more than 2
+@@ -335,7 +335,7 @@ int SKSolver::remove_numbers(SKPuzzle* p, int level, i
+ 	}
+ 	
+ 	
+-	int numberOfNumbersToAdd = (7*(3-level)*(((type!=1) ? ((int) sqrt(p->size)) : p->order )+LEVINC-(p->order-2)*(type==1)))/10;
++	int numberOfNumbersToAdd = (7*(3-level)*(((type!=1) ? ((int) sqrt((double)p->size)) : p->order )+LEVINC-(p->order-2)*(type==1)))/10;
+  	printf("%d\n", numberOfNumbersToAdd);
+ 
+ 	ITERATE(i, numberOfNumbersToAdd)
+@@ -579,7 +579,7 @@ uint SKSolver::removeAtIndex(QVector<uint>& puzzle, ui
+ 		puzzle[indices[i]] = 0;
+ 	}
+ 	
+-	::SolverState state(size, order);
++	ksudoku::SolverState state(size, order);
+ 	for(uint i = 0; i < static_cast<uint>(size); ++i) {
+ 		if(puzzle[i]) state.setValue(i, puzzle[i], g);
+ 	}

x11/kde4/games/patches/patch-ksudoku_src_logic_sksolver_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-ksudoku_src_logic_sksolver_h,v 1.1 2008/01/21 22:08:14 espie Exp $
+--- ksudoku/src/logic/sksolver.h.orig	Sun Jan 20 13:08:52 2008
++++ ksudoku/src/logic/sksolver.h	Sun Jan 20 13:09:02 2008
+@@ -58,7 +58,7 @@ typedef unsigned int uint;
+ 
+ #include <math.h>
+ // SUDOKU PUZZLE SOLVER BASIC ALGORITHM - BY FRANCESCO ROSSI 2005 redsh@email.it
+-class SolverState;
++class ksudoku::SolverState;
+ 
+ /**
+ @author Francesco Rossi

x11/kde4/games/patches/patch-libkdegames_kcarddialog_cpp

@@ -0,0 +1,23 @@
+$OpenBSD: patch-libkdegames_kcarddialog_cpp,v 1.1 2008/01/21 22:08:14 espie Exp $
+--- libkdegames/kcarddialog.cpp.orig	Sun Jan 20 13:00:21 2008
++++ libkdegames/kcarddialog.cpp	Sun Jan 20 13:01:40 2008
+@@ -421,7 +421,8 @@ void KCardDialog::readFronts()
+         QString svg    = cfgcg.readEntry("SVG", QString());
+         if (!svg.isNull())
+         {
+-          QFileInfo svgInfo(QDir(path), svg);
++	  QDir d(path);
++          QFileInfo svgInfo(d, svg);
+           info.svgfile = svgInfo.filePath();
+         }
+         else
+@@ -828,7 +829,8 @@ void KCardDialog::readBacks()
+         QString svg    = cfgcg.readEntry("SVG", QString());
+         if (!svg.isNull())
+         {
+-          QFileInfo svgInfo(QDir(path), svg);
++	  QDir d(path);
++          QFileInfo svgInfo(d, svg);
+           info.svgfile = svgInfo.filePath();
+         }
+         else

x11/kde4/games/patches/patch-lskat_src_thememanager_cpp

@@ -0,0 +1,13 @@
+$OpenBSD: patch-lskat_src_thememanager_cpp,v 1.1 2008/01/21 22:08:14 espie Exp $
+--- lskat/src/thememanager.cpp.orig	Sun Jan 20 13:11:59 2008
++++ lskat/src/thememanager.cpp	Sun Jan 20 13:12:14 2008
+@@ -120,7 +120,8 @@ void ThemeManager::updateCardTheme(const QString &them
+   QString cardSVG    = cardGroup.readEntry("SVG", QString());
+   if (global_debug > 1) kDebug() << "SVG card =" << cardSVG << "is" << (!cardSVG.isNull());
+ 
+-  QFileInfo svgInfo(QDir(cards), cardSVG);
++  QDir d(cards);
++  QFileInfo svgInfo(d, cardSVG);
+   QString svgfile = svgInfo.filePath();
+ 
+   mCardRenderer = 0;