diff options
author | Caleb Tennis <caleb@gentoo.org> | 2004-02-05 13:24:05 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2004-02-05 13:24:05 +0000 |
commit | 440cca6a8cb5caab03cb598bbb21a2d6d3ebb0c8 (patch) | |
tree | 6691a278b1be6734974b06e47394149cbcf680a0 /kde-base/kdegames | |
parent | Fix animated gif problems w/ patch. (diff) | |
download | gentoo-2-440cca6a8cb5caab03cb598bbb21a2d6d3ebb0c8.tar.gz gentoo-2-440cca6a8cb5caab03cb598bbb21a2d6d3ebb0c8.tar.bz2 gentoo-2-440cca6a8cb5caab03cb598bbb21a2d6d3ebb0c8.zip |
Fix compilation
Diffstat (limited to 'kde-base/kdegames')
-rw-r--r-- | kde-base/kdegames/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdegames/Manifest | 6 | ||||
-rw-r--r-- | kde-base/kdegames/files/ktron.patch | 554 | ||||
-rw-r--r-- | kde-base/kdegames/files/libksirtet.patch | 211 | ||||
-rw-r--r-- | kde-base/kdegames/kdegames-3.2.0.ebuild | 9 |
5 files changed, 781 insertions, 5 deletions
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog index 353b131160b7..cf3990c4f0ab 100644 --- a/kde-base/kdegames/ChangeLog +++ b/kde-base/kdegames/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdegames # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.61 2004/02/04 20:31:04 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.62 2004/02/05 13:23:58 caleb Exp $ + + 05 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0.ebuild, + files/ktron.patch, files/libksirtet.patch: + Incorporate two patches that fix compilation. 04 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0.ebuild: Don't compile ktron as it breaks for most people. diff --git a/kde-base/kdegames/Manifest b/kde-base/kdegames/Manifest index 2ac882e2365f..f82ce82e7a75 100644 --- a/kde-base/kdegames/Manifest +++ b/kde-base/kdegames/Manifest @@ -1,11 +1,13 @@ MD5 8e8d7d65235b46ddbf89cd216497e575 kdegames-3.1.5.ebuild 944 -MD5 39e98adc423ccc382e0221c1aa3c3c14 kdegames-3.2.0.ebuild 371 +MD5 35036811cf78980a3e2235320c3b1744 kdegames-3.2.0.ebuild 434 MD5 3500525a3526c69a39bb12bc0bd56145 kdegames-3.0.5b.ebuild 357 MD5 dfceda9cd8acc408be9fbb6a366efbb4 kdegames-3.1.4.ebuild 1128 -MD5 6da52cfcd82e091ed3f366a962396a1a ChangeLog 7751 +MD5 ea48fddaad5a949b394daf737d9aff43 ChangeLog 7915 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 9454a7045d01e70b0b5b69c46be36801 files/kdegames-3.0.5b-gentoo.diff 592 MD5 b1b7eb1ed81f80133b5d6b5530bfcbba files/digest-kdegames-3.1.4 68 MD5 5ab4efd4e815e8257d53a92a2a8eac4a files/digest-kdegames-3.1.5 68 MD5 8dee289265c813122c9c3a55db255487 files/digest-kdegames-3.2.0 68 +MD5 c44cfa7482d22fa260c49360755ba3ab files/libksirtet.patch 6905 +MD5 7d6fbdf1de6bf3f31317d3548f79451a files/ktron.patch 16022 MD5 726d8204b4760054fba2739aad24a7e4 files/digest-kdegames-3.0.5b 286 diff --git a/kde-base/kdegames/files/ktron.patch b/kde-base/kdegames/files/ktron.patch new file mode 100644 index 000000000000..d7c9f7fad710 --- /dev/null +++ b/kde-base/kdegames/files/ktron.patch @@ -0,0 +1,554 @@ +diff -Naur ktron/player.cpp ktron_new/player.cpp +--- ktron/player.cpp 2003-03-12 13:30:12.000000000 +0100 ++++ ktron_new/player.cpp 2004-02-04 20:02:10.019832020 +0100 +@@ -26,8 +26,8 @@ + computer=false; + score=0; + reset(); +- dir=Up; +- last_dir=None; ++ dir=Directions::Up; ++ last_dir=Directions::None; + } + + +diff -Naur ktron/player.h ktron_new/player.h +--- ktron/player.h 2003-03-12 13:30:12.000000000 +0100 ++++ ktron_new/player.h 2004-02-04 21:19:10.554045768 +0100 +@@ -26,7 +26,10 @@ + #include <config.h> + #endif + +-enum Direction{ None, Up, Down, Left, Right}; ++namespace Directions ++{ ++ enum Direction{ None, Up, Down, Left, Right}; ++} + + /** + * @short This class represents a player with current position and several flags +@@ -42,8 +45,8 @@ + int xCoordinate,yCoordinate; + int score; + bool alive; +- Direction dir; +- Direction last_dir; ++ Directions::Direction dir; ++ Directions::Direction last_dir; + bool accelerated; + bool keyPressed; + bool computer; +diff -Naur ktron/tron.cpp ktron_new/tron.cpp +--- ktron/tron.cpp 2003-11-30 10:45:42.000000000 +0100 ++++ ktron_new/tron.cpp 2004-02-04 20:01:46.758365324 +0100 +@@ -212,8 +212,8 @@ + { + timer->stop(); + gameEnded=true; +- players[0].last_dir = None; +- players[1].last_dir = None; ++ players[0].last_dir = Directions::None; ++ players[1].last_dir = Directions::None; + } + + void Tron::togglePause() // pause or continue game +@@ -490,7 +490,7 @@ + return flag; + } + +-void Tron::switchDir(int playerNr,Direction newDirection) ++void Tron::switchDir(int playerNr,Directions::Direction newDirection) + { + if(playerNr!=0 && playerNr != 1) + { +@@ -500,13 +500,13 @@ + + if (Settings::oppositeDirCrashes()==false) + { +- if (newDirection==::Up && players[playerNr].last_dir==::Down) ++ if (newDirection==Directions::Up && players[playerNr].last_dir==Directions::Down) + return; +- if (newDirection==::Down && players[playerNr].last_dir==::Up) ++ if (newDirection==Directions::Down && players[playerNr].last_dir==Directions::Up) + return; +- if (newDirection==::Left && players[playerNr].last_dir==::Right) ++ if (newDirection==Directions::Left && players[playerNr].last_dir==Directions::Right) + return; +- if (newDirection==::Right && players[playerNr].last_dir==::Left) ++ if (newDirection==Directions::Right && players[playerNr].last_dir==Directions::Left) + return; + } + +@@ -524,18 +524,18 @@ + switch(players[0].dir) + { + // unset drawing flags in the moving direction +- case ::Up: ++ case Directions::Up: + { + playfield[x][y] &= (~TOP); + break; + } +- case ::Down: ++ case Directions::Down: + playfield[x][y] &= (~BOTTOM); + break; +- case ::Right: ++ case Directions::Right: + playfield[x][y] &= (~RIGHT); + break; +- case ::Left: ++ case Directions::Left: + playfield[x][y] &= (~LEFT); + break; + default: +@@ -553,18 +553,18 @@ + switch(players[1].dir) + { + // unset drawing flags in the moving direction +- case ::Up: ++ case Directions::Up: + { + playfield[x][y] &= (~TOP); + break; + } +- case ::Down: ++ case Directions::Down: + playfield[x][y] &= (~BOTTOM); + break; +- case ::Right: ++ case Directions::Right: + playfield[x][y] &= (~RIGHT); + break; +- case ::Left: ++ case Directions::Left: + playfield[x][y] &= (~LEFT); + break; + default: +@@ -642,22 +642,22 @@ + { + if(actionCollection->action("Pl2Up")->shortcut().contains(key)) + { +- switchDir(1,::Up); ++ switchDir(1,Directions::Up); + players[1].keyPressed=true; + } + else if(actionCollection->action("Pl2Left")->shortcut().contains(key)) + { +- switchDir(1,::Left); ++ switchDir(1,Directions::Left); + players[1].keyPressed=true; + } + else if(actionCollection->action("Pl2Right")->shortcut().contains(key)) + { +- switchDir(1,::Right); ++ switchDir(1,Directions::Right); + players[1].keyPressed=true; + } + else if(actionCollection->action("Pl2Down")->shortcut().contains(key)) + { +- switchDir(1,::Down); ++ switchDir(1,Directions::Down); + players[1].keyPressed=true; + } + else if(actionCollection->action("Pl2Ac")->shortcut().contains(key)) +@@ -672,22 +672,22 @@ + { + if(actionCollection->action("Pl1Left")->shortcut().contains(key)) + { +- switchDir(0,::Left); ++ switchDir(0,Directions::Left); + players[0].keyPressed=true; + } + else if(actionCollection->action("Pl1Right")->shortcut().contains(key)) + { +- switchDir(0,::Right); ++ switchDir(0,Directions::Right); + players[0].keyPressed=true; + } + else if(actionCollection->action("Pl1Up")->shortcut().contains(key)) + { +- switchDir(0,::Up); ++ switchDir(0,Directions::Up); + players[0].keyPressed=true; + } + else if(actionCollection->action("Pl1Down")->shortcut().contains(key)) + { +- switchDir(0,::Down); ++ switchDir(0,Directions::Down); + players[0].keyPressed=true; + } + else if(actionCollection->action("Pl1Ac")->shortcut().contains(key)) +@@ -837,7 +837,7 @@ + } + switch(players[i].dir) + { +- case ::Up: ++ case Directions::Up: + if(crashed(i,0,-1)) + players[i].alive=false; + else +@@ -846,7 +846,7 @@ + newType|=(TOP | LEFT | RIGHT); + } + break; +- case ::Down: ++ case Directions::Down: + if(crashed(i,0,1)) + players[i].alive=false; + else +@@ -855,7 +855,7 @@ + newType |= (BOTTOM | LEFT | RIGHT); + } + break; +- case ::Left: ++ case Directions::Left: + if(crashed(i,-1,0)) + players[i].alive=false; + else +@@ -864,7 +864,7 @@ + newType |= (LEFT | TOP | BOTTOM); + } + break; +- case ::Right: ++ case Directions::Right: + if(crashed(i,1,0)) + players[i].alive=false; + else +@@ -889,16 +889,16 @@ + int xInc=0,yInc=0; + switch(players[1].dir) + { +- case ::Left: ++ case Directions::Left: + xInc = -1; + break; +- case ::Right: ++ case Directions::Right: + xInc = 1; + break; +- case ::Up: ++ case Directions::Up: + yInc = -1; + break; +- case ::Down: ++ case Directions::Down: + yInc = 1; + break; + default: +@@ -963,7 +963,7 @@ + + switch(players[i].dir) + { +- case ::Up: ++ case Directions::Up: + if(crashed(i,0,-1)) + players[i].alive=false; + else +@@ -972,7 +972,7 @@ + newType |= (TOP | RIGHT | LEFT); + } + break; +- case ::Down: ++ case Directions::Down: + if(crashed(i,0,1)) + players[i].alive=false; + else +@@ -981,7 +981,7 @@ + newType |= (BOTTOM | RIGHT | LEFT); + } + break; +- case ::Left: ++ case Directions::Left: + if(crashed(i,-1,0)) + players[i].alive=false; + else +@@ -990,7 +990,7 @@ + newType |= (LEFT | TOP | BOTTOM); + } + break; +- case ::Right: ++ case Directions::Right: + if(crashed(i,1,0)) + players[i].alive=false; + else +@@ -1013,13 +1013,13 @@ + int xInc=0,yInc=0; + switch(players[1].dir) + { +- case ::Left: ++ case Directions::Left: + xInc = -1; break; +- case ::Right: ++ case Directions::Right: + xInc = 1; break; +- case ::Up: ++ case Directions::Up: + yInc = -1; break; +- case ::Down: ++ case Directions::Down: + yInc = 1; break; + default: + break; +@@ -1074,7 +1074,7 @@ + int opponent=(playerNr==1)? 0 : 1; + + // determines left and right side +- Direction sides[2]; ++ Directions::Direction sides[2]; + // increments for moving to the different sides + int flags[6]={0,0,0,0,0,0}; + int index[2]; +@@ -1086,7 +1086,7 @@ + + switch (players[playerNr].dir) + { +- case ::Left: ++ case Directions::Left: + //forward flags + flags[0] = -1; + flags[1] = 0; +@@ -1100,38 +1100,38 @@ + flags[5] = -1; + + //turns to either side +- sides[0] = ::Down; +- sides[1] = ::Up; ++ sides[0] = Directions::Down; ++ sides[1] = Directions::Up; + break; +- case ::Right: ++ case Directions::Right: + flags[0] = 1; + flags[1] = 0; + flags[2] = 0; + flags[3] = -1; + flags[4] = 0; + flags[5] = 1; +- sides[0] = ::Up; +- sides[1] = ::Down; ++ sides[0] = Directions::Up; ++ sides[1] = Directions::Down; + break; +- case ::Up: ++ case Directions::Up: + flags[0] = 0; + flags[1] = -1; + flags[2] = -1; + flags[3] = 0; + flags[4] = 1; + flags[5] = 0; +- sides[0] = ::Left; +- sides[1] = ::Right; ++ sides[0] = Directions::Left; ++ sides[1] = Directions::Right; + break; +- case ::Down: ++ case Directions::Down: + flags[0] = 0; + flags[1] = 1; + flags[2] = 1; + flags[3] = 0; + flags[4] = -1; + flags[5] = 0; +- sides[0] = ::Right; +- sides[1] = ::Left; ++ sides[0] = Directions::Right; ++ sides[1] = Directions::Left; + break; + default: + break; +@@ -1187,52 +1187,52 @@ + + switch(players[playerNr].dir) + { +- case ::Up: ++ case Directions::Up: + opForwardDis=vert_dis; + opSideDis=-hor_dis; +- if(players[opponent].dir==::Down) ++ if(players[opponent].dir==Directions::Down) + opMovesOppositeDir=true; +- else if(players[opponent].dir==::Up) ++ else if(players[opponent].dir==Directions::Up) + opMovesSameDir=true; +- else if(players[opponent].dir==::Left) ++ else if(players[opponent].dir==Directions::Left) + opMovesLeft=true; +- else if(players[opponent].dir==::Right) ++ else if(players[opponent].dir==Directions::Right) + opMovesRight=true; + break; +- case ::Down: ++ case Directions::Down: + opForwardDis=-vert_dis; + opSideDis=hor_dis; +- if(players[opponent].dir==::Up) ++ if(players[opponent].dir==Directions::Up) + opMovesOppositeDir=true; +- else if(players[opponent].dir==::Down) ++ else if(players[opponent].dir==Directions::Down) + opMovesSameDir=true; +- else if(players[opponent].dir==::Left) ++ else if(players[opponent].dir==Directions::Left) + opMovesRight=true; +- else if(players[opponent].dir==::Right) ++ else if(players[opponent].dir==Directions::Right) + opMovesLeft=true; + break; +- case ::Left: ++ case Directions::Left: + opForwardDis=hor_dis; + opSideDis=vert_dis; +- if(players[opponent].dir==::Right) ++ if(players[opponent].dir==Directions::Right) + opMovesOppositeDir=true; +- else if(players[opponent].dir==::Left) ++ else if(players[opponent].dir==Directions::Left) + opMovesSameDir=true; +- else if(players[opponent].dir==::Down) ++ else if(players[opponent].dir==Directions::Down) + opMovesLeft=true; +- else if(players[opponent].dir==::Up) ++ else if(players[opponent].dir==Directions::Up) + opMovesRight=true; + break; +- case ::Right: ++ case Directions::Right: + opForwardDis=-hor_dis; + opSideDis=-vert_dis; +- if(players[opponent].dir==::Left) ++ if(players[opponent].dir==Directions::Left) + opMovesOppositeDir=true; +- else if(players[opponent].dir==::Right) ++ else if(players[opponent].dir==Directions::Right) + opMovesSameDir=true; +- else if(players[opponent].dir==::Up) ++ else if(players[opponent].dir==Directions::Up) + opMovesLeft=true; +- else if(players[opponent].dir==::Down) ++ else if(players[opponent].dir==Directions::Down) + opMovesRight=true; + break; + default: +@@ -1475,7 +1475,7 @@ + // xtron-1.1 by Rhett D. Jacobs <rhett@hotel.canberra.edu.au> + else // Settings::skill() == Settings::EnumSkill::Easy + { +- Direction sides[2]; ++ Directions::Direction sides[2]; + int flags[6] = {0,0,0,0,0,0}; + int index[2]; + int dis_forward, dis_left, dis_right; +@@ -1483,7 +1483,7 @@ + dis_forward = dis_left = dis_right = 1; + + switch (players[playerNr].dir) { +- case ::Left: ++ case Directions::Left: + + //forward flags + flags[0] = -1; +@@ -1498,38 +1498,38 @@ + flags[5] = -1; + + //turns to either side +- sides[0] = ::Down; +- sides[1] = ::Up; ++ sides[0] = Directions::Down; ++ sides[1] = Directions::Up; + break; +- case ::Right: ++ case Directions::Right: + flags[0] = 1; + flags[1] = 0; + flags[2] = 0; + flags[3] = -1; + flags[4] = 0; + flags[5] = 1; +- sides[0] = ::Up; +- sides[1] = ::Down; ++ sides[0] = Directions::Up; ++ sides[1] = Directions::Down; + break; +- case ::Up: ++ case Directions::Up: + flags[0] = 0; + flags[1] = -1; + flags[2] = -1; + flags[3] = 0; + flags[4] = 1; + flags[5] = 0; +- sides[0] = ::Left; +- sides[1] = ::Right; ++ sides[0] = Directions::Left; ++ sides[1] = Directions::Right; + break; +- case ::Down: ++ case Directions::Down: + flags[0] = 0; + flags[1] = 1; + flags[2] = 1; + flags[3] = 0; + flags[4] = -1; + flags[5] = 0; +- sides[0] = ::Right; +- sides[1] = ::Left; ++ sides[0] = Directions::Right; ++ sides[1] = Directions::Left; + break; + default: + break; +@@ -1600,26 +1600,26 @@ + + void Tron::changeDirection(int playerNr,int dis_right,int dis_left) + { +- Direction currentDir=players[playerNr].dir; +- Direction sides[2]; ++ Directions::Direction currentDir=players[playerNr].dir; ++ Directions::Direction sides[2]; + switch (currentDir) + { +- case ::Left: ++ case Directions::Left: + //turns to either side +- sides[0] = ::Down; +- sides[1] = ::Up; ++ sides[0] = Directions::Down; ++ sides[1] = Directions::Up; + break; +- case ::Right: +- sides[0] = ::Up; +- sides[1] = ::Down; ++ case Directions::Right: ++ sides[0] = Directions::Up; ++ sides[1] = Directions::Down; + break; +- case ::Up: +- sides[0] = ::Left; +- sides[1] = ::Right; ++ case Directions::Up: ++ sides[0] = Directions::Left; ++ sides[1] = Directions::Right; + break; +- case ::Down: +- sides[0] = ::Right; +- sides[1] = ::Left; ++ case Directions::Down: ++ sides[0] = Directions::Right; ++ sides[1] = Directions::Left; + break; + default: + break; +diff -Naur ktron/tron.h ktron_new/tron.h +--- ktron/tron.h 2003-10-26 11:51:47.000000000 +0100 ++++ ktron_new/tron.h 2004-02-04 19:59:00.491504299 +0100 +@@ -151,7 +151,7 @@ + void changeDirection(int playerNr,int dis_right,int dis_left); + + /** sets the direction of player playerNr to newDirection */ +- void switchDir(int playerNr,Direction newDirection); ++ void switchDir(int playerNr,Directions::Direction newDirection); + /** + * updates the the rect at current position to not draw a + * border in the direction of the next step. diff --git a/kde-base/kdegames/files/libksirtet.patch b/kde-base/kdegames/files/libksirtet.patch new file mode 100644 index 000000000000..b4964dc9e927 --- /dev/null +++ b/kde-base/kdegames/files/libksirtet.patch @@ -0,0 +1,211 @@ +diff -Naur libksirtet/lib/meeting.cpp libksirtet_new/lib/meeting.cpp +--- libksirtet/lib/meeting.cpp 2003-07-21 09:40:28.000000000 +0200 ++++ libksirtet_new/lib/meeting.cpp 2004-02-04 23:04:56.433145441 +0100 +@@ -148,18 +148,18 @@ + void NetMeeting::readData(uint i) + { + // get message type +- MeetingMsgFlag mt; ++ MeetingMsgFlags::MeetingMsgFlag mt; + sm[i]->readingStream() >> mt; + CHECK_READ(i); + switch (mt) { +- case End: endFlag(i); break; +- case New: newFlag(i); break; +- case Mod_Text: modTextFlag(i); break; +- case Mod_Type: modTypeFlag(i); break; +- case Id: idFlag(i); break; +- case Del: delFlag(i); break; +- case Mod_Opt: modOptFlag(i); break; +- case Play: playFlag(i); break; ++ case MeetingMsgFlags::End: endFlag(i); break; ++ case MeetingMsgFlags::New: newFlag(i); break; ++ case MeetingMsgFlags::Mod_Text: modTextFlag(i); break; ++ case MeetingMsgFlags::Mod_Type: modTypeFlag(i); break; ++ case MeetingMsgFlags::Id: idFlag(i); break; ++ case MeetingMsgFlags::Del: delFlag(i); break; ++ case MeetingMsgFlags::Mod_Opt: modOptFlag(i); break; ++ case MeetingMsgFlags::Play: playFlag(i); break; + default: dataError(i); + } + +@@ -194,7 +194,7 @@ + void NetMeeting::reject() + { + // send an End flag +- sm.commonWritingStream() << End; ++ sm.commonWritingStream() << MeetingMsgFlags::End; + writeToAll(); + + cleanReject(); +@@ -252,7 +252,7 @@ + removeLine(i-1); + + // Send a Del message to all (other) clients +- sm.commonWritingStream() << Del << i; ++ sm.commonWritingStream() << MeetingMsgFlags::Del << i; + writeToAll(); + } + players.remove(players.at(i)); +@@ -291,7 +291,7 @@ + + // send result to client + Stream &s = sm[i]->writingStream(); +- s << Id << id; ++ s << MeetingMsgFlags::Id << id; + WRITE(i); + + // if not accepted : remove socket and player from list +@@ -322,18 +322,18 @@ + // send to the new client already present lines including its own + // (New flag + MeetingLineData struct) + spl->data(pld.ed); +- sm[i]->writingStream() << New << pld.ed; ++ sm[i]->writingStream() << MeetingMsgFlags::New << pld.ed; + for(uint k=1; k<sm.size(); k++) { + wl->widget(k-1)->data(pld.ed); + pld.own = ( k==i ); +- sm[i]->writingStream() << New << pld; ++ sm[i]->writingStream() << MeetingMsgFlags::New << pld; + } + WRITE(i); + + // send to all other clients the new line (New flag + MeetingLineData struct) + wl->widget(i-1)->data(pld.ed); + pld.own = FALSE; +- sm.commonWritingStream() << New << pld; ++ sm.commonWritingStream() << MeetingMsgFlags::New << pld; + writeToAll(i); + } + +@@ -349,7 +349,7 @@ + setText(ti); + + // send it to all other clients (Mod_Text flag + TextInfo struct) +- sm.commonWritingStream() << Mod_Text << ti; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Text << ti; + writeToAll(i); + } + +@@ -365,7 +365,7 @@ + setType(ti); + + // send it to all other clients (Mod_Type flag + TypeInfo struct) +- sm.commonWritingStream() << Mod_Type << ti; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Type << ti; + writeToAll(i); + } + +@@ -373,7 +373,7 @@ + { + // server line text changed : send to every clients (Mod_Text flag + TextInfo struct) + TextInfo ti; ti.i = 0; ti.text = text; +- sm.commonWritingStream() << Mod_Text << ti; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Text << ti; + writeToAll(); + } + +@@ -390,7 +390,7 @@ + ty.i++; + + // TCB change : send to every clients (Mod_Type flag + TypeInfo struct) +- sm.commonWritingStream() << Mod_Type << ty; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Type << ty; + writeToAll(); + if (server) enableButtonOK(ready()); + } +@@ -421,7 +421,7 @@ + + // send play message to client (Play flag + // + bool [accepted/rejected]) +- sm[0]->writingStream() << Play << (Q_UINT8)willPlay; ++ sm[0]->writingStream() << MeetingMsgFlags::Play << (Q_UINT8)willPlay; + // if write failed and the client is not playing : silently + // put it aside ... + if ( !sm[0]->write() && willPlay ) { +@@ -440,7 +440,7 @@ + + void ServerNetMeeting::optionsChanged() + { +- sm.commonWritingStream() << Mod_Opt; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Opt; + ow->dataOut( sm.commonWritingStream() ); + writeToAll(); + } +@@ -456,7 +456,7 @@ + players.append(NewPlayer); // server player + + // Send id to server (Id flag + Id struct) +- sm.commonWritingStream() << Id << id; ++ sm.commonWritingStream() << MeetingMsgFlags::Id << id; + writeToAll(); // what happens if there is a message box appearing before exec() call ?? + } + +@@ -484,7 +484,7 @@ + if ( !serverId.accepted() ) cleanReject(serverId.errorMessage(id)); + else { + // send client info (New flag + GameData struct) +- sm.commonWritingStream() << New << bds; ++ sm.commonWritingStream() << MeetingMsgFlags::New << bds; + writeToAll(); + } + } +@@ -535,14 +535,14 @@ + void ClientNetMeeting::textChanged(const QString &text) + { + // text changed : send to server (Mod_Text flag + QString) +- sm.commonWritingStream() << Mod_Text << text; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Text << text; + writeToAll(); + } + + void ClientNetMeeting::typeChanged(MeetingCheckBox::Type type) + { + // type changed : send to server (Mod_Type flag + TCB) +- sm.commonWritingStream() << Mod_Type << type; ++ sm.commonWritingStream() << MeetingMsgFlags::Mod_Type << type; + writeToAll(); + } + +diff -Naur libksirtet/lib/types.cpp libksirtet_new/lib/types.cpp +--- libksirtet/lib/types.cpp 2002-07-15 12:01:48.000000000 +0200 ++++ libksirtet_new/lib/types.cpp 2004-02-04 23:04:56.428146251 +0100 +@@ -50,16 +50,16 @@ + } + + //----------------------------------------------------------------------------- +-QDataStream &operator << (QDataStream &s, const MeetingMsgFlag &f) ++QDataStream &operator << (QDataStream &s, const MeetingMsgFlags::MeetingMsgFlag &f) + { + s << (Q_UINT8)f; + return s; + } + +-QDataStream &operator >> (QDataStream &s, MeetingMsgFlag &f) ++QDataStream &operator >> (QDataStream &s, MeetingMsgFlags::MeetingMsgFlag &f) + { + Q_UINT8 i; +- s >> i; f = (MeetingMsgFlag)i; ++ s >> i; f = (MeetingMsgFlags::MeetingMsgFlag)i; + return s; + } + +diff -Naur libksirtet/lib/types.h libksirtet_new/lib/types.h +--- libksirtet/lib/types.h 2001-09-01 13:52:21.000000000 +0200 ++++ libksirtet_new/lib/types.h 2004-02-04 23:04:56.430145927 +0100 +@@ -31,10 +31,13 @@ + QDataStream &operator >> (QDataStream &s, cId &id); + + /** Flags used for the netmeeting. */ ++namespace MeetingMsgFlags ++{ + enum MeetingMsgFlag + { Id = 0, End, New, Del, Mod_Text, Mod_Type, Mod_Opt, Play }; +-QDataStream &operator << (QDataStream &s, const MeetingMsgFlag &f); +-QDataStream &operator >> (QDataStream &s, MeetingMsgFlag &f); ++} ++QDataStream &operator << (QDataStream &s, const MeetingMsgFlags::MeetingMsgFlag &f); ++QDataStream &operator >> (QDataStream &s, MeetingMsgFlags::MeetingMsgFlag &f); + + /** Internal class : used in netmeeting to transport text line. */ + class TextInfo diff --git a/kde-base/kdegames/kdegames-3.2.0.ebuild b/kde-base/kdegames/kdegames-3.2.0.ebuild index e22f136a9133..04a384311ed7 100644 --- a/kde-base/kdegames/kdegames-3.2.0.ebuild +++ b/kde-base/kdegames/kdegames-3.2.0.ebuild @@ -1,10 +1,15 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.0.ebuild,v 1.2 2004/02/04 20:31:04 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.0.ebuild,v 1.3 2004/02/05 13:23:58 caleb Exp $ inherit kde-dist eutils DESCRIPTION="KDE games (solitaire :-)" IUSE="" KEYWORDS="~x86 ~sparc ~amd64" -DO_NOT_COMPILE="$DO_NOT_COMPILE ktron" +src_unpack() +{ + kde_src_unpack + epatch ${FILESDIR}/ktron.patch + epatch ${FILESDIR}/libksirtet.patch +} |