This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository trigger-rally.
commit 14d610128b74aecf33247b3d660aa2ef6095d5a2 Author: Markus Koschany <[email protected]> Date: Sat Jan 27 23:25:03 2018 +0100 Fix FTBFS with libtinyxml2-dev 6.0.0 Closes: #887929 Thanks: peter green for the patch. --- debian/control | 2 +- debian/patches/libxml2-6.0.0.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dd389df..39a7ed3 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11), libsdl2-image-dev, docbook-to-man, libglew-dev, - libtinyxml2-dev + libtinyxml2-dev (>= 6.0.0) Standards-Version: 4.1.3 Uploaders: Stefan Potyra <[email protected]>, Barry deFreese <[email protected]>, diff --git a/debian/patches/libxml2-6.0.0.patch b/debian/patches/libxml2-6.0.0.patch new file mode 100644 index 0000000..7fa496d --- /dev/null +++ b/debian/patches/libxml2-6.0.0.patch @@ -0,0 +1,31 @@ +Description: Fix FTBFS with tinyxml2 6.0.0. + It looks like "GetErrorStr1" and "GetErrorStr2" were replaced by "ErrorStr" + Fix inspired by https://bitbucket.org/osrf/gazebo/commits/be154a72c765abd6d9517c04cd46c96870edf5c2?at=gazebo8 +Author: Peter Michael Green <[email protected]> + +Index: trigger-rally-0.6.5+dfsg/src/PEngine/util.cpp +=================================================================== +--- trigger-rally-0.6.5+dfsg.orig/src/PEngine/util.cpp ++++ trigger-rally-0.6.5+dfsg/src/PEngine/util.cpp +@@ -231,7 +231,7 @@ XMLElement *PUtil::loadRootElement(XMLDo + XMLElement *rootelem = doc.FirstChildElement(rootName); + if (!rootelem) { + PUtil::outLog() << "Load failed: TinyXML error" << std::endl; +- PUtil::outLog() << "TinyXML: " << doc.GetErrorStr1() << ", " << doc.GetErrorStr2() << std::endl; ++ PUtil::outLog() << "TinyXML: " << doc.ErrorStr() << std::endl; + return nullptr; + } + +Index: trigger-rally-0.6.5+dfsg/src/Trigger/main.cpp +=================================================================== +--- trigger-rally-0.6.5+dfsg.orig/src/Trigger/main.cpp ++++ trigger-rally-0.6.5+dfsg/src/Trigger/main.cpp +@@ -498,7 +498,7 @@ void MainApp::loadConfig() + XMLElement *rootelem = PUtil::loadRootElement(xmlfile, cfgfilename, "config"); + if (!rootelem) { + PUtil::outLog() << "Error: Couldn't load configuration file" << std::endl; +- PUtil::outLog() << "TinyXML: " << xmlfile.GetErrorStr1() << ", " << xmlfile.GetErrorStr2() << std::endl; ++ PUtil::outLog() << "TinyXML: " << xmlfile.ErrorStr() << std::endl; + PUtil::outLog() << "Your data paths are probably not set up correctly" << std::endl; + throw MakePException ("Boink"); + } diff --git a/debian/patches/series b/debian/patches/series index 0f66114..9270122 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ verbose-build.patch disable-strip.patch 20_system_tinyxml.patch +libxml2-6.0.0.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
