Remove Appimage support
We have decided to drop support for Appimage because it was causing issues to too many users.
This commit is contained in:
Maze
parent
a37809d82b
commit
c26e2ce9e5
|
|
@ -49,6 +49,10 @@ and this project adheres to
|
||||||
|
|
||||||
- Default theme is now Foliage.qpl
|
- Default theme is now Foliage.qpl
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
|
||||||
|
- Appimage: remove Appimage installation method
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Compatibility with Python 3.10
|
- Compatibility with Python 3.10
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ but compiling on Windows and macOS should be possible with the right tools.
|
||||||
|
|
||||||
- [Packages](#packages)
|
- [Packages](#packages)
|
||||||
- [Linux](#linux)
|
- [Linux](#linux)
|
||||||
- [AppImage](#appimage)
|
|
||||||
- [Flatpak](#flatpak)
|
- [Flatpak](#flatpak)
|
||||||
- [Alpine Linux / postmarketOS](#alpine-linux--postmarketOS)
|
- [Alpine Linux / postmarketOS](#alpine-linux--postmarketOS)
|
||||||
- [Arch Linux](#arch-linux)
|
- [Arch Linux](#arch-linux)
|
||||||
|
|
@ -37,22 +36,9 @@ but compiling on Windows and macOS should be possible with the right tools.
|
||||||
|
|
||||||
For developement, or if none of the package options are satisfying,
|
For developement, or if none of the package options are satisfying,
|
||||||
see [manual installation](#manual-installation).
|
see [manual installation](#manual-installation).
|
||||||
Packages other than the AppImage and Flatpak are not maintained by the Mirage
|
Packages other than the Flatpak are not maintained by the Mirage
|
||||||
authors, and thus might be outdated.
|
authors, and thus might be outdated.
|
||||||
|
|
||||||
#### AppImage (Leftover instructions from Mirage; not supported for Moment)
|
|
||||||
|
|
||||||
For **x86 64bit glibc-based systems**, Mirage is available as an AppImage
|
|
||||||
on the [release page](https://github.com/mirukana/mirage/releases).
|
|
||||||
|
|
||||||
AppImages are single executable files that contain the app and all
|
|
||||||
its dependencies.
|
|
||||||
Mirage images are built in Ubuntu 16.04, and should therefore run on any distro
|
|
||||||
released in April 2016 or later.
|
|
||||||
|
|
||||||
[How to start AppImages](https://docs.appimage.org/introduction/quickstart.html#how-to-run-an-appimage)
|
|
||||||
(TL;DR: `chmod +x Mirage-*.AppImage && ./Mirage-*.AppImage`)
|
|
||||||
|
|
||||||
#### Flatpak (Leftover instructions from Mirage; not supported for Moment)
|
#### Flatpak (Leftover instructions from Mirage; not supported for Moment)
|
||||||
|
|
||||||
Mirage is also available as a Flatpak.
|
Mirage is also available as a Flatpak.
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
#!/usr/bin/env sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
here="$(dirname "$(readlink -f "$0")")"
|
|
||||||
|
|
||||||
export RESTORE_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
|
|
||||||
export RESTORE_PYTHONHOME="$PYTHONHOME"
|
|
||||||
export RESTORE_PYTHONUSERBASE="$PYTHONUSERBASE"
|
|
||||||
|
|
||||||
export SSL_CERT_FILE="$here/usr/lib/python$PY_XY/site-packages/certifi/cacert.pem"
|
|
||||||
export LD_LIBRARY_PATH="$here/usr/lib:$LD_LIBRARY_PATH"
|
|
||||||
export PYTHONHOME="$here/usr"
|
|
||||||
export PYTHONUSERBASE="$here/usr"
|
|
||||||
|
|
||||||
cd "$here"
|
|
||||||
exec "$here/usr/bin/mirage" "$@"
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
# AppImage building
|
|
||||||
|
|
||||||
The image must be built on Ubuntu 16.04 Xenial, to ensure compatibility with
|
|
||||||
older systems.
|
|
||||||
|
|
||||||
LXD can be used to setup a suitable container from any distro.
|
|
||||||
|
|
||||||
If not done already (all default settings are usually fine):
|
|
||||||
|
|
||||||
lxd init
|
|
||||||
|
|
||||||
Initialize a new container named `ubuntu`:
|
|
||||||
|
|
||||||
lxc launch images:ubuntu/xenial/amd64 ubuntu
|
|
||||||
|
|
||||||
Now, you can either clone the repo from inside the container...:
|
|
||||||
|
|
||||||
lxc exec ubuntu -- apt install -y git
|
|
||||||
lxc exec ubuntu -- git pull https://github.com/mirukana/mirage
|
|
||||||
|
|
||||||
...or directly copy a repository from your local filesystem inside:
|
|
||||||
|
|
||||||
lxc exec ubuntu -- /bin/mkdir -p /root/mirage
|
|
||||||
lxc file push -vr <path to repo root>/* ubuntu/root/mirage
|
|
||||||
|
|
||||||
Run the build script inside the container:
|
|
||||||
|
|
||||||
lxc exec ubuntu -- /root/mirage/packaging/appimage/build.sh
|
|
||||||
|
|
||||||
You can also start a shell inside (e.g. if something goes wrong):
|
|
||||||
|
|
||||||
lxc exec ubuntu -- /bin/bash
|
|
||||||
|
|
@ -1,252 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -eo pipefail
|
|
||||||
|
|
||||||
HERE="$(dirname "$(readlink -f "$0")")"
|
|
||||||
MIRAGE_REPO_URL='https://github.com/mirukana/mirage'
|
|
||||||
PY_XYZ=3.9.6
|
|
||||||
PY_XY="$(cut -d . -f 1-2 <<< "$PY_XYZ")"
|
|
||||||
|
|
||||||
|
|
||||||
check_distro() {
|
|
||||||
if grep -q '^\s*Ubuntu\s*16.04' /etc/issue; then return; fi
|
|
||||||
|
|
||||||
echo "Not running on expected distribution or version, aborting!" >&2
|
|
||||||
echo "See <repo root>/packaging/appimage/README.md for more info." >&2
|
|
||||||
exit 99
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
parse_cli_arguments() {
|
|
||||||
if [ "$1" = --skip-install-prerequisites ] || [ "$1" = -s ]; then
|
|
||||||
skip_pre=true
|
|
||||||
else
|
|
||||||
skip_pre=false
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
setup_dns() {
|
|
||||||
if ! grep -q 'dns-nameservers 9.9.9.9' /etc/network/interfaces; then
|
|
||||||
sed -i '/iface eth0 inet dhcp/a dns-nameservers 9.9.9.9' \
|
|
||||||
/etc/network/interfaces
|
|
||||||
|
|
||||||
invoke-rc.d networking restart
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
install_apt_packages() {
|
|
||||||
apt install -y software-properties-common
|
|
||||||
add-apt-repository -y ppa:beineri/opt-qt-5.12.9-xenial
|
|
||||||
add-apt-repository -y ppa:beineri/opt-qt-5.12.9-xenial
|
|
||||||
apt update -y
|
|
||||||
|
|
||||||
apt install -y \
|
|
||||||
qt512base qt512declarative qt512graphicaleffects \
|
|
||||||
qt512imageformats qt512quickcontrols2 qt512svg \
|
|
||||||
zip git wget cmake ccache \
|
|
||||||
build-essential mesa-common-dev libglu1-mesa-dev freeglut3-dev \
|
|
||||||
libglfw3-dev libgles2-mesa-dev libssl-dev \
|
|
||||||
python3-dev python3-setuptools python3-pip libgdbm-dev libc6-dev \
|
|
||||||
libsqlite3-dev libffi-dev openssl libreadline-dev \
|
|
||||||
libjpeg-turbo8-dev zlib1g-dev \
|
|
||||||
libtiff5-dev liblcms2-dev libwebp-dev libopenjp2-7-dev \
|
|
||||||
libx11-dev libxss-dev libasound2-dev \
|
|
||||||
pkg-config libdbus-1-dev libglib2.0-dev \
|
|
||||||
appstream-util desktop-file-utils # for appimage-lint.sh
|
|
||||||
|
|
||||||
/usr/sbin/update-ccache-symlinks
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
setup_env() {
|
|
||||||
set +euo pipefail
|
|
||||||
# shellcheck disable=SC1091
|
|
||||||
source /opt/qt512/bin/qt512-env.sh
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
export PATH="/usr/lib/ccache:$PATH"
|
|
||||||
export LD_LIBRARY_PATH="$HOME/.local/lib/python$PY_XY/site-packages/PIL/.libs/:$HOME/.local/lib/python$PY_XY/site-packages/.libs_cffi_backend/:/usr/lib/x86_64-linux-gnu/:/usr/lib:$LD_LIBRARY_PATH"
|
|
||||||
export PREFIX=/usr
|
|
||||||
|
|
||||||
export CFLAGS="-march=x86-64 -O2 -pipe -fPIC"
|
|
||||||
export CXXFLAGS="$CFLAGS"
|
|
||||||
export MAKEFLAGS="-j$(($(nproc) + 1))"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
install_python() {
|
|
||||||
cd ~
|
|
||||||
|
|
||||||
if ! [ -d ~/.pyenv ]; then
|
|
||||||
wget -O - https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
|
|
||||||
fi
|
|
||||||
|
|
||||||
export PYENV_ROOT="$HOME/.pyenv"
|
|
||||||
export PATH="$PYENV_ROOT/bin:$PATH"
|
|
||||||
|
|
||||||
set +euo pipefail
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
export PYTHON_CFLAGS="$CFLAGS"
|
|
||||||
export PYTHON_CONFIGURE_OPTS='--enable-shared --enable-optimizations --with-lto'
|
|
||||||
|
|
||||||
pyenv update
|
|
||||||
pyenv install --verbose --skip-existing $PY_XYZ
|
|
||||||
pyenv global $PY_XYZ
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
install_olm() {
|
|
||||||
cd ~
|
|
||||||
|
|
||||||
rm -rf olm-master.tar.gz olm-master
|
|
||||||
wget 'https://gitlab.matrix.org/matrix-org/olm/-/archive/master/olm-master.tar.gz'
|
|
||||||
tar xf olm-master.tar.gz
|
|
||||||
|
|
||||||
cd olm-master
|
|
||||||
make clean
|
|
||||||
cmake . -Bbuild
|
|
||||||
cmake --build build
|
|
||||||
make install
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
install_pyotherside() {
|
|
||||||
cd ~
|
|
||||||
|
|
||||||
if ! [ -f 1.5.9.tar.gz ]; then
|
|
||||||
wget 'https://github.com/thp/pyotherside/archive/1.5.9.tar.gz'
|
|
||||||
fi
|
|
||||||
|
|
||||||
tar xf 1.5.9.tar.gz
|
|
||||||
|
|
||||||
cd pyotherside-1.5.9
|
|
||||||
make clean
|
|
||||||
find . -name Makefile -delete
|
|
||||||
qmake
|
|
||||||
make install
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
get_app_and_pip_dependencies() {
|
|
||||||
cd ~
|
|
||||||
|
|
||||||
if ! [ -d mirage ]; then
|
|
||||||
git clone --recursive "$MIRAGE_REPO_URL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd mirage
|
|
||||||
if pip3 show Pillow; then pip3 uninstall Pillow --yes; fi
|
|
||||||
pip3 install Pillow --no-binary :all:
|
|
||||||
pip3 install --user -Ur requirements.txt
|
|
||||||
pip3 install --user -U certifi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
initialize_appdir() {
|
|
||||||
cd ~/mirage
|
|
||||||
rm -rf .qmake.stash Makefile build
|
|
||||||
|
|
||||||
qmake mirage.pro PREFIX=/usr
|
|
||||||
make install INSTALL_ROOT=build/appdir
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
complete_appdir() {
|
|
||||||
cd ~/mirage/build
|
|
||||||
|
|
||||||
cp -r ~/.pyenv/versions/$PY_XYZ/* appdir/usr
|
|
||||||
cp -r "$HOME/.local/lib/python$PY_XY/site-packages/"* \
|
|
||||||
"appdir/usr/lib/python$PY_XY/site-packages"
|
|
||||||
|
|
||||||
cd ~/mirage/build/appdir/usr/lib
|
|
||||||
ln -s "python$PY_XY/site-packages/Pillow.libs/"* .
|
|
||||||
cd ~/mirage/build
|
|
||||||
|
|
||||||
if ! [ -f ~/linuxdeployqt.AppImage ]; then
|
|
||||||
wget 'https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage' \
|
|
||||||
-O ~/linuxdeployqt.AppImage
|
|
||||||
fi
|
|
||||||
chmod +x ~/linuxdeployqt.AppImage
|
|
||||||
|
|
||||||
~/linuxdeployqt.AppImage appdir/usr/share/applications/mirage.desktop \
|
|
||||||
-bundle-non-qt-libs -qmldir=../src/gui
|
|
||||||
|
|
||||||
mkdir -p appdir/usr/share/metainfo
|
|
||||||
cp ~/mirage/packaging/mirage.appdata.xml appdir/usr/share/metainfo
|
|
||||||
|
|
||||||
cp /opt/qt512/qml/io/thp/pyotherside/qmldir \
|
|
||||||
appdir/usr/qml/io/thp/pyotherside
|
|
||||||
|
|
||||||
# Remove useless heavy test data
|
|
||||||
rm -rf "appdir/usr/lib/python$PY_XY/test"
|
|
||||||
rm -rf "appdir/usr/lib/python$PY_XY/site-packages/Crypto/SelfTest/"
|
|
||||||
|
|
||||||
# Remove python cache files
|
|
||||||
find appdir -name '*.pyc' -delete
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fix_apprun_launcher() {
|
|
||||||
cd ~/mirage/build/appdir
|
|
||||||
rm -f AppRun # because it's a symlink
|
|
||||||
sed "s/\\\$PY_XY/$PY_XY/" "$HERE/AppRun.sh" > AppRun
|
|
||||||
chmod +x AppRun
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
generate_appimage() {
|
|
||||||
cd ~/mirage/build
|
|
||||||
|
|
||||||
if ! [ -f ~/appimagetool.AppImage ]; then
|
|
||||||
wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" \
|
|
||||||
-O ~/appimagetool.AppImage
|
|
||||||
fi
|
|
||||||
|
|
||||||
chmod +x ~/appimagetool.AppImage
|
|
||||||
~/appimagetool.AppImage --no-appstream appdir
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
lint_appdir() {
|
|
||||||
cd ~
|
|
||||||
|
|
||||||
cat << 'EOF' > /usr/local/bin/mimetype
|
|
||||||
#!/usr/bin/env sh
|
|
||||||
file --mime-type "$@" | tr -d ';'
|
|
||||||
EOF
|
|
||||||
chmod +x /usr/local/bin/mimetype
|
|
||||||
|
|
||||||
if ! [ -d pkg2appimage ]; then
|
|
||||||
git clone https://github.com/AppImage/pkg2appimage
|
|
||||||
fi
|
|
||||||
chmod +x pkg2appimage/appdir-lint.sh
|
|
||||||
|
|
||||||
cd ~/mirage/build
|
|
||||||
echo -e "\e[34m\nAppDir linting result:\n\e[0m"
|
|
||||||
~/pkg2appimage/appdir-lint.sh appdir
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
check_distro
|
|
||||||
parse_cli_arguments "$@"
|
|
||||||
setup_dns
|
|
||||||
|
|
||||||
if [ "$skip_pre" = false ]; then install_apt_packages; fi
|
|
||||||
|
|
||||||
setup_env
|
|
||||||
|
|
||||||
if [ "$skip_pre" = false ]; then
|
|
||||||
install_python
|
|
||||||
install_olm
|
|
||||||
install_pyotherside
|
|
||||||
get_app_and_pip_dependencies
|
|
||||||
fi
|
|
||||||
|
|
||||||
initialize_appdir
|
|
||||||
complete_appdir
|
|
||||||
fix_apprun_launcher
|
|
||||||
generate_appimage
|
|
||||||
lint_appdir
|
|
||||||
Loading…
Reference in New Issue
Block a user