diff options
Diffstat (limited to 'snap')
| -rwxr-xr-x | snap/classic-launch | 23 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 77 |
2 files changed, 63 insertions, 37 deletions
diff --git a/snap/classic-launch b/snap/classic-launch deleted file mode 100755 index 96452d9..0000000 --- a/snap/classic-launch +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -if test "$1" = "classic"; then - shift - case $SNAP_ARCH in - amd64) - TRIPLET="x86_64-linux-gnu" - ;; - armhf) - TRIPLET="arm-linux-gnueabihf" - ;; - arm64) - TRIPLET="aarch64-linux-gnu" - ;; - *) - TRIPLET="$(uname -p)-linux-gnu" - ;; - esac - - export LD_LIBRARY_PATH=$SNAP/usr/lib:$SNAP/usr/lib/$TRIPLET:$SNAP/lib/$TRIPLET -fi - -exec ${SNAP}/bin/desktop-launch $@ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 14fa600..3e3d92d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -5,23 +5,73 @@ description: | Simple Scan allows you to get images from a scanner (e.g. a flatbed scanner) grade: stable # must be 'stable' to release into candidate/stable channels -confinement: classic +confinement: strict +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 + +slots: + # for GtkApplication registration + simple-scan: + interface: dbus + bus: session + name: org.gnome.SimpleScan + apps: simple-scan: - command: bin/classic-launch classic ${SNAP}/usr/bin/simple-scan + plugs: + - desktop + - desktop-legacy + - network + - network-control + - home + - gsettings + - hardware-observe + - mount-observe + - system-observe + - io-ports-control + - raw-usb + - unity7 + command: bin/desktop-launch ${SNAP}/usr/bin/simple-scan desktop: usr/share/applications/simple-scan.desktop environment: GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas 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 + libsane: - after: [desktop-gtk3] - source: https://anonscm.debian.org/cgit/sane/sane-backends.git + after: [desktop-gnome-platform] + source: https://salsa.debian.org/debian/sane-backends.git source-type: git - source-tag: RELEASE_1_0_27 + source-tag: upstream/1.0.27 plugin: autotools - # workaround the issue described in https://launchpad.net/bugs/1583250 configflags: [--prefix=/snap/simple-scan/current/usr, --with-api-spec=no] organize: snap/simple-scan/current/usr: usr @@ -47,13 +97,11 @@ parts: simple-scan: after: [libsane] source: . + source-type: git plugin: meson meson-parameters: [--prefix=/usr] organize: snap/simple-scan/current/usr: usr - install: | - mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/ - cp snapbuild/data/simple-scan.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/ build-packages: - desktop-file-utils - gettext @@ -72,8 +120,9 @@ parts: - python-scour - valac - zlib1g-dev - classic-launch: - plugin: dump - source: ./snap - organize: - classic-launch: bin/classic-launch + libs: + plugin: nil + stage-packages: + - libgusb2 + - libpackagekit-glib2-18 + - libieee1284-3 |