Merge branch 'stable' into stable-android

scripts/desktop/build-lib-linux.sh

@@ -29,6 +29,11 @@ cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN' --ghc-optio
 cd $BUILD_DIR/build
 #patchelf --add-needed libHSrts_thr-ghc${GHC_VERSION}.so libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
 #patchelf --add-rpath '$ORIGIN' libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
+
+# GitHub's Ubuntu 20.04 runner started to set libffi.so.7 as a dependency while Ubuntu 20.04 on user's devices may not have it
+# but libffi.so.8 is shipped as an external library with other libs
+patchelf --replace-needed "libffi.so.7" "libffi.so.8" libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
+
 mkdir deps 2> /dev/null || true
 ldd libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so | grep "ghc" | cut -d' ' -f 3 | xargs -I {} cp {} ./deps/
 

scripts/desktop/make-appimage-linux.sh

@@ -40,6 +40,10 @@ if [ ! -f ../appimagetool-x86_64.AppImage ]; then
     wget --secure-protocol=TLSv1_3 https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -O ../appimagetool-x86_64.AppImage
     chmod +x ../appimagetool-x86_64.AppImage
 fi
-../appimagetool-x86_64.AppImage .
+if [ ! -f ../runtime-fuse3-x86_64 ]; then
+    wget --secure-protocol=TLSv1_3 https://github.com/AppImage/type2-runtime/releases/download/old/runtime-fuse3-x86_64 -O ../runtime-fuse3-x86_64
+    chmod +x ../runtime-fuse3-x86_64
+fi
+../appimagetool-x86_64.AppImage --runtime-file ../runtime-fuse3-x86_64 .
 
 mv *imple*.AppImage ../../

scripts/desktop/prepare-openssl-windows.sh

@@ -12,7 +12,7 @@ cd $root_dir
 if [ ! -f dist-newstyle/openssl-1.1.1w/libcrypto-1_1-x64.dll ]; then
     mkdir dist-newstyle 2>/dev/null || true
     cd dist-newstyle
-    curl --tlsv1.2 https://www.openssl.org/source/openssl-1.1.1w.tar.gz -o openssl.tar.gz
+    curl --tlsv1.2 https://www.openssl.org/source/openssl-1.1.1w.tar.gz -L -o openssl.tar.gz
     $WINDIR\\System32\\tar.exe -xvzf openssl.tar.gz
     cd openssl-1.1.1w
     ./Configure mingw64