Merge branch 'NickHugi/master' into bleeding-edge

NickHugi · Mar 24, 2024 · c640039 · c640039
2 parents 99b19ea + 7bb8ebb
commit c640039
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/compile/deps_toolset.ps1 b/compile/deps_toolset.ps1
@@ -76,16 +76,14 @@ if ((Get-OS) -eq "Mac") {
     $qtOs = "mac"
     $qtArch = "clang_64" # i'm not even going to bother to test wasm_32.
     switch ($qtApi) {
-        "pyqt5"   { & bash -c "brew install qt5 -q" }
-        "pyqt6"   { & bash -c "brew install qt6 -q" }
-        "pyside2" { & bash -c "brew install qt5 -q" }  # PySide2 typically uses Qt5
-        "pyside6" { & bash -c "brew install qt6 -q" }
-        default   { & bash -c "brew install qt5 -q" }
+        "pyqt5"   { & bash -c "brew install qt@5 -q" }
+        "pyqt6"   { & bash -c "brew install qt@6 -q" }
+        "pyside2" { & bash -c "brew install qt@5 -q" }  # PySide2 typically uses Qt5
+        "pyside6" { & bash -c "brew install qt@6 -q" }
+        default   { & bash -c "brew install qt@5 -q" }
     }
     . $pythonExePath -m pip install $qtApi qtpy -U --prefer-binary
 
-    brew install --quiet --force qt@5
-
 } elseif ((Get-OS) -eq "Windows") {
     # Determine system architecture
     if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64" -or $env:PROCESSOR_ARCHITEW6432 -eq "AMD64") {
@@ -134,14 +132,16 @@ if ((Get-OS) -eq "Mac") {
     while ($attemptNum -le $maxAttempts) {
         # Attempt to update and install packages
         switch ($distro) {
+            # debian and ubuntu need libnsl in order to load DLGEditor, but the packages aren't found on some ubuntu systems?
             "debian" {  # untested
-                sudo apt-get update
-                sudo apt-get install libicu-dev libunwind-dev libnsl2 libnsl-dev libwebp-dev liblzma-dev libjpeg-dev libtiff-dev libquadmath0 libgfortran5 libopenblas-dev libxau-dev libxcb1-dev python3-opengl python3-pyqt5 libpulse-mainloop-glib0 libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly libgstreamer1.0-dev mesa-utils libgl1-mesa-glx libgl1-mesa-dri qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libgl1-mesa-glx libglu1-mesa libglu1-mesa-dev libqt5gui5 libqt5core5a libqt5dbus5 libqt5widgets5 -y
+                sudo apt-get update -y
+                sudo apt-get install libicu-dev libunwind-dev libwebp-dev liblzma-dev libjpeg-dev libtiff-dev libquadmath0 libgfortran5 libopenblas-dev libxau-dev libxcb1-dev python3-opengl python3-pyqt5 libpulse-mainloop-glib0 libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly libgstreamer1.0-dev mesa-utils libgl1-mesa-glx libgl1-mesa-dri qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libgl1-mesa-glx libglu1-mesa libglu1-mesa-dev libqt5gui5 libqt5core5a libqt5dbus5 libqt5widgets5 -y
                 break
             }
             "ubuntu" {  # export LIBGL_ALWAYS_SOFTWARE=1
-                sudo apt-get update
-                sudo apt-get install libicu-dev libunwind-dev libnsl2 libnsl-dev libwebp-dev liblzma-dev libjpeg-dev libtiff-dev libquadmath0 libgfortran5 libopenblas-dev libxau-dev libxcb1-dev python3-opengl python3-pyqt5 libpulse-mainloop-glib0 libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly libgstreamer1.0-dev mesa-utils libgl1-mesa-glx libgl1-mesa-dri qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libgl1-mesa-glx libglu1-mesa libglu1-mesa-dev libqt5gui5 libqt5core5a libqt5dbus5 libqt5widgets5 --fix-missing -y
+                sudo apt-get update -y
+                sudo apt-get upgrade -y
+                sudo apt-get install libicu-dev libunwind-dev libwebp-dev liblzma-dev libjpeg-dev libtiff-dev libquadmath0 libgfortran5 libopenblas-dev libxau-dev libxcb1-dev python3-opengl python3-pyqt5 libpulse-mainloop-glib0 libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly libgstreamer1.0-dev mesa-utils libgl1-mesa-glx libgl1-mesa-dri qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libgl1-mesa-glx libglu1-mesa libglu1-mesa-dev libqt5gui5 libqt5core5a libqt5dbus5 libqt5widgets5 --fix-missing -y
                 break
             }
             "fedora" {