Skip to content

Commit

Permalink
Remove libsoup2 support
Browse files Browse the repository at this point in the history
Three libraries (librest, libgeocode and libgweather) still used
libsoup-2, although they already support being compiled with
libsoup-3. Since mixing both versions when linking binaries is
not possible (and, in fact, an specific check is done at runtime
to abort the execution if that case is detected), I think that is
time to remove the old one.

This PR entirely removes libsoup-2 library and recompiles those
three libraries using libsoup-3.
  • Loading branch information
sergio-costas committed Nov 7, 2024
1 parent ecbf820 commit 2f20797
Showing 1 changed file with 15 additions and 32 deletions.
47 changes: 15 additions & 32 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,13 +416,10 @@ parts:
craftctl default
sed -i 's#^\#!/usr/bin/env python$#\#!/usr/bin/env python3#g' src/psl-make-dafsa
libsoup2:
libsoup3:
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-tag: '3.4.4'
source-depth: 1
plugin: meson
meson-parameters:
Expand All @@ -436,37 +433,23 @@ parts:
- libsqlite3-dev
- libkrb5-dev
- libbrotli-dev
- libnghttp2-dev

libsoup3:
after: [ libsoup2, meson-deps ]
source: https://gitlab.gnome.org/GNOME/libsoup.git
source-tag: '3.4.4'
librest:
after: [ libsoup3, meson-deps ]
source: https://gitlab.gnome.org/GNOME/librest.git
source-tag: '0.9.1'
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
- libnghttp2-dev

librest:
after: [ libsoup3 ]
source: https://gitlab.gnome.org/GNOME/librest.git
source-tag: '0.8.1' # looks like this branch has been updated more recently than the 0.8 tags - weird
# ext:updatesnap
# version-format:
# same-major: true
# same-minor: true
source-depth: 1
plugin: autotools
autotools-configure-parameters: [ --prefix=/usr ]
- -Dvapi=true
- -Dexamples=false
- -Dgtk_doc=false
- -Dsoup2=false
- -Dtests=false
build-environment: *buildenv
build-packages:
- gtk-doc-tools
Expand Down Expand Up @@ -1201,7 +1184,7 @@ parts:

libgeocode:
source: https://gitlab.gnome.org/GNOME/geocode-glib.git
after: [ libgnome-games-support, glib, meson-deps, gobject-introspection, libsoup2, libffi ]
after: [ libgnome-games-support, glib, meson-deps, gobject-introspection, libsoup3, libffi ]
source-tag: '3.26.4'
source-depth: 1
plugin: meson
Expand All @@ -1213,7 +1196,7 @@ parts:
- -Denable-installed-tests=false
- -Denable-introspection=true
- -Denable-gtk-doc=false
- -Dsoup2=true
- -Dsoup2=false
build-packages:
- libnghttp2-dev

Expand All @@ -1234,7 +1217,7 @@ parts:
- -Dintrospection=true
- -Dgtk_doc=false
- -Dtests=false
- -Dsoup2=true
- -Dsoup2=false
override-pull: |
craftctl default
patch -p1 < $CRAFT_PROJECT_DIR/patches/libgweather.diff
Expand Down

0 comments on commit 2f20797

Please sign in to comment.