Update QT and OpenSSL versions

Stay with QT 6.6.3 on Windows, because windeployqt does not deploy the gcc libs with QT 6.7.2
chris2511 · Aug 17, 2024 · c375436 · c375436
1 parent d298291
commit c375436
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/lib/test_asn1time.cpp b/lib/test_asn1time.cpp
@@ -54,13 +54,18 @@ void test_asn1time::output()
 
 #if !defined(Q_OS_WIN32)
 	a.setTimeZone(QTimeZone("UTC"));
-	QCOMPARE(a.toPretty(), "Monday, 25 November 2019 15:30:15 UTC");
+	#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+		#define UTC "GMT"
+	#else
+		#define UTC "UTC"
+	#endif
+	QCOMPARE(a.toPretty(), "Monday, 25 November 2019 15:30:15 " UTC);
 
 	a.setTimeZone(QTimeZone("Europe/Berlin"));
-	QCOMPARE(a.toPretty(), "Monday, 25 November 2019 14:30:15 UTC");
+	QCOMPARE(a.toPretty(), "Monday, 25 November 2019 14:30:15 " UTC);
 
 	a.setTimeZone(QTimeZone("UTC+07:00"));
-	QCOMPARE(a.toPretty(), "Monday, 25 November 2019 08:30:15 UTC");
+	QCOMPARE(a.toPretty(), "Monday, 25 November 2019 08:30:15 " UTC);
 #endif
 }
 

diff --git a/release/build-mac.sh b/release/build-mac.sh
@@ -5,7 +5,7 @@ do_openssl()
 {
   test -x $INSTALL_DIR/lib/libcrypto.dylib && return
 
-  test -f "$OSSL".tar.gz || curl -O https://www.openssl.org/source/"$OSSL".tar.gz
+  test -f "$OSSL".tar.gz || curl -L -O https://www.openssl.org/source/"$OSSL".tar.gz
   test -d "$OSSL" || tar zxf "$OSSL".tar.gz
   mkdir -p ${INSTALL_DIR}/lib
   for arch in x86_64 arm64; do
@@ -66,10 +66,10 @@ do_mysql()
 }
 
 OSSL_MAJOR="3"
-OSSL="openssl-3.1.5"
+OSSL="openssl-3.3.1"
 XCA_DIR="$(cd `dirname $0`/.. && pwd)"
 TOP_DIR="`dirname $XCA_DIR`"
-QT_DIR="$TOP_DIR/6.6.3/macos"
+QT_DIR="$TOP_DIR/6.7.2/macos"
 
 BUILDDIR="$TOP_DIR/osx-release-dmg"
 BUILDDIR_APPSTORE="$TOP_DIR/osx-release-appstore"

diff --git a/release/build-w64.sh b/release/build-w64.sh
@@ -5,24 +5,22 @@
 # Build xca on Windows 
 do_openssl() {
   test -f $INSTALL_DIR/bin/libcrypto-3-x64.dll && return
-  test -f "$OSSL".tar.gz || curl -O https://www.openssl.org/source/"$OSSL".tar.gz
+  test -f "$OSSL".tar.gz || curl -L -O https://www.openssl.org/source/"$OSSL".tar.gz
   test -d "$OSSL" || tar zxf "$OSSL".tar.gz
   cd "$OSSL"
   ./Configure mingw64 --prefix=$INSTALL_DIR --libdir=lib
   make -j4
   make install
 }
 
-OSSL="openssl-3.1.5"
+OSSL="openssl-3.3.1"
 XCA_DIR="$(cd `dirname $0`/.. && pwd)"
 TOP_DIR="`dirname $XCA_DIR`"
 QT_DIR="$TOP_DIR/QT/6.6.3/mingw_64"
 BUILDDIR="$TOP_DIR/w64-release"
 INSTALL_DIR="/c/OpenSSL"
 JOBS=7
 
-PATH="$TOP_DIR/QT/Tools/mingw1120_64/bin:$INSTALL_DIR/bin:$PATH"
-
 cd $TOP_DIR
 do_openssl