diff --git a/snapcraft.yaml b/snapcraft.yaml index 5bc867f..9ebe508 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -5,8 +5,8 @@ confinement: strict base: core24 layout: - /usr/lib/$CRAFT_ARCH_TRIPLET/folks/26/backends: - symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/folks/26/backends + /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/folks/26/backends: + symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/folks/26/backends /usr/lib/evolution: symlink: $SNAP/usr/lib/evolution /usr/lib/evolution-data-server: @@ -36,42 +36,6 @@ apps: # DISABLE_WAYLAND: 'true' parts: - # required because we need a version with libsoup3 - geocode: - source: https://gitlab.gnome.org/GNOME/geocode-glib.git - source-tag: '3.26.4' - source-depth: 1 - plugin: meson - meson-parameters: - - --prefix=/usr - - -Doptimization=3 - - -Denable-installed-tests=false - - -Denable-introspection=true - - -Denable-gtk-doc=false - - -Dsoup2=false - build-packages: - - libnghttp2-dev - - # required because we need a version with libsoup3 - libgweather: - after: [ geocode ] - source: https://gitlab.gnome.org/GNOME/libgweather.git - source-tag: '4.4.4' - source-depth: 1 - plugin: meson - meson-parameters: - - --prefix=/usr - - -Doptimization=3 - - -Dintrospection=true - - -Dgtk_doc=false - - -Dtests=false - - -Dsoup2=false - override-pull: | - craftctl default - sed -i 's#CRAFT_ENV_REPLACE#/usr/lib:/usr/lib/$CRAFT_ARCH_TRIPLET#' $CRAFT_PART_SRC/data/meson.build - build-packages: - - gir1.2-glib-2.0 - libical: source: https://github.com/libical/libical.git source-tag: 'v3.0.20' @@ -93,7 +57,6 @@ parts: source: https://gitlab.freedesktop.org/geoclue/geoclue.git source-tag: '2.7.2' source-depth: 1 - after: [ geocode ] plugin: meson meson-parameters: - --prefix=/usr @@ -105,7 +68,7 @@ parts: - -Dgtk-doc=false evolution-data-server: - after: [ libical, geoclue, libgweather ] + after: [ libical, geoclue ] source: https://gitlab.gnome.org/GNOME/evolution-data-server.git source-tag: '3.56.1' source-depth: 1 @@ -175,7 +138,7 @@ parts: gnome-contacts: source: https://gitlab.gnome.org/GNOME/gnome-contacts.git source-type: git - source-tag: '47.1.1' + source-tag: '48.0' source-depth: 1 after: [ libfolks ] plugin: meson @@ -186,7 +149,7 @@ parts: - -Ddocs=false - -Dmanpage=false - -Dprofile=default - parse-info: [usr/share/metainfo/org.gnome.Contacts.appdata.xml] + parse-info: [usr/share/metainfo/org.gnome.Contacts.metainfo.xml] organize: snap/gnome-contacts/current/usr: usr override-pull: | @@ -201,6 +164,8 @@ parts: build-packages: - libportal-dev - libqrencode-dev + # Drop when the Gnome SDK snap hits 0+git.81ba3cf (revision 109). + - libgstreamer1.0-dev stage-packages: - libqrencode4