[simple-scan] Fix Snap building



commit 016b3ec4e95b5b7750db50696aaed31dc8b81cb9
Author: Bartosz Kosiorek <gang65 poczta onet pl>
Date:   Wed Nov 3 09:13:55 2021 +0100

    Fix Snap building

 .gitlab-ci.yml                | 4 ++--
 README.md                     | 2 +-
 build-aux/snap/snapcraft.yaml | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6084da62..e52cf1f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,8 @@ build:snap:
   image: ubuntudesktop/gnome-3-38-2004
   before_script:
     - apt-get update
+    - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends ca-certificates
   script: snapcraft
-  allow_failure: true
   artifacts:
     paths: ['./*.snap']
     expire_in: 3 days
@@ -12,7 +12,7 @@ build-ubuntu:
   image: ubuntu:rolling
   before_script:
     - apt-get update
-    - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends meson valac gcc gettext 
itstool gobject-introspection libfribidi-dev libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev 
libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates
+    - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends meson valac gcc gettext 
itstool libfribidi-dev libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev 
libwebp-dev libsane-dev git ca-certificates
   script:
     - meson _build
     - ninja -C _build install
diff --git a/README.md b/README.md
index 0b6751a2..75b5b57b 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Install the dependencies
 
 For Ubuntu/Debian:
 ```
-$ sudo apt install -y meson valac gcc gettext itstool gobject-introspection libfribidi-dev 
libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev 
git ca-certificates
+$ sudo apt install -y meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-3-dev 
libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates
 
 ```
 
diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml
index 85165880..a20c5b86 100644
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -35,9 +35,9 @@ apps:
 
 parts:
   libsane:
-    source: https://salsa.debian.org/debian/sane-backends.git
+    source: https://gitlab.com/sane-project/backends.git
     source-type: git
-    source-tag: upstream/1.0.27
+    source-tag: release-1.0.33
     plugin: autotools
     autotools-configure-parameters:
       - --prefix=/snap/simple-scan/current/usr
@@ -84,8 +84,10 @@ parts:
       - libgtk-3-dev
       - libgdk-pixbuf2.0-dev
       - libgusb-dev
+      - libgirepository1.0-dev 
       - libpackagekit-glib2-dev
       - libsane-dev
+      - libwebp-dev
       - valac
       - zlib1g-dev
   libs:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]