Merge pull request supercollider#5246 from supercollider/master

Merge master into develop
dyfer · Nov 15, 2020 · 7c16838 · 7c16838
2 parents c791ca5 + 9a34118
commit 7c16838
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,18 +14,18 @@ Release dates of 3.x versions:
 - 3.10: 2018-11-24
 - 3.11: 2020-03-08
 
-3.11.2 (TBD)
-============
+3.11.2 (2020-11-15)
+===================
 
 We are now providing a "legacy macOS" binary that supports macOS 10.10 and above. It can be found where you normally
-download SuperCollider ([#5190](https://github.com/supercollider/supercollider/pull/5190)).
+download SuperCollider ([#5190](https://github.com/supercollider/supercollider/pull/5190), [#5242](https://github.com/supercollider/supercollider/pull/5242)).
 
 ### General: Fixed
 
 In the help browser, Shift-Enter now evaluates code again! ([#4883](https://github.com/supercollider/supercollider/pull/4883))
 
 Fixed faulty deployment of macOS app bundle due to bug in Qt utility
-([#5187](https://github.com/supercollider/supercollider/pull/5187)).
+([#5187](https://github.com/supercollider/supercollider/pull/5187), [#5230](https://github.com/supercollider/supercollider/pull/5230)).
 
 Fixed support for Portaudio in build system with CMake 3.18
 ([#5206](https://github.com/supercollider/supercollider/pull/5206)).

diff --git a/SCVersion.txt b/SCVersion.txt
@@ -4,7 +4,7 @@
 set(SC_VERSION_MAJOR 3)
 set(SC_VERSION_MINOR 11)
 set(SC_VERSION_PATCH 2)
-set(SC_VERSION_TWEAK "-rc1")
+set(SC_VERSION_TWEAK "")
 set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH}${SC_VERSION_TWEAK})
 
 # Note: these are provided for backwards compatibility only. In the main project, PROJECT_VERSION_PATCH

diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
@@ -480,8 +480,9 @@ if(APPLE OR WIN32)
         # to get QtWebEngine, libsndfile, and other libs. also force scanning of QtWebEngineProcess
         # because macdeployqt is a fickle beast.
         set(CONTENTS_DIR ${CMAKE_INSTALL_PREFIX}/SuperCollider/SuperCollider.app/Contents)
-        set(QT_WEBENGINE_PROCESS
-            "${CONTENTS_DIR}/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess")
+        set(QT_WEBENGINE_APP
+            "${CONTENTS_DIR}/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app")
+        set(QT_WEBENGINE_PROCESS "${QT_WEBENGINE_APP}/Contents/MacOS/QtWebEngineProcess")
         set(DEPLOY_CMD "\"${DEPLOY_PROG}\"
                 \"${CMAKE_INSTALL_PREFIX}/SuperCollider/SuperCollider.app\"
                 -verbose=1
@@ -538,9 +539,13 @@ if(APPLE OR WIN32)
                 execute_process(COMMAND \"${CMAKE_COMMAND}\" -E remove_directory \"${QT_WEBENGINECORE_COPY_TO}\")
                 execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy_directory \"${QT_WEBENGINECORE_COPY_FROM}\"
                     \"${QT_WEBENGINECORE_COPY_TO}\")
-                # copied process is not writable at first. Other copied files in the bundle also are not writable
-                # (plist file for example), but this doesn't seem to create an issue.
+                # Mark all copied files +w. The actual process so we can run install_name_tool on it, and then the other
+                # copied files mainly to avoid having to run xattr with sudo.
                 execute_process(COMMAND chmod +w ${QT_WEBENGINE_PROCESS})
+                execute_process(COMMAND chmod +w ${QT_WEBENGINE_APP}/Contents/Info.plist)
+                execute_process(COMMAND chmod +w ${QT_WEBENGINE_APP}/Contents/PkgInfo)
+                execute_process(COMMAND chmod +w ${QT_WEBENGINE_APP}/Contents/Resources/empty.lproj)
+                execute_process(COMMAND chmod +w ${QT_WEBENGINE_APP}/Contents/Resources/QtWebEngineProcess.entitlements)
                 execute_process(COMMAND ${QT_WEBENGINE_FIXUP_COMMAND})
                 ")
         endif()

diff --git a/editors/sc-ide/widgets/help_browser.cpp b/editors/sc-ide/widgets/help_browser.cpp
@@ -96,9 +96,12 @@ HelpBrowser::HelpBrowser(QWidget* parent): QWidget(parent) {
     // FIXME: should actually respond to class library shutdown, but we don't have that signal
     connect(scProcess, SIGNAL(classLibraryRecompiled()), mLoadProgressIndicator, SLOT(stop()));
 
+    // Legacy mac build support -- with Qt 5.9.3 this causes a segfault on application exit.
+#    if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     // Delete the help browser's page to avoid an assert/crash during shutdown. See QTBUG-56441, QTBUG-50160.
     // Note that putting this in the destructor doesn't work.
     connect(QApplication::instance(), &QApplication::aboutToQuit, [this]() { delete mWebView->page(); });
+#    endif
 
     createActions();