Merge branch 'master' of github.com:lutraconsulting/input-sdk

MerginMaps · Jul 21, 2020 · 1667d73 · 1667d73
2 parents 545dcaa + 5a907c9
commit 1667d73
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 77 deletions.
diff --git a/android/android.md b/android/android.md
@@ -13,5 +13,5 @@ Contains:
   - QGIS core
   - QgsQuick
 
-[used versions](android/Dockerfile) - MAKE SURE YOU HAVE correct QT version (openssl) and NDK
+[used versions](Dockerfile) - MAKE SURE YOU HAVE correct QT version (openssl) and NDK
 
diff --git a/android/recipes/geodiff/recipe.sh b/android/recipes/geodiff/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # version of your package
-VERSION_geodiff=0.8.1
+VERSION_geodiff=0.8.4
 
 # dependencies of this recipe
 DEPS_geodiff=()
@@ -10,7 +10,7 @@ DEPS_geodiff=()
 URL_geodiff=https://github.com/lutraconsulting/geodiff/archive/${VERSION_geodiff}.tar.gz
 
 # md5 of the package
-MD5_geodiff=f93edc0889b733357b6b92ca405c90f0
+MD5_geodiff=fc71253a40c234e59baecb890c837c6e
 
 # default build path
 BUILD_geodiff=$BUILD_PATH/geodiff/$(get_directory $URL_geodiff)

diff --git a/android/recipes/libzip/recipe.sh b/android/recipes/libzip/recipe.sh
@@ -4,7 +4,7 @@
 VERSION_libzip=1-5-2
 
 # dependencies of this recipe
-DEPS_libzip=(zlib)
+DEPS_libzip=()
 
 # url of the package
 URL_libzip=https://github.com/nih-at/libzip/archive/rel-${VERSION_libzip}.zip

diff --git a/android/recipes/qgis/recipe.sh b/android/recipes/qgis/recipe.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 # version of your package
-VERSION_qgis=3.13
+VERSION_qgis=3.15
 
 # dependencies of this recipe
-DEPS_qgis=(zlib gdal qca libspatialindex libspatialite expat postgresql libzip qtkeychain exiv2 geodiff protobuf)
+DEPS_qgis=(gdal qca libspatialindex libspatialite expat postgresql libzip qtkeychain exiv2 geodiff protobuf)
 
 # url of the package
-# some random commit from the 5th May 2020
-URL_qgis=https://github.com/qgis/QGIS/archive/da042bb61dc7447b41b021838efe42d08b31cdd8.tar.gz
+# some random commit from the 13th July 2020
+URL_qgis=https://github.com/qgis/QGIS/archive/ebd4cd8c138574f0c6d6ea7911cc89abc6ad587a.tar.gz
 
 # md5 of the package
-MD5_qgis=7bb8177647370b999078134bae663cce
+MD5_qgis=2ed8b8ac4217b7d290459a073710cc73
 
 # default build path
 BUILD_qgis=$BUILD_PATH/qgis/$(get_directory $URL_qgis)
@@ -62,6 +62,7 @@ function build_qgis() {
     -DPYTHON_EXECUTABLE=`which python3` \
     -DWITH_BINDINGS=OFF \
     -DWITH_GRASS=OFF \
+    -DWITH_GEOREFERENCER=OFF \
     -DWITH_QTMOBILITY=OFF \
     -DWITH_QUICK=ON \
     -DQCA_INCLUDE_DIR=$STAGE_PATH/include/Qca-qt5/QtCrypto \

diff --git a/android/recipes/zlib/recipe.sh b/android/recipes/zlib/recipe.sh
diff --git a/ios/recipes/geodiff/recipe.sh b/ios/recipes/geodiff/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # version of your package
-VERSION_geodiff=0.8.1
+VERSION_geodiff=0.8.4
 
 # dependencies of this recipe
 DEPS_geodiff=()
@@ -10,7 +10,7 @@ DEPS_geodiff=()
 URL_geodiff=https://github.com/lutraconsulting/geodiff/archive/${VERSION_geodiff}.tar.gz
 
 # md5 of the package
-MD5_geodiff=f93edc0889b733357b6b92ca405c90f0
+MD5_geodiff=fc71253a40c234e59baecb890c837c6e
 
 # default build path
 BUILD_geodiff=$BUILD_PATH/geodiff/$(get_directory $URL_geodiff)

diff --git a/ios/recipes/qgis/recipe.sh b/ios/recipes/qgis/recipe.sh
@@ -105,6 +105,7 @@ function build_qgis() {
     -DWITH_INTERNAL_SPATIALITE=OFF \
     -DWITH_ANALYSIS=OFF \
     -DWITH_GRASS=OFF \
+    -DWITH_GEOREFERENCER=OFF \
     -DWITH_QTMOBILITY=OFF \
     -DWITH_QUICK=ON \
     -DCMAKE_INSTALL_PREFIX:PATH=$STAGE_PATH \

diff --git a/mac/recipes/qgis/recipe.sh b/mac/recipes/qgis/recipe.sh
@@ -7,11 +7,11 @@ VERSION_qgis=3.13
 DEPS_qgis=(geodiff)
 
 # url of the package
-# some random commit from the 9th May 2020
-URL_qgis=https://github.com/qgis/QGIS/archive/da042bb61dc7447b41b021838efe42d08b31cdd8.tar.gz
+# some random commit from the 14th June 2020
+URL_qgis=https://github.com/qgis/QGIS/archive/e4987fd911c8a6625819dfd7985c41f2e9560599.tar.gz
 
 # md5 of the package
-MD5_qgis=7bb8177647370b999078134bae663cce
+MD5_qgis=01feb958cb6eefc7870a49deb43a7ef0
 
 # default build path
 BUILD_qgis=$BUILD_PATH/qgis/$(get_directory $URL_qgis)
@@ -60,6 +60,7 @@ function build_qgis() {
     -DDISABLE_DEPRECATED=ON \
     -DWITH_QTWEBKIT=OFF \
     -DWITH_GRASS=OFF \
+    -DWITH_GEOREFERENCER=OFF \
     -DWITH_QTMOBILITY=OFF \
     -DWITH_QUICK=ON \
     -DENABLE_QT5=ON \

diff --git a/win/recipes/geodiff/recipe.bat b/win/recipes/geodiff/recipe.bat
@@ -1,6 +1,6 @@
 @echo on
 
-set VERSION_geodiff=0.8.1
+set VERSION_geodiff=0.8.4
 set URL_geodiff=https://github.com/lutraconsulting/geodiff/archive/%VERSION_geodiff%.tar.gz
 set BUILD_geodiff=%BUILD_PATH%\geodiff
 set REPO_geodiff=%REPO_PATH%\geodiff

diff --git a/win/recipes/qgis/recipe.bat b/win/recipes/qgis/recipe.bat
@@ -1,6 +1,6 @@
 @echo on
 
-set VERSION_qgis=da042bb61dc7447b41b021838efe42d08b31cdd8
+set VERSION_qgis=ebd4cd8c138574f0c6d6ea7911cc89abc6ad587a
 set URL_qgis=https://github.com/qgis/QGIS/archive/%VERSION_qgis%.tar.gz
 set BUILD_qgis=%BUILD_PATH%\qgis
 set REPO_qgis=%REPO_PATH%\qgis
@@ -24,6 +24,7 @@ cmake -G %CMAKE_GENERATOR% ^
 -DWITH_INTERNAL_SPATIALITE=OFF ^
 -DWITH_ANALYSIS=OFF ^
 -DWITH_GRASS=OFF ^
+-DWITH_GEOREFERENCER=OFF ^
 -DCMAKE_DISABLE_FIND_PACKAGE_QtQmlTools=TRUE ^
 -DWITH_QTMOBILITY=OFF ^
 -DWITH_QUICK=ON ^