Remove Broken WebKit Exclusion

This commit is contained in:
TheBrokenRail 2022-03-10 21:05:11 -05:00
parent 53b2c20b8b
commit 8792e5749d
3 changed files with 11 additions and 8 deletions

View File

@ -8,11 +8,11 @@ endif()
if(BUILD_ARM_COMPONENTS) if(BUILD_ARM_COMPONENTS)
add_subdirectory(libpng) add_subdirectory(libpng)
endif() endif()
# GLFW
if(BUILD_NATIVE_COMPONENTS)
add_subdirectory(glfw)
endif()
# Minecraft: Pi Edition # Minecraft: Pi Edition
if(BUILD_ARM_COMPONENTS AND NOT MCPI_OPEN_SOURCE_ONLY) if(BUILD_ARM_COMPONENTS AND NOT MCPI_OPEN_SOURCE_ONLY)
add_subdirectory(minecraft-pi) add_subdirectory(minecraft-pi)
endif() endif()
# GLFW
if(BUILD_NATIVE_COMPONENTS AND NOT MCPI_HEADLESS_MODE)
add_subdirectory(glfw)
endif()

View File

@ -50,8 +50,6 @@ const packageExclusions = [
// Exclude Unneeded Packages // Exclude Unneeded Packages
'humanity-icon-theme', 'humanity-icon-theme',
'adwaita-icon-theme', 'adwaita-icon-theme',
'libwebkit2gtk-*',
'libnotify4',
'*systemd*', '*systemd*',
'dconf-service', 'dconf-service',
'dconf-gsettings-backend', 'dconf-gsettings-backend',

View File

@ -93,11 +93,16 @@ sudo apt-get install --no-install-recommends -y ${PKG_QUEUE}
# Download appimagetool # Download appimagetool
sudo mkdir -p /opt sudo mkdir -p /opt
sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /opt/appimagetool sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /opt/appimagetool
sudo chmod +x /opt/appimagetool
# Workaround AppImage Issues With Docker # Workaround AppImage Issues With Docker
cd /opt; sudo chmod +x ./appimagetool; sudo sed -i '0,/AI\x02/{s|AI\x02|\x00\x00\x00|}' ./appimagetool; sudo ./appimagetool --appimage-extract cd /opt
sudo sed -i '0,/AI\x02/{s|AI\x02|\x00\x00\x00|}' ./appimagetool
sudo rm -rf /opt/squashfs-root /opt/appimagetool.AppDir
sudo ./appimagetool --appimage-extract
sudo rm -f ./appimagetool
sudo mv /opt/squashfs-root /opt/appimagetool.AppDir sudo mv /opt/squashfs-root /opt/appimagetool.AppDir
sudo rm -f /usr/local/bin/appimagetool sudo rm -f /usr/local/bin/appimagetool
sudo ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool sudo ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool
# Install appimage-builder # Install appimage-builder
sudo pip3 install 'git+https://github.com/AppImageCrafters/appimage-builder.git' sudo pip3 install 'git+https://github.com/TheBrokenRail/appimage-builder.git'