Remove references to QtWebEngine

This commit is contained in:
Casper Jeukendrup 2022-09-17 22:59:47 +02:00
parent 7d24896021
commit f63769186e
No known key found for this signature in database
GPG Key ID: 6C571BEF59E722DD
8 changed files with 4 additions and 37 deletions

View File

@ -153,7 +153,6 @@ package() {
appimage="$(echo "$appdir" | sed 's|\.AppDir$|.AppImage|')"
cd AppImageKit-5/AppImageAssistant.AppDir
chmod u+x /$appdir/bin/QtWebEngineProcess
./package "$appdir" "$appimage"

View File

@ -84,9 +84,6 @@ getCrossPlatformDependencies() {
copyLib libQt5Sql.so.5
copyLib libQt5Svg.so.5
copyLib libQt5WebChannel.so.5
copyLib libQt5WebEngine.so.5
copyLib libQt5WebEngineCore.so.5
copyLib libQt5WebEngineWidgets.so.5
copyLib libQt5Widgets.so.5
copyLib libQt5XmlPatterns.so.5
copyLib libQt5Xml.so.5

View File

@ -103,7 +103,6 @@ appimage="$(echo "$appdir" | sed 's|\.AppDir$|.AppImage|')"
##########################################################################
cd ../AppImageKit/AppImageAssistant.AppDir
chmod u+x /$appdir/bin/QtWebEngineProcess
./package "$appdir" "$appimage"

View File

@ -40,10 +40,10 @@ search for user custom data, as well as the default place for the 'Save as...' d
** -\Data\MuseScore4\Scores **
*******************************************************
The folder -\Data\settings contains MuseScore, QWebEngine, and Qml settings, as well as custom
workspaces, autosaved and recovered files. It also contains MuseScorePortable specific settings.
This folder can be deleted to revert MuseScore to factory settings (note: any customization will
be lost in that case).
The folder -\Data\settings contains MuseScore and Qml settings, as well as custom workspaces,
autosaved and recovered files. It also contains MuseScorePortable specific settings. This folder
can be deleted to revert MuseScore to factory settings (note: any customization will be lost in
that case).
MUSESCOREPORTABLE.INI CONFIGURATION
====================================

View File

@ -92,18 +92,6 @@ function change_rpath() {
done
}
function change_rpath_QWebEngine() {
for P in `otool -L $1 | awk '{print $1}'`
do
if [[ "$P" == *@rpath* ]]
then
PSLASH=$(echo $P | sed 's,@rpath,@loader_path/../../../../../../..,g')
FNAME=$(echo $P | sed "s,@rpath,${VOLUME}/${APPNAME}.app/Contents/Frameworks,g")
install_name_tool -change $P $PSLASH $1
fi
done
}
rm ${WORKING_DIRECTORY}/${COMPRESSEDDMGNAME}
@ -151,9 +139,6 @@ macdeployqt ${VOLUME}/${APPNAME}.app
# fix the libs, qt5.6 has @rpath...
BIN_FILE=${VOLUME}/${APPNAME}.app/Contents/MacOS/mscore
change_rpath $BIN_FILE
# fix the QWebEngineProcess, qt5.9 has @rpath...
WebEngineProcess=${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
change_rpath_QWebEngine $WebEngineProcess
# Workaround:
# fix Homebrew libraries with hard coded absolute path, see QTBUG-56814
@ -182,7 +167,6 @@ do
done
otool -L ${VOLUME}/${APPNAME}.app/Contents/MacOS/mscore
otool -L ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
echo "Rename ${APPNAME}.app to ${VOLUME}/${LONGER_NAME}.app"
mv ${VOLUME}/${APPNAME}.app "${VOLUME}/${LONGER_NAME}.app"
@ -212,8 +196,6 @@ echo "Codesign"
find "${VOLUME}/${LONGER_NAME}.app/Contents/Resources" -name '*.dylib' -exec codesign --force --options runtime --deep -s "Developer ID Application: MuseScore" '{}' ';'
# Sign code in other (more conventional) locations
codesign --force --options runtime --entitlements "${WORKING_DIRECTORY}/../build/macosx_entitlements.plist" --deep -s "Developer ID Application: MuseScore" "${CODE_PATHS[@]}"
# Sign QtWebEngine application for MacOS Catalina
codesign --force --verify --verbose --options runtime --entitlements "${WORKING_DIRECTORY}/../build/qtwebengineprocess.entitlements" --deep --sign "Developer ID Application: MuseScore" "${VOLUME}/${LONGER_NAME}.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess"
echo "spctl"
spctl --assess --type execute "${VOLUME}/${LONGER_NAME}.app"
echo "Codesign verify"

View File

@ -1,6 +1,5 @@
[Paths]
Prefix=./
Prefix=./webengineresources
[Platforms]
WindowsArguments = fontengine=freetype

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<true/>
</dict>
</plist>

View File

@ -32,7 +32,6 @@ MUSESCORE_BUILD_PORTABLEAPPS=${MUSESCORE_BUILD_PORTABLEAPPS:-"OFF"}
MUSESCORE_CRASHREPORT_URL=${MUSESCORE_CRASHREPORT_URL:-""}
MUSESCORE_DEBUGLEVEL_ENABLED="OFF"
MUSESCORE_BUILD_JACK=${MUSESCORE_BUILD_JACK:-"OFF"}
MUSESCORE_BUILD_WEBENGINE=${MUSESCORE_BUILD_WEBENGINE:-"OFF"}
MUSESCORE_BUILD_VST=${MUSESCORE_BUILD_VST:-"OFF"}
MUSESCORE_VST3_SDK_PATH=${MUSESCORE_VST3_SDK_PATH:-""}
MUSESCORE_DOWNLOAD_SOUNDFONT=${MUSESCORE_DOWNLOAD_SOUNDFONT:-"ON"}