Building 1.6.2

README.md

@@ -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

snap/snapcraft.yaml

@@ -7,8 +7,8 @@ description: |
   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:
@@ -49,17 +49,6 @@ apps:
       - joystick
 
 parts:
-  upgradelibs:
-    plugin: nil
-    override-build: |
-      # SDL upgrade
-      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
-
-      # Install updated packages
-      apt-get update
-      apt-get install -y libsdl2-2.0-0
-    prime: [-*]
   launcher:
     plugin: cmake
     source-type: git
@@ -80,7 +69,58 @@ parts:
       - qttools5-dev
       - qttools5-dev-tools
       - libglm-dev
-    after: [upgradelibs, 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
+    after: [desktop-qt5]
     override-prime: |
       set -eu
       snapcraftctl prime
@@ -98,6 +138,57 @@ 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
     after: [desktop-qt5, launcher]
     override-prime: |
       set -eu