Commit e8483801 authored by Alex Gleason's avatar Alex Gleason

Merge branch '1.6.2' into 'master'

Bump to v1.6.2

See merge request !1
parents 20d40e5d 96144f33
......@@ -22,8 +22,9 @@ You should now have icons in your applications menu for the Quest Editor and Lau
### Building
* First [install snapd](https://docs.snapcraft.io/installing-snapd/6735), snapcraft, and [Docker](https://docs.docker.com/install/).
* To build, run `docker run --rm -v "$PWD":/build -w /build snapcore/snapcraft bash -c "apt update && snapcraft"`.
* [Install snapd](https://docs.snapcraft.io/installing-snapd/6735).
* Install snapcraft (`sudo snap install snapcraft`).
* To build, run `snapcraft`.
* To test your build, run: `sudo snap install solarus_*.snap --dangerous`
### Publishing
......
name: solarus
version: 1.6
version: '1.6.2'
summary: A free and open-source Action-RPG game engine
description: |
Solarus is a free and open-source Action-RPG game engine, licensed under GPL,
and written in C++. It runs quests in Lua, and can work on a great number
of platforms. Solarus also features a game editor called Solarus Quest Editor,
written in C++ with Qt to help you create your game.
base: core18
confinement: strict
grade: stable
apps:
launcher:
......@@ -48,19 +49,11 @@ apps:
- joystick
parts:
prepare:
plugin: nil
prepare: |
echo "deb http://ppa.launchpad.net/litenstein/sdl2-xenial/ubuntu xenial main" | tee /etc/apt/sources.list.d/litenstein-ubuntu-sdl2-xenial-xenial.list
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E0A4B32AA748B9D11C4528301A509285F2EA337
apt-get update
apt-get install -y libsdl2-2.0-0
prime: [-*]
launcher:
plugin: cmake
source-type: git
source: https://gitlab.com/solarus-games/solarus.git
source-commit: 633bad6be5fbe2f77c3d63db497f7d7e2b1128f6
source-tag: v1.6.2
build-packages:
- g++
- make
......@@ -76,17 +69,69 @@ parts:
- qttools5-dev
- qttools5-dev-tools
- libglm-dev
after: [prepare, desktop-qt5]
stage-packages:
- libasound2
- libasyncns0
- libdouble-conversion1
- libflac8
- libfreetype6
- libgl1
- libglvnd0
- libglx0
- libgraphite2-3
- libharfbuzz0b
- libicu60
- libjbig0
- libjpeg-turbo8
- libluajit-5.1-2
- libmodplug1
- libogg0
- libopenal1
- libphysfs1
- libpng16-16
- libpulse0
- libqt5core5a
- libqt5gui5
- libqt5widgets5
- libsdl2-2.0-0
- libsdl2-image-2.0-0
- libsdl2-ttf-2.0-0
- libsndfile1
- libsndio6.1
- libtiff5
- libvorbis0a
- libvorbisenc2
- libvorbisfile3
- libwayland-client0
- libwayland-cursor0
- libwayland-egl1
- libwebp6
- libx11-6
- libxau6
- libxcb1
- libxcursor1
- libxdmcp6
- libxext6
- libxfixes3
- libxi6
- libxinerama1
- libxkbcommon0
- libxrandr2
- libxrender1
- libxss1
- libxxf86vm1
- qt5-gtk-platformtheme
after: [desktop-qt5]
override-prime: |
set -eu
snapcraftctl prime
# Fix-up application icon lookup
sed --in-place 's|^Icon=.*|Icon=${SNAP}/share/icons/hicolor/256x256/apps/solarus.png|' share/applications/solarus.desktop
sed --in-place 's|^Icon=.*|Icon=${SNAP}/share/icons/hicolor/512x512/apps/solarus.png|' share/applications/solarus.desktop
quest-editor:
plugin: cmake
source-type: git
source: https://gitlab.com/solarus-games/solarus-quest-editor.git
source-tag: v1.6.0
source-tag: v1.6.2
build-packages:
- g++
- make
......@@ -94,11 +139,89 @@ parts:
- qttools5-dev
- qttools5-dev-tools
- libglm-dev
stage-packages:
- libasound2
- libasyncns0
- libdouble-conversion1
- libflac8
- libfreetype6
- libgl1
- libglvnd0
- libglx0
- libgraphite2-3
- libharfbuzz0b
- libicu60
- libjbig0
- libjpeg-turbo8
- libluajit-5.1-2
- libmodplug1
- libogg0
- libopenal1
- libphysfs1
- libpng16-16
- libpulse0
- libqt5core5a
- libqt5gui5
- libqt5widgets5
- libsdl2-2.0-0
- libsdl2-image-2.0-0
- libsdl2-ttf-2.0-0
- libsndfile1
- libsndio6.1
- libtiff5
- libvorbis0a
- libvorbisenc2
- libvorbisfile3
- libwayland-client0
- libwayland-cursor0
- libwayland-egl1
- libwebp6
- libx11-6
- libxau6
- libxcb1
- libxcursor1
- libxdmcp6
- libxext6
- libxfixes3
- libxi6
- libxinerama1
- libxkbcommon0
- libxrandr2
- libxrender1
- libxss1
- libxxf86vm1
- qt5-gtk-platformtheme
after: [desktop-qt5, launcher]
override-prime: |
set -eu
snapcraftctl prime
# Fix-up application icon lookup
sed --in-place 's|^Icon=.*|Icon=${SNAP}/share/icons/hicolor/256x256/apps/solarus-quest-editor.png|' share/applications/solarus-quest-editor.desktop
sed --in-place 's|^Icon=.*|Icon=${SNAP}/share/icons/hicolor/scalable/apps/solarus-quest-editor.svg|' share/applications/solarus-quest-editor.desktop
# Move `assets` directory
mv share/solarus-quest-editor/assets bin/assets
desktop-qt5:
build-packages:
- build-essential
- qtbase5-dev
- dpkg-dev
make-parameters:
- FLAVOR=qt5
plugin: make
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
source-subdir: qt
stage-packages:
- libxkbcommon0
- ttf-ubuntu-font-family
- dmz-cursor-theme
- light-themes
- adwaita-icon-theme
- gnome-themes-standard
- shared-mime-info
- libqt5gui5
- libgdk-pixbuf2.0-0
- libqt5svg5
- try:
- appmenu-qt5
- locales-all
- xdg-user-dirs
- fcitx-frontend-qt5
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment