hotfix for map marker regression

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 52 insertions, 11 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/Manifest b/games-rpg/arx-libertatis/Manifest
index 4ccc0406ee4a..1c812b81ad2f 100644
--- a/games-rpg/arx-libertatis/Manifest
+++ b/games-rpg/arx-libertatis/Manifest
@@ -4,20 +4,21 @@ Hash: SHA256
 AUX arx-data-copy 3090 SHA256 9f24928ec21c495147ff0c1c9fd88ab352fd300022bb0751d58b533a96d099d2 SHA512 dfbe8c97b9c7562062eb83f6558d23833a70ab8ca5e42f6cbadbdb97fd3e1cd4f568c415203e7c7aae36522187453f38304afac8a7e2cdc6f3288f76f915ffcb WHIRLPOOL 7db29955044aea81efc75958107d93d98b10d0170d654a8561361331d6f9038fb0ab0f7b2ac656067c67fddd91b80e1d4aec8f6b4ff2126939a565f4b135b788
 AUX arx-libertatis-1.0.3-cmake2.8.patch 1025 SHA256 4deb878b260d9dd11b587ed4c710f11bf4a010dd1611a6335b851ff202536b66 SHA512 6d0fdde817aef14dc84513213dcc0a9de560082207f0ca06d618a65b73ae6b96c4249b8c062dc864075d763d9667f5fc815f553d889582590d69226d0db3ff8e WHIRLPOOL 7920c60e82af9db05cb621d7674cb83958b52ee7a5449a39091694440c8c73310128fa0e75bac82a2ecc1920ef3fbfddb1e1acdf268551a321ded145d981df22
 AUX arx-libertatis-1.0.3-gentoo.patch 2009 SHA256 99ee2ac74a12adf7d614a1561e4eeced9adc5f6498c613e6e3cf6455913c333f SHA512 f92e51b4e14cefb35a0afb4a17a8e4a8c3ab816273c45fe89f7cf02197f5fd749d4547605e8eebd872dcf0b000b2fdc55a5e1c5442e93a9b6e3bd85362079909 WHIRLPOOL a93ef0ac90afd7e8830960c9929c1d7a8fb987e6cc1de30e78222267c5be13a93fcb95950f52f7ad79d91d41ff6ab9e2934322481595bedc25acab9ec73cd2fa
+AUX arx-libertatis-1.1-map-marker.patch 903 SHA256 a9585e64a4685f99e0bb56a3022e36c9ff162ab7e0a4ce0c7ae4086f3f43f311 SHA512 aa3bced7b564e40237dbf50f1298b3fcf34ca4e0c34b8f3e037f9216091884d0746b8a7df777fa09600db270f7eb0a906be658b77055ba75656160f3377155c9 WHIRLPOOL 7c8c31a349ea0fc9a336c3e7a9e4e37e3ed6694b33b1158a6da8e800d74ab747d1ebe8fd2196bccbbb2ce2de29a9ea5770fde6a5257fa7a9c9a75398b9804220
 DIST arx-libertatis-1.0.3.tar.xz 912288 SHA256 5719e1602051f6a6dc13ac0366ff03804f914ffbd855e7e06fdeb0d065fb6d32 SHA512 e1e8d581b6a7928911abad124a6f9670c28f2a56bc7f7f3bae965f717977a0e9a3953514a663c3f7eb4a802cca8e5607feec829a3b7ffeccc83a835fd77a74b6 WHIRLPOOL 321ec489a474b9a63a762756d929371bd8c05ea5d2fa7994c597a86dc20009f385c5f8d23c1da5f978e9f358949a96bf23bf218245633fd5f4393294fbecee75
 DIST arx-libertatis-1.1.tar.xz 970664 SHA256 881926668988c1997818f579d1513306a728e75a3bdd38aa0cf344084f6881f8 SHA512 ba8d5cfd45718c5b4738666cece224ffd4bc1d96ab9ab787c54582ca5edc62c1d826de5e32b01ebc7bf164c80d159107f3d037435996e202495fe3e69f1feca6 WHIRLPOOL b90263426f390ace67adb191f155f47bea996e108730982a1479792223a180be83c241bacd8a4cf652c564c38b5c535b55ebb5c40577210b6901eaccc4427bbc
 EBUILD arx-libertatis-1.0.3.ebuild 2267 SHA256 c5633fd12847864dbe8b22af1c63427a299778629e2883182977df157c497ef9 SHA512 f9529ece9262247fb6c2ca389639df6bc35ababeee86b458bc03f192457857296074f25ed84ee2c7b16bebb692e3fb90456ee56e5dc21980d6f2d90394b8147b WHIRLPOOL b2038510559b4a418aa240df77d07d4595b7988b2ffc92a083a4121c6b5979ae29046505431ec652c20803f723d4e755bdb6ad2346eef7e94e1350dfef00a70d
-EBUILD arx-libertatis-1.1.ebuild 2469 SHA256 ff6a30e1d4fa03efb1f5fb0205c9a3bc0efdc8b8f99890b03eef9f523241b049 SHA512 21cde4568328469ccc7cb036229db249c7e84591a6e25d3b3ec915c352c68e5324355d8e7871406037f471cc49e6bb5e96a1b9221a4c853b64166e23474a6553 WHIRLPOOL 74f826be1cc9cc4ca11f3b971c09694a5f0cb6f9347b94eab2170069af7c674a4a48ed4230ff7da438681bd73bd7f1684ed46a9daeb1b4f3ef9b73226a942496
-MISC ChangeLog 2611 SHA256 db267a29114d1432f10395be812d6c8987696c709573a086d7e82ff806edea5a SHA512 cc86937a97aa847f5808d4196d8ceef0e3c5699ec17cb28b187caea3e3027907bb9f19259e913e57e169aac7b86718dc03e7a488ac40d39f83811ccd8714bb26 WHIRLPOOL 6f73d5e6832de6c98827605342ce369def4b316d0b6bf478e28df7fba579b5490b874580eb2b2482b4b5f572e3b3be5161c51662d3176f181cf356a7298016af
+EBUILD arx-libertatis-1.1-r1.ebuild 2521 SHA256 310d085bad4ac863f781de16a3d5a0d19f01642ba25c13d09b48aab2b2349b87 SHA512 c52659ae075b287c1bc88d6d74ef4c5e61780b1e253a45853372b64015ba5172aae87365ba0cc58c1b4f18da9c85c1648e59dfa6bf758431023ab6d43f8f484c WHIRLPOOL 5e6a472d0ba468f49d9f0f6bc2bc38b9d7d93137bd2c953c0cb5b8a5508893f9a0e5df2df767702a1876d0f088dc7f1d7ad5dce644b732509734efe7d3a74aff
+MISC ChangeLog 2841 SHA256 36bb81b3ae2537a9bcdfd698a1ac9cbf070da34957b0d535dbc1af5cce76108e SHA512 f1da8ca318711889be4c8ea59468fdd40ec2642080a0dcdd2a9d4e7d2f4709d137b3fdc39740e10d26defc422deac5606183f08711624533afa7e0dc23255a3f WHIRLPOOL fd08948f0322eaef0a9520805bcface0ddbf61d121984beb212f8fb801875653f9cab86c939bf77c05b1610bd0eaeb11f8ee3f7d758047f200e37b54bf9e530e
 MISC metadata.xml 2566 SHA256 6cb57882fec2064e146b87f683e8540fe03fc988a670fae67624d50b9bd83b39 SHA512 f5fc0020edaf8940006e48fa9e536dad576c8703143891769ebc80543f8233c70100f5e340047304eee68d89554be0c90bbf33e5a8539d69c561f91d77bbe26a WHIRLPOOL 484d02bf041975ef835289926ffc997ab20a713db376f8dbd93bdeed6e598556f33cf194f6d63656dbd5d57aac709e7a01a31f389eb10aa831a07596b85b2719
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4qZ6AAoJEFpvPKfnPDWzSI0H/15oQvAPWo4+ON/W4ab7BNVQ
-BV7GRNLN+G23ir3lo3oDMIRg5ANVNwwT6nKS/nOpuPJF74Poh3Puz72DsJnWwNHU
-LPd7ys0Rkbg+mlqtTYpN/Dgsy8QihAjHISeolgfO43zGR8o8j+LX85keVP0UYBSE
-Qw0CpwlDYCAreeR4ZaLwrxdL40vX+lLnWIo8dMGE2dCdfj2S4R/r6GxVQ+EqHaKs
-mU1TQ2H9KX7PYG0yRVCdKrJnS6kb3lm6bfQEO6UcwHNvSxGuy5BCfo5TVcUa36/O
-MWUrcht4NS/SQv1gaZsBjVRXmGyeWWy5RWRr2cy6uSzYFTOGXN2lFIjsZujcqJA=
-=f/3N
+iQEcBAEBCAAGBQJR5eXUAAoJEFpvPKfnPDWzIj8IALc8+F6MrK7NOBbbgyzjv/ly
+jml1eY7tFU3Ycr4A07L3TAf7SwGjke+oRma0lFhkXb0+5jWxXLP76VC9kP0PxukY
+XdYlUAdUK0J12kc3Zn6IOAXJKhvvgnNssnMsi5lDjaJP7c/qleCLAvz0GMe1HfZX
+FECb8txaEY1dpxrzDFGlw0NpslSrliNc0UdnIvq291gOgPdnL2F4s1HCHO4dP+4a
+G1wXukGPiUhPEs2WEr4OwcvycNqzDJURBXJzfRUB9296dBAAlVv5WG9cMyLr59oE
+IivBH9vOLOX62lI91+TXP/+GUot7jnlhzuFKT3iYd7mCkkRDc6N09W3qDvJSOlU=
+=C4E4
 -----END PGP SIGNATURE-----
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