From c6c14ba184fcb4f4399b8ae4ce0ae1d04f45da0a Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Sat, 30 Apr 2011 18:03:35 +0200
Subject: Fix FTBFS on debian packaging strict compilation.

Tested by: the-me
---
 src/utils/xml.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 9835f88c..1970b062 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -149,7 +149,7 @@ namespace XML
             logger->log("Error in unknown xml file on line %d",
                         error->line);
 
-        logger->log(error->message);
+        logger->log("%s", error->message);
 
         // No need to keep errors around
         xmlCtxtResetLastError(error->ctxt);
-- 
cgit v1.2.3-70-g09d2


From b9bf0acfe46222508c9910c2a2b750feafb5a0d2 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Wed, 27 Apr 2011 10:54:40 +0200
Subject: Removed unused variable 'handledEvents'

At some point this variable was used to avoid limiting the framerate
when user input events were coming in. This is no longer relevant now
that we limit the framerate globally using SDL_gfx.
---
 src/client.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/client.cpp b/src/client.cpp
index abe3500c..f63fc5f7 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -488,8 +488,6 @@ int Client::exec()
 
     while (mState != STATE_EXIT)
     {
-        bool handledEvents = false;
-
         if (game)
         {
             // Let the game handle the events while it is active
@@ -500,8 +498,6 @@ int Client::exec()
             // Handle SDL events
             while (SDL_PollEvent(&event))
             {
-                handledEvents = true;
-
                 switch (event.type)
                 {
                     case SDL_QUIT:
-- 
cgit v1.2.3-70-g09d2


From 8fe9c1d9f046aa6d746ab075b3056d75898d1f2c Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 7 Sep 2011 23:09:28 -0700
Subject: Changes need to build without OpenGL

---
 src/CMakeLists.txt   | 1 +
 src/openglgraphics.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35af94fb..7b64d404 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -649,6 +649,7 @@ TARGET_LINK_LIBRARIES(mana
     ${CURL_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${GUICHAN_LIBRARIES}
+    ${X11_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${LIBINTL_LIBRARIES}
     ${EXTRA_LIBRARIES})
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index ee96e19c..73adbdc1 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -30,7 +30,6 @@
 #define NO_SDL_GLEXT
 
 #include <SDL_opengl.h>
-#endif
 
 class OpenGLGraphics : public Graphics
 {
@@ -129,5 +128,6 @@ class OpenGLGraphics : public Graphics
         bool mColorAlpha;
         bool mSync;
 };
+#endif //USE_OPENGL
 
 #endif
-- 
cgit v1.2.3-70-g09d2