From 1dfae26b25d8e8e490fc395743372ba35b1a60c6 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 09:03:13 +0100 Subject: [PATCH 1/2] Fixed: Compilation under Linux --HG-- branch : develop --- code/nel/src/misc/common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index f455f121f..ca116d0f8 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -1518,7 +1518,7 @@ static bool openDocWithExtension (const std::string &document, const std::string if (!CFile::fileExists(command)) { - if (strcmp(ext, "htm") == 0) + if (ext == "htm") { command = "/etc/alternatives/x-www-browser"; From dfd9a53d523b545cad9d4cf70e714b77cc08b7de Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 09:04:06 +0100 Subject: [PATCH 2/2] Changed: Use current sources instead of recloning repository --HG-- branch : develop --- dist/snap/snapcraft.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dist/snap/snapcraft.yaml b/dist/snap/snapcraft.yaml index 0a8f5486d..659a58a7d 100644 --- a/dist/snap/snapcraft.yaml +++ b/dist/snap/snapcraft.yaml @@ -17,10 +17,7 @@ apps: parts: ryzom: - source: https://bitbucket.org/ryzom/ryzomcore - source-type: hg - source-branch: compatibility-develop - source-subdir: code + source: ../../code plugin: cmake configflags: - -DCMAKE_BUILD_TYPE=Release