From 3cd817a483ae52cb1aef2282f8c89a385f842567 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 20 Aug 2020 16:36:28 +0200
Subject: [PATCH 1/6] Bump Qt to 5.15.1

---
 qt_version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt_version.txt b/qt_version.txt
index 222951c..2a28965 100644
--- a/qt_version.txt
+++ b/qt_version.txt
@@ -1 +1 @@
-5.14.2
+5.15.1

From 9fcfc451d97982b171b624b566b0615e5720a20f Mon Sep 17 00:00:00 2001
From: signedav <david@opengis.ch>
Date: Fri, 11 Dec 2020 08:51:30 +0100
Subject: [PATCH 2/6] set latest version 5.15.2

---
 qt_version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt_version.txt b/qt_version.txt
index 2a28965..f486c6c 100644
--- a/qt_version.txt
+++ b/qt_version.txt
@@ -1 +1 @@
-5.15.1
+5.15.2

From 7aee0756b2257910bbe1b8523d15fa825dd050c2 Mon Sep 17 00:00:00 2001
From: signedav <david@opengis.ch>
Date: Fri, 11 Dec 2020 08:53:20 +0100
Subject: [PATCH 3/6] for qtbluetooth functionalities

---
 .docker/qt-ndk/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/qt-ndk/Dockerfile b/.docker/qt-ndk/Dockerfile
index 2281c22..9f92f88 100644
--- a/.docker/qt-ndk/Dockerfile
+++ b/.docker/qt-ndk/Dockerfile
@@ -83,6 +83,7 @@ RUN /tmp/qt/install-qt.sh --version ${QT_VERSION} --target android --directory "
       qttools \
       qtsvg \
       qtwebview \
+      qtconnectivity \
       qtcharts
 
 # Download & unpack android SDK

From 2734fd275d0503325cc04d2690fb9e320cb633d9 Mon Sep 17 00:00:00 2001
From: signedav <david@opengis.ch>
Date: Mon, 14 Dec 2020 08:58:21 +0100
Subject: [PATCH 4/6] update QGIS master to
 df28e637cdddc0c6e93355a9f98ad2d12d9e6acc

---
 recipes/qgis/recipe.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/qgis/recipe.sh b/recipes/qgis/recipe.sh
index f691c3e..eae9ea0 100755
--- a/recipes/qgis/recipe.sh
+++ b/recipes/qgis/recipe.sh
@@ -8,10 +8,10 @@ DEPS_qgis=(zlib gdal qca libspatialite libspatialindex expat gsl postgresql libz
 # DEPS_qgis=()
 
 # url of the package
-URL_qgis=https://github.com/qgis/QGIS/archive/43b64b13f38cd032778591f28d426dd5261fe078.tar.gz
+URL_qgis=https://github.com/qgis/QGIS/archive/df28e637cdddc0c6e93355a9f98ad2d12d9e6acc.tar.gz
 
 # md5 of the package
-MD5_qgis=4917f14aeda73aed420e51221da84bf2
+MD5_qgis=21f1d8d6e5ccae77ba1baa323155e1d4
 
 # default build path
 BUILD_qgis=$BUILD_PATH/qgis/$(get_directory $URL_qgis)

From 09c866408639c883113625b2f4452e5c43b1b1c4 Mon Sep 17 00:00:00 2001
From: signedav <david@opengis.ch>
Date: Mon, 14 Dec 2020 10:49:57 +0100
Subject: [PATCH 5/6] add libzstd to installs

---
 .docker/qgis-linux/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/qgis-linux/Dockerfile b/.docker/qgis-linux/Dockerfile
index cb3fa01..64fe59c 100644
--- a/.docker/qgis-linux/Dockerfile
+++ b/.docker/qgis-linux/Dockerfile
@@ -28,6 +28,7 @@ RUN dnf -y install \
     libspatialite-devel \
     protobuf-lite-devel \
     libpq-devel \
+    libzstd-devel \
     qt5-qtwebview-devel
 
 

From b4502290b2e7a609b18088bd75cfd73f1f2e297e Mon Sep 17 00:00:00 2001
From: signedav <david@opengis.ch>
Date: Mon, 14 Dec 2020 16:14:11 +0100
Subject: [PATCH 6/6] add libzstd

---
 recipes/libzstd/recipe.sh | 59 +++++++++++++++++++++++++++++++++++++++
 recipes/qgis/recipe.sh    |  2 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 recipes/libzstd/recipe.sh

diff --git a/recipes/libzstd/recipe.sh b/recipes/libzstd/recipe.sh
new file mode 100644
index 0000000..8ce4831
--- /dev/null
+++ b/recipes/libzstd/recipe.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# version of your package
+VERSION_libzstd=v1.4.5
+
+# dependencies of this recipe
+DEPS_libzstd=()
+
+# url of the package
+URL_libzstd=https://github.com/facebook/zstd/archive/${VERSION_libzstd}.zip
+
+# md5 of the package
+MD5_libzstd=beb47f4f92ef69d28400be661cf95c20
+
+# default build path
+BUILD_libzstd=$BUILD_PATH/libzstd/$(get_directory $URL_libzstd)
+
+# default recipe path
+RECIPE_libzstd=$RECIPES_PATH/libzstd
+
+# function called for preparing source code if needed
+# (you can apply patch etc here.)
+function prebuild_libzstd() {
+  cd $BUILD_libzstd
+
+  # check marker
+  if [ -f .patched ]; then
+    return
+  fi
+}
+
+function shouldbuild_libzstd() {
+  # If lib is newer than the sourcecode skip build
+  if [ $BUILD_PATH/libzstd/build-$ARCH/lib/libzstd.so -nt $BUILD_libzstd/.patched ]; then
+    DO_BUILD=0
+  fi
+}
+
+# function called to build the source code
+function build_libzstd() {
+  try mkdir -p $BUILD_PATH/libzstd/build-$ARCH
+  try cd $BUILD_PATH/libzstd/build-$ARCH
+  push_arm
+
+  # configure
+  try $CMAKECMD \
+  -DCMAKE_INSTALL_PREFIX:PATH=$STAGE_PATH \
+  $BUILD_libzstd/build/cmake/
+
+  # try $MAKESMP
+  try $MAKESMP install
+
+  pop_arm
+}
+
+# function called after all the compile have been done
+function postbuild_libzstd() {
+	true
+}
diff --git a/recipes/qgis/recipe.sh b/recipes/qgis/recipe.sh
index eae9ea0..ae6acac 100755
--- a/recipes/qgis/recipe.sh
+++ b/recipes/qgis/recipe.sh
@@ -4,7 +4,7 @@
 VERSION_qgis=3.13
 
 # dependencies of this recipe
-DEPS_qgis=(zlib gdal qca libspatialite libspatialindex expat gsl postgresql libzip qtkeychain exiv2 protobuf)
+DEPS_qgis=(zlib gdal qca libspatialite libspatialindex expat gsl postgresql libzip qtkeychain exiv2 protobuf libzstd)
 # DEPS_qgis=()
 
 # url of the package