hotfix for map marker regression

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 42 insertions, 2 deletions

diff --git a/games-rpg/arx-libertatis/ChangeLog b/games-rpg/arx-libertatis/ChangeLog
index 23995c3fd40b..7528d2e7451b 100644
--- a/games-rpg/arx-libertatis/ChangeLog
+++ b/games-rpg/arx-libertatis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/arx-libertatis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.16 2013/07/14 13:17:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.17 2013/07/17 00:31:11 hasufell Exp $
+
+*arx-libertatis-1.1-r1 (17 Jul 2013)
+
+  17 Jul 2013; Julian Ospald <hasufell@gentoo.org> -arx-libertatis-1.1.ebuild,
+  +arx-libertatis-1.1-r1.ebuild, +files/arx-libertatis-1.1-map-marker.patch:
+  hotfix for map marker regression
 
 *arx-libertatis-1.1 (14 Jul 2013)
 
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild
index 17dea9346566..137511957596 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.1.ebuild,v 1.1 2013/07/14 13:17:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.1-r1.ebuild,v 1.1 2013/07/17 00:31:11 hasufell Exp $
 
 EAPI=5
 
@@ -36,6 +36,8 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md AUTHORS CHANGELOG )
 
+PATCHES=( "${FILESDIR}"/${P}-map-marker.patch )
+
 src_configure() {
 	# editor does not build
 	local mycmakeargs=(
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch
new file mode 100644
index 000000000000..7bc042723b1f
--- /dev/null
+++ b/games-rpg/arx-libertatis/files/arx-libertatis-1.1-map-marker.patch
@@ -0,0 +1,32 @@
+From e37b1efc4c2d9109625c3add80c04884ac9e2f3b Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Wed, 17 Jul 2013 02:21:13 +0200
+Subject: [PATCH] Fix map marker labels not being saved
+
+Thanks to Eli2 for hunting down the offending change.
+
+See: commit d9662f
+---
+ src/scene/SaveFormat.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/scene/SaveFormat.h b/src/scene/SaveFormat.h
+index 7ffb17c..02e4b85 100644
+--- a/src/scene/SaveFormat.h
++++ b/src/scene/SaveFormat.h
+@@ -182,11 +182,12 @@ struct SavedMapMarkerData {
+ 	s32 lvl;
+ 	char name[STRING_SIZE];
+ 	
+-	/* implicit */ SavedMapMarkerData(const MiniMap::MapMarkerData &b) {
++	/* implicit */ SavedMapMarkerData(const MiniMap::MapMarkerData & b) {
+ 		x = b.m_x;
+ 		y = b.m_y;
+ 		lvl = b.m_lvl;
+ 		arx_assert(STRING_SIZE > b.m_name.length());
++		strcpy(name, b.m_name.c_str());
+ 	}
+ 	
+ };
+-- 
+1.8.1.6