Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (db0e6b1100778a9ff7e67554f8b28969d4a45f8d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (db0e6b1100778a9ff7e67554f8b28969d4a45f8d)
  • Date: Wed, 4 Feb 2009 09:03:01 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4/kdegames4/HISTORY | 4 ++++
kde4/kdegames4/PRE_BUILD | 5 +++++
kde4/kdegames4/ksirk.patch | 45
+++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)

New commits:
commit db0e6b1100778a9ff7e67554f8b28969d4a45f8d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdegames4 -add patch to fix compile problem

diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 59abf5a..fe04170 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,7 @@
+2009-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, ksirk.patch: added
+ fix compilation issue
+
2009-02-03 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated stable version to 4.2.0

diff --git a/kde4/kdegames4/PRE_BUILD b/kde4/kdegames4/PRE_BUILD
new file mode 100755
index 0000000..32827ba
--- /dev/null
+++ b/kde4/kdegames4/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [[ "${KDE_VER}" == "stable" ]];then
+ patch -p3 < $SPELL_DIRECTORY/ksirk.patch
+fi
diff --git a/kde4/kdegames4/ksirk.patch b/kde4/kdegames4/ksirk.patch
new file mode 100644
index 0000000..1508afa
--- /dev/null
+++ b/kde4/kdegames4/ksirk.patch
@@ -0,0 +1,45 @@
+--- trunk/KDE/kdegames/ksirk/ksirk/GameLogic/aiplayer.cpp 2009/01/25
09:27:45 916374
++++ trunk/KDE/kdegames/ksirk/ksirk/GameLogic/aiplayer.cpp 2009/02/02
16:25:29 920265
+@@ -37,6 +37,7 @@
+ #include <kmessagebox.h>
+ #include <QUuid>
+ #include <QMutexLocker>
++#include <QMap>
+
+
+ /* Includes for the STL */
+@@ -245,7 +246,7 @@
+ */
+ std::pair<const Country*, const Country*> AIPlayer::chooseBelligerant()
+ {
+- std::multimap<const Country*, const Country*> candidates;
++ QMultiMap<const Country*, const Country*> candidates;
+
+ // kDebug() << name() << " : AIPlayer::chooseBelligerant()" << endl;
+ // Builds the list of countries of the player that have enough armies
and a good neighbour
+@@ -275,7 +276,7 @@
+ {
+ // kDebug() << name() << " choosing belligerants,
adding target / source : "
+ // << candidateSource-> name() << " / " <<
candidateTarget-> name() << endl;
+- candidates.insert(std::make_pair(candidateSource,
candidateTarget));
++ candidates.insert(candidateSource, candidateTarget);
+ }
+ }
+ }
+@@ -288,14 +289,14 @@
+ }
+ uint which = Dice::roll(candidates.size()) - 1;
+ // kDebug() << "Which = " << which <<endl;
+- std::multimap<const Country*, const Country*>::const_iterator it;
++ QMultiMap<const Country*, const Country*>::const_iterator it;
+ unsigned int i = 0;
+ for ( it = candidates.begin(); it != candidates.end() ; it++, i++ )
+ {
+ if (which == i )
+ {
+ // kDebug() << "OUT AIPlayer::chooseBelligerant() : " <<
endl ;
+- return (*it);
++ return std::make_pair(it.key(), it.value());
+ }
+ }
+ }



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (db0e6b1100778a9ff7e67554f8b28969d4a45f8d), Treeve Jelbert, 02/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page