Commit 8046dbcb authored by Heather Ellsworth's avatar Heather Ellsworth Committed by Antenore Gatta

snap: Update yaml to use GNOME extension

parent 4155db2d
...@@ -5,24 +5,6 @@ grade: stable ...@@ -5,24 +5,6 @@ grade: stable
confinement: strict confinement: strict
base: core18 base: core18
plugs:
gnome-3-28-1804:
interface: content
target: $SNAP/gnome-platform
default-provider: gnome-3-28-1804
gtk-3-themes:
interface: content
target: $SNAP/data-dir/themes
default-provider: gtk-common-themes
icon-themes:
interface: content
target: $SNAP/data-dir/icons
default-provider: gtk-common-themes
sound-themes:
interface: content
target: $SNAP/data-dir/sounds
default-provider: gtk-common-themes
layout: layout:
/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0: /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0:
bind: $SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0 bind: $SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/webkit2gtk-4.0
...@@ -35,19 +17,17 @@ slots: ...@@ -35,19 +17,17 @@ slots:
apps: apps:
remmina: remmina:
# desktop-launch seems to be broken when setting up wayland env # desktop-launch (used under the covers in gnome-3-28 extension) seems to
# so we disable it # be broken when setting up wayland env so we disable it
environment: environment:
DISABLE_WAYLAND: "1" DISABLE_WAYLAND: "1"
LD_LIBRARY_PATH: "$SNAP/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/:$LD_LIBRARY_PATH" command: usr/bin/remmina
command: desktop-launch remmina extensions: [gnome-3-28]
common-id: org.remmina.Remmina.desktop common-id: org.remmina.Remmina.desktop
plugs: plugs:
- avahi-observe - avahi-observe
- browser-support - browser-support
- cups-control - cups-control
- desktop
- desktop-legacy
- gsettings - gsettings
- home - home
- mount-observe - mount-observe
...@@ -58,9 +38,6 @@ apps: ...@@ -58,9 +38,6 @@ apps:
- pulseaudio - pulseaudio
- ssh-keys - ssh-keys
- ssh-public-keys - ssh-public-keys
- unity7
- wayland
- x11
winpr-makecert: winpr-makecert:
command: winpr-makecert command: winpr-makecert
...@@ -69,17 +46,6 @@ apps: ...@@ -69,17 +46,6 @@ apps:
command: winpr-hash command: winpr-hash
parts: parts:
desktop-gnome-platform:
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
source-subdir: gtk
plugin: make
make-parameters: ["FLAVOR=gtk3"]
build-packages:
- build-essential
- libgtk-3-dev
override-build: |
snapcraftctl build
mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
freerdp: freerdp:
plugin: cmake plugin: cmake
source: https://github.com/FreeRDP/FreeRDP.git source: https://github.com/FreeRDP/FreeRDP.git
...@@ -153,7 +119,6 @@ parts: ...@@ -153,7 +119,6 @@ parts:
remmina: remmina:
after: after:
- desktop-gnome-platform
- libssh-0-8 - libssh-0-8
- freerdp - freerdp
plugin: cmake plugin: cmake
...@@ -203,8 +168,6 @@ parts: ...@@ -203,8 +168,6 @@ parts:
sed --in-place 's|^Icon=.*|Icon=\${SNAP}/meta/gui/remmina.svg|' usr/share/applications/org.remmina.Remmina.desktop sed --in-place 's|^Icon=.*|Icon=\${SNAP}/meta/gui/remmina.svg|' usr/share/applications/org.remmina.Remmina.desktop
app: app:
after:
- desktop-gnome-platform
plugin: nil plugin: nil
stage-packages: stage-packages:
- gtk-3-examples - gtk-3-examples
......
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