Merge pull request #1198 from AnotherFoxGuy/appimage-run-fix

🐛 Fixed AppImage not including QT style plugins
This commit is contained in:
pajlada 2019-08-11 15:37:55 +02:00 committed by GitHub
commit 90d302cd2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 10 deletions

8
.CI/CreateAppImage.sh Normal file
View file

@ -0,0 +1,8 @@
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/qt512/lib/
ldd ./bin/chatterino
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
cp ./resources/icon.png ./appdir/chatterino.png
wget -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -appimage -qmake=/opt/qt512/bin/qmake
mv Chatterino-*-x86_64.AppImage Chatterino-x86_64.AppImage

View file

@ -0,0 +1,6 @@
git clone http://code.qt.io/qt/qtstyleplugins.git
cd qtstyleplugins
/opt/qt512/bin/qmake CONFIG+=release
make -j$(nproc)
sudo make install
cd -

View file

@ -9,32 +9,30 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'ppa:beineri/opt-qt-5.12.0-bionic' - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
packages: packages:
- qt512-meta-full - qt512-meta-minimal
- qt512multimedia - qt512multimedia
- qt512svg - qt512svg
- libboost-dev - libboost-dev
- libgl1-mesa-dev - libgl1-mesa-dev
- libboost-system-dev - libboost-system-dev
- libboost-filesystem-dev - libboost-filesystem-dev
- libgtk2.0-dev
install:
- sh ./.CI/InstallQTStylePlugins.sh
script: script:
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/qt512/lib/
- /opt/qt512/bin/qmake CONFIG+=release PREFIX=/usr - /opt/qt512/bin/qmake CONFIG+=release PREFIX=/usr
- make -j$(nproc) - make -j$(nproc)
- ldd ./bin/chatterino
- make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
- cp ./resources/icon.png ./appdir/chatterino.png
- wget -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" && chmod a+x linuxdeployqt-continuous-x86_64.AppImage
- ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -no-translations -unsupported-allow-new-glibc -appimage -qmake=/opt/qt512/bin/qmake
- mv Chatterino-*-x86_64.AppImage Chatterino-x86_64.AppImage
before_deploy: before_deploy:
- git config --global user.email "builds@travis-ci.com" - git config --global user.email "builds@travis-ci.com"
- git config --global user.name "Travis CI" - git config --global user.name "Travis CI"
- export GIT_TAG=nightly-build - export GIT_TAG=nightly-build
- git tag $GIT_TAG -f - git tag $GIT_TAG -f
- sh ./.CI/CreateAppImage.sh
deploy: deploy:
skip_cleanup: true skip_cleanup: true
@ -61,7 +59,7 @@ matrix:
- qt - qt
- p7zip - p7zip
- create-dmg - create-dmg
script: script:
- mkdir build && cd build - mkdir build && cd build
- /usr/local/opt/qt/bin/qmake .. && make -j8 - /usr/local/opt/qt/bin/qmake .. && make -j8