Merge branch 'develop' into fix-lib-mangling

Author: ferdnyc

installer/build-mac-dmg.sh

@@ -91,17 +91,18 @@ while [ "$(( $(date +%s) - 3600 ))" -lt "$START" ]; do
     notarize_status="${BASH_REMATCH[1]}"
 
     if [ "$notarize_status" != "in progress" ] && [ "$notarize_status" != "" ]; then
-      echo "Notarization Status Found: $notarize_status"
-      break
+      echo "Notarization Status Found: $notarize_status. Wait for notarization to appear in --notarization-history/"
+      verify_output=$(xcrun altool --notarization-history 0 -u "[email protected]" -p "@keychain:NOTARIZE_AUTH" | grep "$REQUEST_UUID")
+      if [ "$verify_output" != "" ]; then
+        echo "Notarization record found, and ready for stapling!"
+        break
+      fi
     fi
 
     # Wait a few seconds
     sleep 60
 done
 
-echo "Check Notarization Progress... (list recent notarization records)"
-xcrun altool --notarization-history 0 -u "[email protected]" -p "@keychain:NOTARIZE_AUTH" | head -n 10
-
 echo "Staple Notarization Ticket to DMG"
 xcrun stapler staple "build/$OS_DMG_NAME"
 

src/classes/app.py

@@ -39,8 +39,12 @@
 from PyQt5.QtGui import QPalette, QColor, QFontDatabase, QFont
 from PyQt5.QtWidgets import QApplication, QStyleFactory, QMessageBox
 
-# QtWebEngineWidgets must be loaded prior to creating a QApplication
-from PyQt5.QtWebEngineWidgets import QWebEngineView
+try:
+    # QtWebEngineWidgets must be loaded prior to creating a QApplication
+    # But on systems with only WebKit, this will fail (and we ignore the failure)
+    from PyQt5.QtWebEngineWidgets import QWebEngineView
+except ImportError:
+    pass
 
 try:
     # Solution to solve QtWebEngineWidgets black screen caused by OpenGL not loaded