diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e7f3383f..605507c2 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,16 +15,16 @@ jobs: android_build: runs-on: macos-12 env: - QT_VERSION: '6.4.2' + QT_VERSION: '6.5.0' ANDROIDAPI: 24 - NDK_VERSION: r23 - NDK_VERSION_FULL: r23b + NDK_VERSION: r25b + NDK_VERSION_FULL: r25b JDK_VERSION: 11 SDK_PLATFORM: android-31 SDK_BUILD_TOOLS: 31.0.0 - CACHE_VERSION: 1 + CACHE_VERSION: 0 ARCHES: "armeabi-v7a arm64-v8a" - XC_VERSION: ${{ '14.2' }} + XC_VERSION: ${{ '14.3' }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index cf4f5eba..4bada1ed 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -15,10 +15,10 @@ jobs: runs-on: macos-12 env: IOS_MIN_SDK_VERSION: '14.0' # iOS Deployment target - QT_VERSION: '6.4.2' + QT_VERSION: '6.5.0' ARCHES: 'arm64' - CACHE_VERSION: 1 - XC_VERSION: ${{ '14.2' }} + CACHE_VERSION: 0 + XC_VERSION: ${{ '14.3' }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c6079f09..1ca6031f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,7 +17,7 @@ jobs: env: ARCH: 'linux-x86_64' UBUNTU_VERSION: 2204 - QT_VERSION: '6.4.2' + QT_VERSION: '6.5.0' CACHE_VERSION: 0 steps: diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 52dfb6ff..be833ea4 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -15,11 +15,11 @@ jobs: runs-on: macos-12 if: github.repository == 'merginmaps/input-sdk' env: - QT_VERSION: 6.4.2 + QT_VERSION: 6.5.0 ARCHES: 'mac' - CACHE_VERSION: 1 + CACHE_VERSION: 0 MACOSX_DEPLOYMENT_TARGET: 10.15.0 - XC_VERSION: ${{ '14.2' }} + XC_VERSION: ${{ '14.3' }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 82ad8f8b..81957afd 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -20,7 +20,7 @@ jobs: runs-on: windows-2019 env: - QT_VERSION: '6.4.2' + QT_VERSION: '6.5.0' CACHE_VERSION: 0 ARCH: "win64" TRIPLET: "x64-windows" @@ -28,7 +28,7 @@ jobs: CMAKE_GENERATOR: "Visual Studio 16 2019" # see https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md CMAKE_ARCH: "x64" QT_ARCH: "win64_msvc2019_64" # run: aqt list $QT_VERSION windows desktop - VCPKG_BASELINE: "a291bcad8093f9f17988fe66543aefd674812f0e" # compatible with vcpkg.json baseline + VCPKG_BASELINE: "203383666e2422ed31e1faebe6efa6e306bd126d" # compatible with vcpkg.json baseline VCPKG_ROOT: "C:/vcpkg-root" # Looks like there is more space on C: than on D: drive (~14GB) steps: diff --git a/android/config.conf.default b/android/config.conf.default index ae19d80e..7f54a68b 100644 --- a/android/config.conf.default +++ b/android/config.conf.default @@ -1,17 +1,18 @@ export ROOT_OUT_PATH= ### Currently suggested versions #### -export ANDROIDNDKVER=r23 +# should be downloaded from https://dl.google.com/android/repository/android-ndk-r25b-darwin.zip +export ANDROIDNDKVER=r25 export ANDROIDAPI=24 # == CMake's ANDROID_NATIVE_API_LEVEL == gradle's minSdkVersion == Dockerfile ANDROID_NDK_PLATFORM #### PATHS #### export ANDROIDSDK="/path/to/android-sdk" export ANDROIDNDK="/path/to/android-ndk" -export QT_ANDROID_BASE="/path/to/qt/sdk/Qt/6.4.0" +export QT_ANDROID_BASE="/path/to/qt/sdk/Qt/6.5.0" # For example: # export ANDROIDSDK="/opt/android/sdk" -# export ANDROIDNDK="/opt/android-ndk-r23/" +# export ANDROIDNDK="/opt/android-ndk-r25b/" # QGIS needs a bison 3. On MacOS you may need # to install one with e.g. homebrew or qgis_deps diff --git a/android/distribute.sh b/android/distribute.sh index 927386ab..1fd7142a 100755 --- a/android/distribute.sh +++ b/android/distribute.sh @@ -251,10 +251,10 @@ function push_arm() { exit 1 fi - if [ ! -d "$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" ]; then - echo "Error: $ANDROIDNDK error 1." - exit 1 - fi + # if [ ! -d "$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" ]; then + # echo "Error: $ANDROIDNDK error 1." + # exit 1 + # fi if [ ! -d "$ANDROIDNDK/toolchains/llvm/prebuilt/$PYPLATFORM-x86_64/sysroot/usr/lib/$TOOLCHAIN_BASEDIR/$ANDROIDAPI" ]; then echo "Error: $ANDROIDNDK error 2." @@ -270,16 +270,16 @@ function push_arm() { echo "Error: $ANDROIDNDK error 4." exit 1 fi - + export CFLAGS="-DANDROID -fomit-frame-pointer -I$STAGE_PATH/include" export CFLAGS="$CFLAGS -Wno-unused-command-line-argument -Wno-macro-redefined" - export CFLAGS="$CFLAGS -L$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" + # export CFLAGS="$CFLAGS -L$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" export CFLAGS="$CFLAGS -U__ANDROID_MIN_SDK_VERSION__" export CFLAGS="$CFLAGS -D__ANDROID_MIN_SDK_VERSION__=$ANDROIDAPI" export CFLAGS="$CFLAGS -U__ANDROID_API_" export CFLAGS="$CFLAGS -D__ANDROID_API__=$ANDROIDAPI" export LDFLAGS="-lm -L$STAGE_PATH/lib" - export LDFLAGS="$LDFLAGS -L$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" + # export LDFLAGS="$LDFLAGS -L$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" export LDFLAGS="$LDFLAGS -L$ANDROIDNDK/toolchains/llvm/prebuilt/$PYPLATFORM-x86_64/sysroot/usr/lib/$TOOLCHAIN_BASEDIR/$ANDROIDAPI" if [ "X${ARCH}" == "Xarmeabi-v7a" ]; then @@ -302,7 +302,8 @@ function push_arm() { ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/toolchains/llvm/prebuilt/$PYPLATFORM-x86_64/sysroot/usr/lib/$TOOLCHAIN_BASEDIR/$ANDROIDAPI" # folder with libc++_shared.so - ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" + # ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" + # keep in sync with CMake's -DANDROID_STL=c++_shared export LDFLAGS="$LDFLAGS -Wl,-lc++_shared" diff --git a/android/recipes/libtasn1/recipe.sh b/android/recipes/libtasn1/recipe.sh index 179e7e66..f37777c1 100755 --- a/android/recipes/libtasn1/recipe.sh +++ b/android/recipes/libtasn1/recipe.sh @@ -38,17 +38,18 @@ function shouldbuild_libtasn1() { function build_libtasn1() { push_arm - export CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration" - - try cd $BUILD_libtasn1 - try $MAKE autoreconf - try mkdir -p $BUILD_PATH/libtasn1/build-$ARCH try cd $BUILD_PATH/libtasn1/build-$ARCH - - try $BUILD_libtasn1/configure --disable-doc --disable-valgrind-tests --prefix=$STAGE_PATH --host=${TOOLCHAIN_PREFIX} --disable-shared + + export CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration" + + try $BUILD_libtasn1/configure --disable-doc --disable-valgrind-tests --prefix=$STAGE_PATH \ + --host=$TOOLCHAIN_PREFIX \ + --build=x86_64 \ + --disable-shared --disable-gcc-warnings --disable-silent-rules + try $MAKESMP install - + pop_arm } diff --git a/android/recipes/qgis/patches/geonode.patch b/android/recipes/qgis/patches/geonode.patch new file mode 100644 index 00000000..ea35c027 --- /dev/null +++ b/android/recipes/qgis/patches/geonode.patch @@ -0,0 +1,11 @@ +--- a/src/core/geocms/geonode/qgsgeonoderequest.cpp ++++ b/src/core/geocms/geonode/qgsgeonoderequest.cpp +@@ -426,7 +426,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( cons + return geoNodeStyle; + } + +- success = geoNodeStyle.body.setContent( this->lastResponse() ); ++ success = bool(geoNodeStyle.body.setContent( this->lastResponse() )); + if ( !success ) + { + return geoNodeStyle; diff --git a/android/recipes/qgis/recipe.sh b/android/recipes/qgis/recipe.sh index cf4fd842..846d069b 100755 --- a/android/recipes/qgis/recipe.sh +++ b/android/recipes/qgis/recipe.sh @@ -21,6 +21,9 @@ function prebuild_qgis() { # remove when https://github.com/qgis/QGIS/pull/50866 is merged try patch -p1 < $RECIPE_qgis/patches/qt640.patch + # remove when using qgis 3.30+ + try patch -p1 < $RECIPE_qgis/patches/geonode.patch + touch .patched } diff --git a/aqtinstall.log b/aqtinstall.log deleted file mode 100644 index e69de29b..00000000 diff --git a/ios/config.conf.default b/ios/config.conf.default index 72e5a459..46d1f314 100644 --- a/ios/config.conf.default +++ b/ios/config.conf.default @@ -1,4 +1,4 @@ -export QT_VERSION=6.3.2 +export QT_VERSION=6.5.0 export ROOT_OUT_PATH=/opt/INPUT/input-sdk-ios-DEV diff --git a/ios/recipes/libtasn1/recipe.sh b/ios/recipes/libtasn1/recipe.sh old mode 100644 new mode 100755 index 179e7e66..f60e16b7 --- a/ios/recipes/libtasn1/recipe.sh +++ b/ios/recipes/libtasn1/recipe.sh @@ -38,17 +38,14 @@ function shouldbuild_libtasn1() { function build_libtasn1() { push_arm - export CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration" - - try cd $BUILD_libtasn1 - try $MAKE autoreconf - try mkdir -p $BUILD_PATH/libtasn1/build-$ARCH try cd $BUILD_PATH/libtasn1/build-$ARCH - - try $BUILD_libtasn1/configure --disable-doc --disable-valgrind-tests --prefix=$STAGE_PATH --host=${TOOLCHAIN_PREFIX} --disable-shared + + export CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration" + + try $BUILD_libtasn1/configure --disable-doc --disable-valgrind-tests --prefix=$STAGE_PATH --host=${TOOLCHAIN_PREFIX} --disable-shared --disable-gcc-warnings --disable-silent-rules try $MAKESMP install - + pop_arm } diff --git a/ios/recipes/qgis/patches/geonode.patch b/ios/recipes/qgis/patches/geonode.patch new file mode 100644 index 00000000..ea35c027 --- /dev/null +++ b/ios/recipes/qgis/patches/geonode.patch @@ -0,0 +1,11 @@ +--- a/src/core/geocms/geonode/qgsgeonoderequest.cpp ++++ b/src/core/geocms/geonode/qgsgeonoderequest.cpp +@@ -426,7 +426,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( cons + return geoNodeStyle; + } + +- success = geoNodeStyle.body.setContent( this->lastResponse() ); ++ success = bool(geoNodeStyle.body.setContent( this->lastResponse() )); + if ( !success ) + { + return geoNodeStyle; diff --git a/ios/recipes/qgis/recipe.sh b/ios/recipes/qgis/recipe.sh index 8a2386da..5626a340 100755 --- a/ios/recipes/qgis/recipe.sh +++ b/ios/recipes/qgis/recipe.sh @@ -23,6 +23,9 @@ function prebuild_qgis() { # remove when https://github.com/qgis/QGIS/pull/50866 is merged try patch -p1 < $RECIPE_qgis/patches/qt640.patch + # remove when using qgis 3.30+ + try patch -p1 < $RECIPE_qgis/patches/geonode.patch + touch .patched } diff --git a/linux/recipes/qgis/patches/geonode.patch b/linux/recipes/qgis/patches/geonode.patch new file mode 100644 index 00000000..ea35c027 --- /dev/null +++ b/linux/recipes/qgis/patches/geonode.patch @@ -0,0 +1,11 @@ +--- a/src/core/geocms/geonode/qgsgeonoderequest.cpp ++++ b/src/core/geocms/geonode/qgsgeonoderequest.cpp +@@ -426,7 +426,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( cons + return geoNodeStyle; + } + +- success = geoNodeStyle.body.setContent( this->lastResponse() ); ++ success = bool(geoNodeStyle.body.setContent( this->lastResponse() )); + if ( !success ) + { + return geoNodeStyle; diff --git a/linux/recipes/qgis/recipe.sh b/linux/recipes/qgis/recipe.sh index 54ced7a6..4b1baf00 100755 --- a/linux/recipes/qgis/recipe.sh +++ b/linux/recipes/qgis/recipe.sh @@ -23,6 +23,9 @@ function prebuild_qgis() { # remove when https://github.com/qgis/QGIS/pull/50866 is merged try patch -p1 < $RECIPE_qgis/patches/qt640.patch + # remove when using qgis 3.30+ + try patch -p1 < $RECIPE_qgis/patches/geonode.patch + touch .patched } diff --git a/mac/config.conf.default b/mac/config.conf.default index 02e06a90..f34a0e60 100644 --- a/mac/config.conf.default +++ b/mac/config.conf.default @@ -1,5 +1,5 @@ #### PATHS #### -export QT_VER="6.4.0" +export QT_VER="6.5.0" export MACOSX_DEPLOYMENT_TARGET=10.15.0 export ROOT_OUT_PATH=/Users/$USER/Projects/input-sdk/build/macos diff --git a/mac/recipes/libtasn1/recipe.sh b/mac/recipes/libtasn1/recipe.sh index cb529b2b..afb57de6 100755 --- a/mac/recipes/libtasn1/recipe.sh +++ b/mac/recipes/libtasn1/recipe.sh @@ -37,18 +37,13 @@ function shouldbuild_libtasn1() { # function called to build the source code function build_libtasn1() { push_env - - export CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration" - - try cd $BUILD_libtasn1 - try $MAKE autoreconf - - patch_configure_file configure try mkdir -p $BUILD_PATH/libtasn1/build-$ARCH try cd $BUILD_PATH/libtasn1/build-$ARCH - - try $BUILD_libtasn1/configure --disable-doc --disable-valgrind-tests --prefix=$STAGE_PATH --disable-shared + + export CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration" + + try $BUILD_libtasn1/configure --disable-doc --disable-valgrind-tests --prefix=$STAGE_PATH --disable-shared --disable-gcc-warnings --disable-silent-rules try $MAKESMP install pop_env diff --git a/mac/recipes/qgis/patches/geonode.patch b/mac/recipes/qgis/patches/geonode.patch new file mode 100644 index 00000000..ea35c027 --- /dev/null +++ b/mac/recipes/qgis/patches/geonode.patch @@ -0,0 +1,11 @@ +--- a/src/core/geocms/geonode/qgsgeonoderequest.cpp ++++ b/src/core/geocms/geonode/qgsgeonoderequest.cpp +@@ -426,7 +426,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( cons + return geoNodeStyle; + } + +- success = geoNodeStyle.body.setContent( this->lastResponse() ); ++ success = bool(geoNodeStyle.body.setContent( this->lastResponse() )); + if ( !success ) + { + return geoNodeStyle; diff --git a/mac/recipes/qgis/recipe.sh b/mac/recipes/qgis/recipe.sh index 866ee3d1..87ac65ac 100755 --- a/mac/recipes/qgis/recipe.sh +++ b/mac/recipes/qgis/recipe.sh @@ -23,6 +23,9 @@ function prebuild_qgis() { # remove when https://github.com/qgis/QGIS/pull/50866 is merged try patch -p1 < $RECIPE_qgis/patches/qt640.patch + # remove when using qgis 3.30+ + try patch -p1 < $RECIPE_qgis/patches/geonode.patch + touch .patched } diff --git a/mac/tools/depsort.py b/mac/tools/depsort.py index 5149d280..413b2e05 100755 --- a/mac/tools/depsort.py +++ b/mac/tools/depsort.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python2 +#! /usr/bin/env python3 import argparse import sys diff --git a/vcpkg-overlay/ports/geodiff/portfile.cmake b/vcpkg-overlay/ports/geodiff/portfile.cmake index 176a2df8..64a7de38 100644 --- a/vcpkg-overlay/ports/geodiff/portfile.cmake +++ b/vcpkg-overlay/ports/geodiff/portfile.cmake @@ -1,5 +1,5 @@ # Be sure to update both of these versions together. -set(GEODIFF_VERSION 1.0.6) +set(GEODIFF_VERSION 2.0.2) set(GEODIFF_HASH e91c189fd14434cb8b1975de52f986e54495a4cebde27c53ec5b4fef78ff880df3b329705b50a39ffec3c60bae62967e235fd8f60ed41d8505191184d02cae8f) vcpkg_from_github( diff --git a/vcpkg-overlay/ports/geodiff/vcpkg.json b/vcpkg-overlay/ports/geodiff/vcpkg.json index 065b4409..982383bf 100644 --- a/vcpkg-overlay/ports/geodiff/vcpkg.json +++ b/vcpkg-overlay/ports/geodiff/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geodiff", - "version": "1.0.6", + "version": "2.0.2", "port-version": 0, "description": "Library for handling diffs for geospatial data", "homepage": "https://github.com/MerginMaps/geodiff", diff --git a/vcpkg-overlay/ports/qgis-qt6/geonode.patch b/vcpkg-overlay/ports/qgis-qt6/geonode.patch new file mode 100644 index 00000000..ea35c027 --- /dev/null +++ b/vcpkg-overlay/ports/qgis-qt6/geonode.patch @@ -0,0 +1,11 @@ +--- a/src/core/geocms/geonode/qgsgeonoderequest.cpp ++++ b/src/core/geocms/geonode/qgsgeonoderequest.cpp +@@ -426,7 +426,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( cons + return geoNodeStyle; + } + +- success = geoNodeStyle.body.setContent( this->lastResponse() ); ++ success = bool(geoNodeStyle.body.setContent( this->lastResponse() )); + if ( !success ) + { + return geoNodeStyle; diff --git a/vcpkg-overlay/ports/qgis-qt6/portfile.cmake b/vcpkg-overlay/ports/qgis-qt6/portfile.cmake index 1f02aa3d..6f92b9e0 100644 --- a/vcpkg-overlay/ports/qgis-qt6/portfile.cmake +++ b/vcpkg-overlay/ports/qgis-qt6/portfile.cmake @@ -1,4 +1,4 @@ -set(QGIS_REF final-3_28_0) +set(QGIS_REF final-3_28_5) set(QGIS_SHA512 35579ec2122059be7ec9fad7742e8e94f2bc646071cc5a5db9ba584cb44ee8784d5bbc8cf7225fda80c647c093ad06667b6388846fdd4eab01ffc14e7a0a08b3) vcpkg_from_github( @@ -14,6 +14,7 @@ vcpkg_from_github( crssync.patch bigobj.patch qt640.patch + geonode.patch ) file(REMOVE ${SOURCE_PATH}/cmake/FindQtKeychain.cmake) diff --git a/vcpkg-overlay/ports/qt6/vcpkg.json b/vcpkg-overlay/ports/qt6/vcpkg.json index d6e16031..83e0063e 100644 --- a/vcpkg-overlay/ports/qt6/vcpkg.json +++ b/vcpkg-overlay/ports/qt6/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt6", - "version-string": "6.4.2", + "version-string": "6.5.0", "description": "Qt6 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/" } \ No newline at end of file diff --git a/vcpkg-test/vcpkg.json b/vcpkg-test/vcpkg.json index 453fbc71..86126050 100644 --- a/vcpkg-test/vcpkg.json +++ b/vcpkg-test/vcpkg.json @@ -1,6 +1,6 @@ { "name": "input-sdk-vcpkg-test", - "version": "1.0.1", + "version": "1.0.2", "dependencies": [ { "name": "sqlite3", @@ -118,7 +118,7 @@ "features": [] } ], - "builtin-baseline": "a291bcad8093f9f17988fe66543aefd674812f0e", + "builtin-baseline": "203383666e2422ed31e1faebe6efa6e306bd126d", "overrides": [ { "name": "tiff", @@ -146,7 +146,7 @@ }, { "name": "geodiff", - "version": "1.0.6" + "version": "2.0.2" }, { "name": "libiconv", @@ -190,7 +190,7 @@ }, { "name": "qgis-qt6", - "version": "3.28.0#1" + "version": "3.28.5" }, { "name": "qtkeychain-qt6", @@ -202,7 +202,7 @@ }, { "name": "qt6", - "version": "6.4.2" + "version": "6.5.0" }, { "name": "libpng", diff --git a/versions.conf b/versions.conf index e2725ba9..07e2f1f7 100644 --- a/versions.conf +++ b/versions.conf @@ -18,9 +18,9 @@ export VERSION_gdal=3.5.1 export URL_gdal=http://download.osgeo.org/gdal/$VERSION_gdal/gdal-${VERSION_gdal}.tar.gz export MD5_gdal=90ec67df8648e36795937c07406815ea -export VERSION_geodiff=1.0.6 +export VERSION_geodiff=2.0.2 export URL_geodiff=https://github.com/merginmaps/geodiff/archive/${VERSION_geodiff}.tar.gz -export MD5_geodiff=8f6408b19f9a8d4b6f636b2302bbac22 +export MD5_geodiff=9a56a1c8391f8f5c133efe3f9e92539c # NOTE: if changed, update also qgis's recipe export VERSION_geos=3.9.1 @@ -45,9 +45,9 @@ export VERSION_libspatialite=5.0.1 export URL_libspatialite=http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${VERSION_libspatialite}.tar.gz export MD5_libspatialite=5f4a961afbb95dcdc715b5d7f8590573 -export VERSION_libtasn1=4.13 -export URL_libtasn1=https://gitlab.com/gnutls/libtasn1/-/archive/libtasn1_4_13/libtasn1-libtasn1_4_13.tar.gz -export MD5_libtasn1=349a320d12721227e29a9122bdaddea9 +export VERSION_libtasn1=4.19.0 +export URL_libtasn1=https://ftp.gnu.org/pub/gnu/libtasn1/libtasn1-${VERSION_libtasn1}.tar.gz +export MD5_libtasn1=f701ab57eb8e7d9c105b2cd5d809b29a export VERSION_libzip=1-5-2 export URL_libzip=https://github.com/nih-at/libzip/archive/rel-${VERSION_libzip}.zip @@ -57,11 +57,11 @@ export VERSION_qca=2.3.5 export URL_qca=https://github.com/KDE/qca/archive/v${VERSION_qca}.tar.gz export MD5_qca=b33fed0aa484f37a64f6407e2a6eaa64 -export VERSION_qgis=3.28.0 +export VERSION_qgis=3.28.5 # Uncomment if you want to use some random commit from master # export URL_qgis=https://github.com/qgis/QGIS/archive/34227bdf1ce6ee14e394c833039065817648c403.tar.gz export URL_qgis=https://github.com/qgis/QGIS/archive/refs/tags/final-${VERSION_qgis//./_}.tar.gz -export MD5_qgis=7c1e47df0a65a6b90a4a0a858fcf866f +export MD5_qgis=3599115b9634192a90559bf96bec5020 export VERSION_qtkeychain=0.13.2 export URL_qtkeychain=https://github.com/frankosterfeld/qtkeychain/archive/v${VERSION_qtkeychain}.tar.gz @@ -109,10 +109,12 @@ export MD5_webp=7e047f2cbaf584dff7a8a7e0f8572f18 # iOS/macOS Apple's SecureTransport # OpenSSL 1.1.x has new API compared to 1.0.2 +# OpenSSL 3.x has new API compared to 1.1.x # We need to stick with the version of SSL that is # compatible with Qt's binaries, otherwise # you got (runtime) # "qt.network.ssl: QSslSocket::connectToHostEncrypted: TLS initialization failed" +# https://www.qt.io/blog/moving-to-openssl-3-in-binary-builds-starting-from-qt-6.5-beta-2 # https://blog.qt.io/blog/2019/06/17/qt-5-12-4-released-support-openssl-1-1-1/ # see https://wiki.qt.io/Qt_5.12_Tools_and_Versions # see https://wiki.qt.io/Qt_5.14.0_Known_Issues @@ -124,6 +126,8 @@ export MD5_webp=7e047f2cbaf584dff7a8a7e0f8572f18 # Qt 5.14.1 OpenSSL 1.1.1d # Qt 5.14.2 OpenSSL 1.1.1f # Qt 6.3.2 OpenSSL 1.1.1q -export VERSION_openssl=1.1.1q -export URL_openssl=https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_openssl//./_}.tar.gz -export MD5_openssl=b6d0ad0079f1730645ec34a4c2f9ae3e +# Qt 6.4.x OpenSSL 1.1.1q +# Qt 6.5.0 OpenSSL 3.0.7 +export VERSION_openssl=3.0.7 +export URL_openssl=https://github.com/openssl/openssl/releases/download/openssl-${VERSION_openssl}/openssl-${VERSION_openssl}.tar.gz +export MD5_openssl=545478ce41b96bf3beacb4dc58b36c77