qt65 (#91)

qt 6.5.0; geodiff 2.0.2; qgis 3.28.5

.github/workflows/android.yml

@@ -15,14 +15,14 @@ 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' }}
 

.github/workflows/ios.yml

@@ -15,9 +15,9 @@ 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
+      CACHE_VERSION: 0
       XC_VERSION: ${{ '14.2' }}
 
     steps:

.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:

.github/workflows/mac.yml

@@ -15,9 +15,9 @@ 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' }}
 

.github/workflows/win.yml

@@ -20,15 +20,15 @@ jobs:
     runs-on: windows-2019
 
     env:
-      QT_VERSION: '6.4.2'
+      QT_VERSION: '6.5.0'
       CACHE_VERSION: 0
       ARCH: "win64"
       TRIPLET: "x64-windows"
       VS_VERSION: "2019"
       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:

android/config.conf.default

@@ -1,17 +1,18 @@
 export ROOT_OUT_PATH=<where you want build SDK>
 
 ### 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

android/distribute.sh

@@ -36,6 +36,13 @@ if [ "X$PYTHON" == "X" ]; then
     exit 1
 fi
 
+# Check patchelf is present
+PATCHELF="$(which patchelf)"
+if [ "X$PATCHELF" == "X" ]; then
+    error "Unable to find patchelf"
+    exit 1
+fi
+
 # Paths
 ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import os,sys;print(os.path.realpath(sys.argv[1]))' $0))"
 STAGE_PATH="${ROOT_OUT_PATH}/stage/$ARCH"
@@ -251,10 +258,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 +277,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 +309,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"
 

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
 }
 

android/recipes/openssl/recipe.sh

@@ -15,9 +15,11 @@ function prebuild_openssl() {
 
 function shouldbuild_openssl() {
   # If lib is newer than the sourcecode skip build
-  if [ $STAGE_PATH/lib/libssl.so -nt $BUILD_openssl/.patched ]; then
+  if [ $STAGE_PATH/lib/libssl_3.so -nt $BUILD_openssl/.patched ]; then
     DO_BUILD=0
   fi
+
+  DO_BUILD=1
 }
 
 # function called to build the source code
@@ -44,17 +46,30 @@ function build_openssl() {
 
   try $BUILD_openssl/Configure shared ${SSL_ARCH} -D__ANDROID_API__=$ANDROIDAPI --prefix=/
   ${MAKE} depend
-  ${MAKE} DESTDIR=${STAGE_PATH} SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs
+  ${MAKE} DESTDIR=${STAGE_PATH} SHLIB_VERSION_NUMBER= build_libs
 
   # install
-  try ${MAKE} SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so DESTDIR=$STAGE_PATH install_dev install_engines
+  try ${MAKE} SHLIB_VERSION_NUMBER= DESTDIR=$STAGE_PATH install_dev
+
+  cd $STAGE_PATH/lib
+  rm libcrypto.a
+  rm libssl.a
+
+
+  mv libcrypto.so libcrypto_3.so
+  try patchelf --set-soname libcrypto_3.so libcrypto_3.so
+
+  mv libssl.so libssl_3.so
+  try patchelf --set-soname libssl_3.so libssl_3.so
+
+  try patchelf --replace-needed libcrypto.so libcrypto_3.so libssl_3.so
 
   pop_arm
 }
 
 # function called after all the compile have been done
 function postbuild_openssl() {
-    if [ ! -f ${STAGE_PATH}/lib/libssl.so ]; then
+    if [ ! -f ${STAGE_PATH}/lib/libssl_3.so ]; then
         error "Library was not successfully build for ${ARCH}"
         exit 1;
     fi

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;

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
 }
 

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
 

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
 }
 

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;

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
 }
 

ios/tools/depsort.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python3
 
 import argparse
 import sys

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;

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
 }
 

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
 

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

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;

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
 }
 

mac/tools/depsort.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python3
 
 import argparse
 import sys

vcpkg-overlay/ports/geodiff/portfile.cmake

@@ -1,6 +1,6 @@
 # Be sure to update both of these versions together.
-set(GEODIFF_VERSION 1.0.6)
-set(GEODIFF_HASH e91c189fd14434cb8b1975de52f986e54495a4cebde27c53ec5b4fef78ff880df3b329705b50a39ffec3c60bae62967e235fd8f60ed41d8505191184d02cae8f)
+set(GEODIFF_VERSION 2.0.2)
+set(GEODIFF_HASH 290f10ec1a0d419d13996e915d02b7d226f23359c2745a72a1a286d439bed3afdf536d5bb8771c3d4fb3df2d56ac5c0d4c7f178ee31493f4bf02d597c8b9a878)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH