Attachment 151474 Details for Bug 196652 – Fix games/xmoto with libc++ r224926

[patch] Fix games/xmoto with libc++ r224926

games__xmoto-fix-various-problems-1.diff (text/plain), 6.37 KB, created by Dimitry Andric on 2015-01-12 19:27:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-01-12 19:27:07 UTC

Size: 6.37 KB

patch

obsolete

>Index: games/xmoto/files/patch-src-GameInit.cpp
>===================================================================
>--- games/xmoto/files/patch-src-GameInit.cpp	(revision 0)
>+++ games/xmoto/files/patch-src-GameInit.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/GameInit.cpp.orig	2015-01-10 18:22:36.000000000 +0100
>++++ src/GameInit.cpp	2015-01-10 18:27:28.000000000 +0100
>+@@ -248,7 +248,7 @@ void GameApp::run_load(int nNumArgs, cha
>+   Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */
>+ 
>+   LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str());
>+-  LogInfo("compiled at "__DATE__" "__TIME__);
>++  LogInfo("compiled at " __DATE__ " " __TIME__);
>+   if(SwapEndian::bigendien) {
>+     LogInfo("Systeme is bigendien");
>+   } else {
>
>Property changes on: games/xmoto/files/patch-src-GameInit.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: games/xmoto/files/patch-src-VTexture.h
>===================================================================
>--- games/xmoto/files/patch-src-VTexture.h	(revision 376080)
>+++ games/xmoto/files/patch-src-VTexture.h	(working copy)
>@@ -1,11 +0,0 @@
>---- src/VTexture.h.orig	2011-10-12 00:18:35.000000000 +0400
>-+++ src/VTexture.h	2014-11-24 22:08:42.749026473 +0300
>-@@ -135,7 +135,7 @@
>- 
>-   void cleanUnregistredTextures();
>- 
>--  HashNamespace::hash_map<const char*, int*, HashNamespace::hash<const char*>, hashcmp_str> m_textureSizeCache;
>-+  HashNamespace::hash_map<std::string, int*> m_textureSizeCache;
>-   std::vector<std::string> m_textureSizeCacheKeys;
>-   std::vector<int*> m_textureSizeCacheValues;
>- 
>Index: games/xmoto/files/patch-src-WWW.cpp
>===================================================================
>--- games/xmoto/files/patch-src-WWW.cpp	(revision 0)
>+++ games/xmoto/files/patch-src-WWW.cpp	(working copy)
>@@ -0,0 +1,47 @@
>+--- src/WWW.cpp.orig	2015-01-10 18:11:22.000000000 +0100
>++++ src/WWW.cpp	2015-01-10 18:21:32.000000000 +0100
>+@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
>+   std::string v_www_agent = WWW_AGENT;
>+ 
>+   /* open the file */
>+-  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
>++  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == NULL) {
>+     throw Exception("error : unable to open output file " 
>+         + v_local_file_tmp);
>+   }
>+@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
>+   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
>+ 
>+   /* open the file */
>+-  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
>++  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
>+     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
>+   }
>+       
>+@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string& 
>+   LogInfo("Sending vote");
>+ 
>+   /* open the file */
>+-  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
>++  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
>+     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
>+   }
>+       
>+@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
>+   LogInfo("Sending report");
>+ 
>+   /* open the file */
>+-  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
>++  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
>+     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
>+   }
>+       
>+@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
>+   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
>+ 
>+   /* open the file */
>+-  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
>++  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == NULL) {
>+     throw Exception("error : unable to open output file " + p_answerFile);
>+   }
>+       
>
>Property changes on: games/xmoto/files/patch-src-WWW.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp
>===================================================================
>--- games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp	(revision 376080)
>+++ games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp	(working copy)
>@@ -1,34 +0,0 @@
>---- src/drawlib/DrawLibOpenGL.cpp.orig	2011-10-12 00:18:26.000000000 +0400
>-+++ src/drawlib/DrawLibOpenGL.cpp	2014-11-24 22:08:12.925973647 +0300
>-@@ -80,7 +80,7 @@
>-   /* a glyph from other glyphs */
>-   /*kejo:why not just grrr create a copy contructor*/
>-   GLFontGlyph(const std::string& i_value,
>--	      HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters);
>-+	      HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters);
>-   virtual ~GLFontGlyph();
>- 
>-   std::string Value() const;
>-@@ -132,11 +132,11 @@
>- private:
>-   std::vector<std::string> m_glyphsKeys;
>-   std::vector<GLFontGlyph*> m_glyphsValues;
>--  HashNamespace::hash_map<const char*, GLFontGlyph*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphs;
>-+  HashNamespace::hash_map<std::string, GLFontGlyph*> m_glyphs;
>- 
>-   std::vector<std::string> m_glyphsLettersKeys;
>-   std::vector<GLFontGlyphLetter*> m_glyphsLettersValues;
>--  HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphsLetters;
>-+  HashNamespace::hash_map<std::string, GLFontGlyphLetter*> m_glyphsLetters;
>- 
>-   unsigned int getLonguestLineSize(const std::string& i_value, unsigned int i_start = 0, unsigned int i_nbLinesToRead = -1);
>- };
>-@@ -825,7 +825,7 @@
>- }
>- 
>- GLFontGlyph::GLFontGlyph(const std::string& i_value,
>--			 HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters) {
>-+			 HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters) {
>-   GLFontGlyph* v_glyph;
>-   std::string  v_char;
>-

Actions: View | Diff

Attachments on bug 196652: 151474 | 151511