holyspirit-svn: add patch to work still with sfml 2.0rc

work in progress: this still doesn't build

4 files changed, 119 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58c4324b03ac..df3b11432355 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = holyspirit-svn
 	pkgdesc = Diablo clone
-	pkgver = 2381
+	pkgver = 2419
 	pkgrel = 1
 	url = http://www.holyspirit.fr/
 	install = holyspirit.install
@@ -18,8 +18,10 @@ pkgbase = holyspirit-svn
 	backup = opt/share/games/holyspirit/key_mapping.conf
 	source = holyspirit.sh
 	source = config_crash.patch
+	source = backspace.patch
 	md5sums = c2fa4f8768d35c54a95dec924e50c75f
-	md5sums = b997e0c5d714c615509db7850d0290e3
+	md5sums = c0fd6d1ede2cb6afbcf082aaae0cc60b
+	md5sums = 4967f1cd4216d1ec2ff3cfd1941b18df
 
 pkgname = holyspirit-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index b25726543468..138ab2bd222b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,24 @@
 # Contributor: Johannes Dewender arch at JonnyJD dot net
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=holyspirit-svn
-pkgver=2381
+pkgver=2419
 pkgrel=1
 pkgdesc="Diablo clone"
 arch=(i686 x86_64)
 url="http://www.holyspirit.fr/"
 license=('GPL')
+# there is no sfml 2.0rc with the BackSpace key change
 depends=('sfml')
 makedepends=('subversion' 'cmake' 'qtwebkit')
 optdepends=('qtwebkit: for the launcher')
 provides=('holyspirit')
 conflicts=('holyspirit')
 install=holyspirit.install
-source=(holyspirit.sh config_crash.patch)
+source=(holyspirit.sh config_crash.patch backspace.patch)
 backup=('opt/share/games/holyspirit/configuration.conf' 'opt/share/games/holyspirit/key_mapping.conf')
 md5sums=('c2fa4f8768d35c54a95dec924e50c75f'
-         'b997e0c5d714c615509db7850d0290e3')
+         'c0fd6d1ede2cb6afbcf082aaae0cc60b'
+         '4967f1cd4216d1ec2ff3cfd1941b18df')
 
 _svntrunk=https://lechemindeladam.svn.sourceforge.net/svnroot/lechemindeladam/trunk
 _svnmod=holyspirit
@@ -38,7 +40,9 @@ build() {
   cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
   cd "$srcdir/$_svnmod-build"
 
+  # patches
   patch -p1 < ../config_crash.patch
+  patch -p1 < ../backspace.patch
 
   cmake -DSFML_STATIC_LIBRARIES=FALSE \
     -DCMAKE_INSTALL_PREFIX:STRING="$pkgdir/opt"
diff --git a/backspace.patch b/backspace.patch
new file mode 100644
index 000000000000..38bfde32176f
--- /dev/null
+++ b/backspace.patch
@@ -0,0 +1,94 @@
+From: Johannes Dewender <jonnyjd@users.sf.net>
+Date: Fri, 01 Mar 2013 20:54:30 +0100
+Subject: [PATCH] BackSpace -> Back for sfml 2.0rc
+
+Revert most of the changes from svn revision 2385,
+in order to make holyspirit work with the sfml package
+on Arch Linux.
+
+Index: trunk/Source/configuration.cpp
+===================================================================
+--- trunk/Source/configuration.cpp.orig
++++ trunk/Source/configuration.cpp
+@@ -1261,7 +1261,7 @@ void Configuration::InitKeys()
+     key_mapping_converter[sf::Keyboard::Dash] = "Dash";

+     key_mapping_converter[sf::Keyboard::Space] = "Space";

+     key_mapping_converter[sf::Keyboard::Return] = "Return";

+-    key_mapping_converter[sf::Keyboard::BackSpace] = "Back";

++    key_mapping_converter[sf::Keyboard::Back] = "Back";

+     key_mapping_converter[sf::Keyboard::Tab] = "Tab";

+     key_mapping_converter[sf::Keyboard::PageUp] = "PageUp";

+     key_mapping_converter[sf::Keyboard::PageDown] = "PageDown";

+Index: trunk/Source/Moteurs/eventManager.cpp
+===================================================================
+--- trunk/Source/Moteurs/eventManager.cpp.orig
++++ trunk/Source/Moteurs/eventManager.cpp
+@@ -115,7 +115,7 @@ void EventManager::GererLesEvenements(bo
+         }

+     }

+ 

+-    if(m_EventTableau[sf::Keyboard::BackSpace])

++    if(m_EventTableau[sf::Keyboard::Back])

+         isEnteredText = false;

+     if(m_EventTableau[sf::Keyboard::Return])

+         isEnteredText = false;

+Index: trunk/Source/Contextes/c_mainMenu.cpp
+===================================================================
+--- trunk/Source/Contextes/c_mainMenu.cpp.orig
++++ trunk/Source/Contextes/c_mainMenu.cpp
+@@ -773,10 +773,10 @@ void  c_MainMenu::E_Continuer(Jeu *jeu)
+         && nom_hero.size() < 16)

+             nom_hero += eventManager->getChar();

+ 

+-        if(eventManager->getEvenement(sf::Keyboard::BackSpace,EventKey))

++        if(eventManager->getEvenement(sf::Keyboard::Back,EventKey))

+             if(!nom_hero.empty())

+                 nom_hero.erase(nom_hero.begin() + nom_hero.size() - 1);

+-        eventManager->StopEvenement(sf::Keyboard::BackSpace,EventKey);

++        eventManager->StopEvenement(sf::Keyboard::Back,EventKey);

+ 

+ 

+         texte.setString(nom_hero);

+@@ -843,10 +843,10 @@ void  c_MainMenu::E_Nouveau(Jeu *jeu)
+     && nom_hero.size() < 16)

+         nom_hero += eventManager->getChar();

+ 

+-    if(eventManager->getEvenement(sf::Keyboard::BackSpace,EventKey))

++    if(eventManager->getEvenement(sf::Keyboard::Back,EventKey))

+         if(!nom_hero.empty())

+             nom_hero.erase(nom_hero.begin() + nom_hero.size() - 1);

+-    eventManager->StopEvenement(sf::Keyboard::BackSpace,EventKey);

++    eventManager->StopEvenement(sf::Keyboard::Back,EventKey);

+ 

+     texte.setCharacterSize(20);

+ 

+@@ -1145,10 +1145,10 @@ void  c_MainMenu::E_Multi(Jeu *jeu)
+     && */entered_ip.size() <= 16)

+         entered_ip += eventManager->getChar();

+ 

+-    if(eventManager->getEvenement(sf::Keyboard::BackSpace,EventKey))

++    if(eventManager->getEvenement(sf::Keyboard::Back,EventKey))

+         if(!entered_ip.empty())

+             entered_ip.erase(entered_ip.begin() + entered_ip.size() - 1);

+-    eventManager->StopEvenement(sf::Keyboard::BackSpace,EventKey);

++    eventManager->StopEvenement(sf::Keyboard::Back,EventKey);

+ 

+     moteurGraphique->special_typo.Draw(entered_ip + (time > 0.5 ? "|" : ""), sf::Vector2f(configuration->Resolution.w/2,

+                                                               configuration->Resolution.h/2 + 52 + 48), 48, 19, true);

+Index: trunk/Source/Contextes/c_jeu.cpp
+===================================================================
+--- trunk/Source/Contextes/c_jeu.cpp.orig
++++ trunk/Source/Contextes/c_jeu.cpp
+@@ -585,10 +585,10 @@ int GestionBoutons(Jeu *jeu, bool diplac
+         if(eventManager->IsEnteredText())

+             jeu->hero.m_personnage.m_speak += eventManager->getChar();

+ 

+-        if(eventManager->getEvenement(sf::Keyboard::BackSpace,EventKey))

++        if(eventManager->getEvenement(sf::Keyboard::Back,EventKey))

+             if(!jeu->hero.m_personnage.m_speak.empty())

+                 jeu->hero.m_personnage.m_speak.erase(jeu->hero.m_personnage.m_speak.begin() + jeu->hero.m_personnage.m_speak.size() - 1);

+-        eventManager->StopEvenement(sf::Keyboard::BackSpace,EventKey);

++        eventManager->StopEvenement(sf::Keyboard::Back,EventKey);

+     }

+ 

+     if (   eventManager->getPositionSouris().x > AutoScreenAdjust(775,0).x

diff --git a/config_crash.patch b/config_crash.patch
index 744a21703238..7fbff92d7322 100644
--- a/config_crash.patch
+++ b/config_crash.patch
@@ -1,16 +1,15 @@
-From: Johannes Dewender <jonnyjd@users.sf.net>

-Date: Wed, 25 Jul 2012 01:22:42.463515335 +0200

-Subject: [PATCH] fix crash on saving configuration

-

-Holyspirit crashed on exit when the configuration files were not writable.

-

-Signed-off-by: Johannes Dewender <jonnyjd@users.sf.net>

-

+From: Johannes Dewender <jonnyjd@users.sf.net>
+Date: Wed, 25 Jul 2012 01:22:42.463515335 +0200
+Subject: [PATCH] fix crash on saving configuration
+Holyspirit crashed on exit when the configuration files were not writable.
+
+Signed-off-by: Johannes Dewender <jonnyjd@users.sf.net>
+
 Index: trunk/Source/main.cpp
 ===================================================================
---- trunk/Source/main.cpp	(revision 2381)
-+++ trunk/Source/main.cpp	(working copy)
-@@ -88,7 +88,15 @@
+--- trunk/Source/main.cpp.orig
++++ trunk/Source/main.cpp
+@@ -88,7 +88,15 @@ int main (  )
      console->Ajouter("");

      console->Ajouter("Saving configuration");

  

@@ -29,9 +28,9 @@ Index: trunk/Source/main.cpp
      console->Ajouter("Destruction of engines");

 Index: trunk/Source/configuration.cpp
 ===================================================================
---- trunk/Source/configuration.cpp	(revision 2381)
-+++ trunk/Source/configuration.cpp	(working copy)
-@@ -608,7 +608,7 @@
+--- trunk/Source/configuration.cpp.orig
++++ trunk/Source/configuration.cpp
+@@ -608,7 +608,7 @@ void Configuration::Sauvegarder()
          fichier.close();

      }

      else

@@ -40,7 +39,7 @@ Index: trunk/Source/configuration.cpp
  }

  

  void Configuration::SauvegarderKeyMapping()

-@@ -639,7 +639,7 @@
+@@ -639,7 +639,7 @@ void Configuration::SauvegarderKeyMappin
          fichier.close();

      }

      else