Re:

> On Jun 23, 2016, at 1:56 PM, Anton Lundin wrote: > > This patch series updates our android infrastructure and does some > needed changes to the surrounding code. > > I'm not completely confident with all the changes here, and planning to > do some more testing during the

Re:

Subjecting alpha testers to alpha code. Check I cannot tell you how happy I am to see this patch series. I'm about to head out to run some errands but expect this to hit master late today Thanks! /D -- Sent from my phone On June 23, 2016 1:56:25 PM PDT, Anton Lundin

[PATCH 12/12] android: Update all our dependencies

Signed-off-by: Anton Lundin --- packaging/android/build.sh | 30 -- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 80cae8e..5246ace 100644 ---

[PATCH 10/12] Support libgit2 api 0.24

Signed-off-by: Anton Lundin --- core/git-access.c | 4 1 file changed, 4 insertions(+) diff --git a/core/git-access.c b/core/git-access.c index fe3a918..6fe90b0 100644 --- a/core/git-access.c +++ b/core/git-access.c @@ -308,7 +308,11 @@ static int

[PATCH 11/12] Remove unused cmake flag

Signed-off-by: Anton Lundin --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb05b3a..43d817c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,6 @@ option(LIBGRANTLEE_FROM_PKGCONFIG "use pkg-config to

[PATCH 08/12] android: Set version and build for desktop app

Signed-off-by: Anton Lundin --- android/AndroidManifest.xml | 4 ++-- packaging/android/build.sh | 19 ++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 11c87f9..83f93ac 100644

[PATCH 09/12] android: Enable config via env vars

This creates the possibility to pass configuration, where the ndk and sdk is installed, to the build.sh script via environment variables. Signed-off-by: Anton Lundin --- packaging/android/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[PATCH 06/12] android: Prioritize newer Qt version if found

Signed-off-by: Anton Lundin --- packaging/android/build.sh | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index fe0c96e..f187e8a 100644 --- a/packaging/android/build.sh +++

[PATCH 07/12] android: Remove obsolete comment

Since c78e4f we build the mobile and desktop versions with different package id's. Signed-off-by: Anton Lundin --- packaging/android/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index f187e8a..a035d63

[PATCH 04/12] android: Update min sdk version for desktop to.

Signed-off-by: Anton Lundin --- android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index c9a016a..11c87f9 100644 --- a/android/AndroidManifest.xml +++

[PATCH 05/12] android: Use a ndk toolchain matching sdk version

Signed-off-by: Anton Lundin --- packaging/android/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index ff58430..fe0c96e 100644 --- a/packaging/android/build.sh +++

[PATCH 03/12] android: Update to latest NDK

Signed-off-by: Anton Lundin --- packaging/android/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index bd24f18..ff58430 100644 --- a/packaging/android/build.sh +++

[PATCH 02/12] android: Correct README

We don't depend on Qt5.5, we depend on Qt for android. Signed-off-by: Anton Lundin --- packaging/android/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/android/README b/packaging/android/README index 54cd544..bda4aa4 100644 ---

[no subject]

This patch series updates our android infrastructure and does some needed changes to the surrounding code. I'm not completely confident with all the changes here, and planning to do some more testing during the weekend. Dirk: If you feel that you can subject the Alpha testers for some alpha code

[PATCH 01/12] Build Subsurface c++ as c++11 code

With Qt 5.7, they started to require c++11 support, and in 5.6.1 some nullptr's showed up in QtAndroidExtras/qandroidfunctions.h, so now we need to compile our c++ code with c++11 support in our compiler. As Thiago pointed out, this effectively "downgrades" GCC 6 from c++14 support to c++11.

Re: [PATCH] Set -std=c++11 flag for g++

On quinta-feira, 23 de junho de 2016 12:42:36 PDT Dirk Hohndel wrote: > No, careful. I’m grudgingly accepting the fact that we need to compile with > the -std=c++11 flag in order to build against Qt5.7. I am NOT ok with > including C++11 features in the code. I’d prefer my code to be readable. >

Re: [PATCH] Set -std=c++11 flag for g++

> On Jun 23, 2016, at 12:20 PM, Anton Lundin wrote: > > On 22 June, 2016 - Thiago Macieira wrote: > >> On quarta-feira, 22 de junho de 2016 14:59:49 PDT Dirk Hohndel wrote: On Jun 22, 2016, at 2:49 PM, Thiago Macieira wrote: On

Re: [PATCH] Set -std=c++11 flag for g++

On 22 June, 2016 - Thiago Macieira wrote: > On quarta-feira, 22 de junho de 2016 14:59:49 PDT Dirk Hohndel wrote: > > > On Jun 22, 2016, at 2:49 PM, Thiago Macieira wrote: > > > > > > On quarta-feira, 22 de junho de 2016 22:47:23 PDT Anton Lundin wrote: > > >> @@ -73,6