Skip to content

Commit

Permalink
Restore libsoup-2.4
Browse files Browse the repository at this point in the history
This PR restores libsoup-2.4 and includes two versions of
libgeoclue: one compiled against libsoup-2.4 and another one
against libsoup-3.0. This should mitigate the migration.
  • Loading branch information
sergio-costas committed Nov 20, 2024
1 parent cf2b69a commit 74c9eae
Showing 1 changed file with 40 additions and 1 deletion.
41 changes: 40 additions & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,27 @@ parts:
craftctl default
sed -i 's#^\#!/usr/bin/env python$#\#!/usr/bin/env python3#g' src/psl-make-dafsa
libsoup2:
after: [ libpsl, meson-deps ]
source: https://gitlab.gnome.org/GNOME/libsoup.git
source-tag: '2.74.3'
# ext:updatesnap
# version-format:
# lower-than: 3
source-depth: 1
plugin: meson
meson-parameters:
- --prefix=/usr
- -Doptimization=3
- -Ddebug=true
- -Dvapi=enabled
- -Dtls_check=false #disable build time check, but we need to ensure glib-networking is available at runtime
build-environment: *buildenv
build-packages:
- libsqlite3-dev
- libkrb5-dev
- libbrotli-dev

libsoup3:
after: [ libpsl, meson-deps ]
source: https://gitlab.gnome.org/GNOME/libsoup.git
Expand Down Expand Up @@ -1199,6 +1220,24 @@ parts:
build-packages:
- libgee-0.8-dev

libgeocode-libsoup2:
source: https://gitlab.gnome.org/GNOME/geocode-glib.git
after: [ libgnome-games-support, glib, meson-deps, gobject-introspection, libsoup2, libffi ]
source-tag: '3.26.4'
source-depth: 1
plugin: meson
build-environment: *buildenv
meson-parameters:
- --prefix=/usr
- -Doptimization=3
- -Ddebug=true
- -Denable-installed-tests=false
- -Denable-introspection=true
- -Denable-gtk-doc=false
- -Dsoup2=true
build-packages:
- libnghttp2-dev

libgeocode:
source: https://gitlab.gnome.org/GNOME/geocode-glib.git
after: [ libgnome-games-support, glib, meson-deps, gobject-introspection, libsoup3, libffi ]
Expand Down Expand Up @@ -1336,7 +1375,7 @@ parts:
done
debs:
after: [ libgnome-games-support, libadwaita, libgweather, libayatana-appindicator, libsoup3, librest, at-spi2-core, webp-pixbuf-loader ]
after: [ libgeocode-libsoup2, libgnome-games-support, libadwaita, libgweather, libayatana-appindicator, libsoup3, librest, at-spi2-core, webp-pixbuf-loader ]
plugin: nil
stage-packages:
- appstream
Expand Down

0 comments on commit 74c9eae

Please sign in to comment.