Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jun 2017 00:11:22 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444331 - head/games/aquaria/files
Message-ID:  <201706260011.v5Q0BMXU090099@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Jun 26 00:11:22 2017
New Revision: 444331
URL: https://svnweb.freebsd.org/changeset/ports/444331

Log:
  games/aquaria: unbreak after r443975
  
  Aquaria/Continuity.cpp:(.text+0x1684e): undefined reference to `tinyxml2::StrPair::GetStr()'
  CMakeFiles/aquaria.dir/Aquaria/DSQ.cpp.o: In function `DSQ::loadModsCallback(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, long)':
  Aquaria/DSQ.cpp:(.text+0x1014e): undefined reference to `tinyxml2::StrPair::GetStr()'
  c++: error: linker command failed with exit code 1 (use -v to see invocation)
  
  Reported by:	pkg-fallout

Added:
  head/games/aquaria/files/patch-tinyxml2   (contents, props changed)

Added: head/games/aquaria/files/patch-tinyxml2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/aquaria/files/patch-tinyxml2	Mon Jun 26 00:11:22 2017	(r444331)
@@ -0,0 +1,24 @@
+https://github.com/AquariaOSE/Aquaria/issues/59
+
+--- Aquaria/Continuity.cpp.orig	2016-06-19 23:56:27 UTC
++++ Aquaria/Continuity.cpp
+@@ -2737,7 +2737,7 @@ void Continuity::loadFileData(int slot, XMLDocument &d
+ 		}
+ 		if (doc.Parse(buf, size) != XML_SUCCESS)
+ 		{
+-			errorLog("Failed to load save data: " + teh_file + " -- Error: " + doc.GetErrorStr1());
++			errorLog("Failed to load save data: " + teh_file + " -- Error: " + doc.ErrorName());
+ 			return;
+ 		}
+ 	}
+--- Aquaria/DSQ.cpp.orig	2016-06-19 23:56:27 UTC
++++ Aquaria/DSQ.cpp
+@@ -2079,7 +2079,7 @@ void DSQ::loadModsCallback(const std::string &filename
+ 	if(!Mod::loadModXML(&d, name))
+ 	{
+ 		std::ostringstream os;
+-		os << "Failed to load mod xml: " << filename << " -- Error: " << d.GetErrorStr1();
++		os << "Failed to load mod xml: " << filename << " -- Error: " << d.ErrorName();
+ 		dsq->debugLog(os.str());
+ 		return;
+ 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706260011.v5Q0BMXU090099>