zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

snap: Upgrade from gnome-3-28 extension to gnome-3-34 

Using gnome-3-34 gives us a newer stack in general
and also provides us with a sdk build-snap, so we don't need
to specify as many build-packages and stage-packages.

This makes the snap slimmer and delegates the responsibility
for security updates to the gnome platform snap for even more
packages.
pull/581/head
Maximilian Federle 2020-04-16 21:38:45 +02:00 committed by whitequark
parent 13b461d750
commit f5415b3fe6
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/snap/snap/snapcraft.yaml
View File

@ -23,13 +23,13 @@ apps:
solvespace: solvespace:
command: usr/bin/solvespace command: usr/bin/solvespace
desktop: solvespace.desktop desktop: solvespace.desktop
extensions: [gnome-3-28] extensions: [gnome-3-34]
plugs: [opengl, unity7, home, removable-media, gsettings, network] plugs: [opengl, unity7, home, removable-media, gsettings, network]
environment: environment:
__EGL_VENDOR_LIBRARY_DIRS: $SNAP/gnome-platform/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d __EGL_VENDOR_LIBRARY_DIRS: $SNAP/gnome-platform/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
cli: cli:
command: usr/bin/solvespace-cli command: usr/bin/solvespace-cli
extensions: [gnome-3-28] extensions: [gnome-3-34]
plugs: [home, removable-media, network] plugs: [home, removable-media, network]
parts: parts:
@ -54,32 +54,25 @@ parts:
build-packages: build-packages:
- zlib1g-dev - zlib1g-dev
- libpng-dev - libpng-dev
- libcairo2-dev
- libfreetype6-dev - libfreetype6-dev
- libjson-c-dev - libjson-c-dev
- libfontconfig1-dev
- libgtkmm-3.0-dev
- libpangomm-1.4-dev
- libgl-dev - libgl-dev
- libglu-dev - libsigc++-2.0-dev
- libspnav-dev - libspnav-dev
- git - git
- g++
stage-packages: stage-packages:
- libspnav0 - libspnav0
- libatkmm-1.6-1v5
- libcairomm-1.0-1v5
- libgtkmm-3.0-1v5
- libglibmm-2.4-1v5
- libpangomm-1.4-1v5
- libsigc++-2.0-0v5 - libsigc++-2.0-0v5
cleanup: cleanup:
after: [solvespace] after: [solvespace]
plugin: nil plugin: nil
build-snaps: [core18, gnome-3-28-1804] build-snaps: [core18, gnome-3-34-1804]
override-prime: | override-prime: |
# Remove all files from snap that are already included in the base snap or in # Remove all files from snap that are already included in the base snap or in
# any connected content snaps # any connected content snaps
set -eux set -eux
for snap in "core18" "gnome-3-28-1804"; do # List all content-snaps and base snaps you're using here for snap in "core18" "gnome-3-34-1804"; do # List all content-snaps and base snaps you're using here
cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \; cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
done done