From b5fc65ce3eafb5972d98f4ac2f75469893147a12 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 5 Dec 2016 14:03:44 +0100
Subject: [PATCH 1/5] Fixed: Force c++0x for GCC and clang to be able to use
 std::unique_ptr and std::shared_ptr

--HG--
branch : develop
---
 code/CMakeModules/nel.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index c52590ee2..c7891917c 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -851,6 +851,9 @@ MACRO(NL_SETUP_BUILD)
       ENDIF()
     ENDIF()
 
+    # use c++0x standard to use std::unique_ptr and std::shared_ptr
+    ADD_PLATFORM_FLAGS("-std=c++0x")
+
     ADD_PLATFORM_FLAGS("-D_REENTRANT")
 
     # hardening

From 6162352d8b40ffacac41d40a4f7337ac949c8fdd Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 5 Dec 2016 14:04:22 +0100
Subject: [PATCH 2/5] Fixed: Target OS X 10.7 so we can switch to libc++
 instead of very old GCC 4.2.1 STL

--HG--
branch : develop
---
 code/CMakeModules/nel.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index c7891917c..f44f146d6 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -831,10 +831,17 @@ MACRO(NL_SETUP_BUILD)
         ELSE()
           # Always force -mmacosx-version-min to override environement variable
           IF(CMAKE_OSX_DEPLOYMENT_TARGET)
+            IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.7")
+              MESSAGE(FATAL_ERROR "Minimum target for OS X is 10.7 but you're using ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+            ENDIF()
             SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
           ENDIF()
         ENDIF()
 
+        # use libc++ under OX X to be able to use new C++ features (and else it'll use GCC 4.2.1 STL)
+        # minimum target is now OS X 10.7
+        ADD_PLATFORM_FLAGS("-stdlib=libc++")
+        
         SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-headerpad_max_install_names")
 
         IF(HAVE_FLAG_SEARCH_PATHS_FIRST)

From 5ee53205b9bcee6b686fc5d7be10205ef4f95f63 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 5 Dec 2016 14:04:43 +0100
Subject: [PATCH 3/5] Fixed: CMake definitions in PCH

--HG--
branch : develop
---
 code/CMakeModules/PCHSupport.cmake | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index 45e1aa766..f56626da1 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -28,15 +28,12 @@ ELSE()
 ENDIF()
 
 MACRO(APPEND_DEFINITION _NAME _VAL)
-  # value is not empty
-  IF(${_VAL})
-    IF(CMAKE_VERSION VERSION_LESS "2.8.12")
-      # don't support logical expressions, append definition
-      LIST(APPEND ${_NAME} "-D${_VAL}")
-    ELSE()
-      # support logical expressions, use them
-      LIST(APPEND ${_NAME} "$<$<BOOL:${_VAL}>:-D$<JOIN:${_VAL},-D>>")
-    ENDIF()
+  IF(CMAKE_VERSION VERSION_LESS "2.8.12")
+    # don't support logical expressions, append definition
+    LIST(APPEND ${_NAME} "-D${_VAL}")
+  ELSE()
+    # support logical expressions, use them
+    LIST(APPEND ${_NAME} "$<$<BOOL:${_VAL}>:-D$<JOIN:${_VAL},-D>>")
   ENDIF()
 ENDMACRO()
 
@@ -197,7 +194,7 @@ MACRO(PCH_SET_COMPILE_FLAGS _target)
         LIST(APPEND _FLAGS "${item}")
       ENDFOREACH()
     ENDIF()
-    
+
     GET_DIRECTORY_PROPERTY(_DIRECTORY_DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS)
 
     IF(_DIRECTORY_DEFINITIONS)

From 455e6e8bf544e98ebf8a03f80478ae7b785e37eb Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 5 Dec 2016 14:05:30 +0100
Subject: [PATCH 4/5] Fixed: Snap generation

--HG--
branch : develop
---
 dist/snap/snapcraft.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dist/snap/snapcraft.yaml b/dist/snap/snapcraft.yaml
index 659a58a7d..7c0bd1813 100644
--- a/dist/snap/snapcraft.yaml
+++ b/dist/snap/snapcraft.yaml
@@ -42,11 +42,14 @@ parts:
         - -DRYZOM_GAMES_PREFIX=bin
     build-packages:
         - zlib1g-dev
-        - libpng-dev
+        - libpng12-dev
         - libjpeg8-dev
         - qttools5-dev-tools
+        - libxml2-dev
+        - libssl-dev
+        - libqt5opengl5-dev
     stage-packages:
         - libqt5widgets5
-        
+        - libqt5opengl5
     after: [desktop-qt5]
 

From ac79329448af33e3b58fd4c4a4bdf090173957dd Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Mon, 5 Dec 2016 14:06:17 +0100
Subject: [PATCH 5/5] Fixed: Compilation of Ryzom Installer with Qt versions
 older than 5.6

--HG--
branch : develop
---
 code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
index 592b8e0a2..f76ba4771 100644
--- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
@@ -715,8 +715,13 @@ int CConfigFile::compareInstallersVersion() const
 
 	QString newVersion = QApplication::applicationVersion();
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))	
 	QVersionNumber installedVer = QVersionNumber::fromString(installedVersion);
 	QVersionNumber newVer = QVersionNumber::fromString(newVersion);
+#else
+	QString installedVer = installedVersion;
+	QString newVer = newVersion;
+#endif
 
 	// same version
 	if (newVer == installedVer) return 0;