Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Hi Release Team, Please unblock this new version of epiphany. Previous seems to fail now to build a proper path for loading game maps (strace shows it's trying to open ".map" which is just only the last sprintf). This is changed to use a more direct approach to path building. Full debdiff attached. Thanks in advance, unblock epiphany/0.7.0+0-3 -- Ricardo Mones ~ The three principal virtues of a programmer are Laziness, Impatience, and Hubris. man perl
diff -Nru epiphany-0.7.0+0/debian/changelog epiphany-0.7.0+0/debian/changelog --- epiphany-0.7.0+0/debian/changelog 2014-10-09 12:47:02.000000000 +0200 +++ epiphany-0.7.0+0/debian/changelog 2014-11-04 02:42:30.000000000 +0100 @@ -1,3 +1,10 @@ +epiphany (0.7.0+0-3) unstable; urgency=medium + + * patches/unravel-sprintf.diff + - Patch to simplify string handling (Closes: #767904) + + -- Ricardo Mones <[email protected]> Tue, 04 Nov 2014 01:43:33 +0100 + epiphany (0.7.0+0-2) unstable; urgency=medium * debian/rules, epiphany.install, epiphany-data.install diff -Nru epiphany-0.7.0+0/debian/patches/series epiphany-0.7.0+0/debian/patches/series --- epiphany-0.7.0+0/debian/patches/series 2014-10-09 12:47:02.000000000 +0200 +++ epiphany-0.7.0+0/debian/patches/series 2014-11-04 02:42:30.000000000 +0100 @@ -1 +1,2 @@ use-shared-tinyxml.diff +unravel-sprintf.diff diff -Nru epiphany-0.7.0+0/debian/patches/unravel-sprintf.diff epiphany-0.7.0+0/debian/patches/unravel-sprintf.diff --- epiphany-0.7.0+0/debian/patches/unravel-sprintf.diff 1970-01-01 01:00:00.000000000 +0100 +++ epiphany-0.7.0+0/debian/patches/unravel-sprintf.diff 2014-11-04 02:42:30.000000000 +0100 @@ -0,0 +1,30 @@ +Subject: Unravel level path construction which seems to + be optimized out by current C++ compiler +From: Ricardo Mones <[email protected]> +Forwarded: no +Last-Update: 2014-11-04 +Bug-Debian: https://bugs.debian.org/767904 + +diff --git a/src/game.cpp b/src/game.cpp +index e3c8bc7..2a8a70a 100644 +--- a/src/game.cpp ++++ b/src/game.cpp +@@ -413,14 +413,10 @@ void Game::go() + m_level=new Level(); + + char current_level_path[255]; +- +- sprintf(current_level_path, "%s", (Resource_Factory::instance()->get_resource_path().c_str())); +- +- sprintf(current_level_path, "%s%s", current_level_path, "/maps/level"); +- +- sprintf(current_level_path, "%s%d", current_level_path, (menu.get_current_level())); +- +- sprintf(current_level_path, "%s%s", current_level_path, ".map"); ++ ++ sprintf(current_level_path, "%s/maps/level%d.map", ++ Resource_Factory::instance()->get_resource_path().c_str(), ++ menu.get_current_level()); + + DEBOUT("Loading map: "<<current_level_path<<"\n"); +
