[simple-scan] Update snap to use newer base



commit 1ef5e5f482e395b5b059ce238cf2713f5e34d9be
Author: Heather Ellsworth <hellsworth gnome org>
Date:   Sun Oct 31 15:49:31 2021 +0000

    Update snap to use newer base

 .gitlab-ci.yml                | 2 +-
 build-aux/snap/snapcraft.yaml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d6beb59..6084da62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 build:snap:
-  image: ubuntudesktop/gnome-3-28-1804
+  image: ubuntudesktop/gnome-3-38-2004
   before_script:
     - apt-get update
   script: snapcraft
diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml
index d9c071bf..85165880 100644
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -6,7 +6,7 @@ description: |
 
 grade: stable # must be 'stable' to release into candidate/stable channels
 confinement: strict
-base: core18
+base: core20
 
 slots:
   # for GtkApplication registration
@@ -28,7 +28,7 @@ apps:
       - io-ports-control
       - raw-usb
     command: usr/bin/simple-scan
-    extensions: [gnome-3-28]
+    extensions: [ gnome-3-38 ]
     desktop: usr/share/applications/simple-scan.desktop
     environment:
       GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
@@ -39,7 +39,9 @@ parts:
     source-type: git
     source-tag: upstream/1.0.27
     plugin: autotools
-    configflags: [--prefix=/snap/simple-scan/current/usr, --with-api-spec=no]
+    autotools-configure-parameters:
+      - --prefix=/snap/simple-scan/current/usr
+      - --with-api-spec=no
     organize:
       snap/simple-scan/current/usr: usr
     build-packages:
@@ -84,7 +86,6 @@ parts:
       - libgusb-dev
       - libpackagekit-glib2-dev
       - libsane-dev
-      - python-scour
       - valac
       - zlib1g-dev
   libs:


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