diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2022-10-12 10:45:10 +0200 |
|---|---|---|
| committer | Corentin Noël <tintou@noel.tf> | 2023-01-11 11:18:15 +0100 |
| commit | b0f97a06c02f15820246454383215698822aec69 (patch) | |
| tree | 54712eb246388fb81aab4f32da097075e3657557 | |
| parent | 31373b9987b9b5526f9e7a9457d163c67f4acd21 (diff) | |
| download | libchamplain-b0f97a06c02f15820246454383215698822aec69.tar.gz | |
ci: Build and test libsoup3 version
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | champlain/champlain-network-bbox-tile-source.c | 2 | ||||
| -rw-r--r-- | champlain/champlain-network-tile-source.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a808d62..ad2a07e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: before_script: - dnf install -y gcc ccache gettext gtk-doc meson ninja-build redhat-rpm-config - - dnf install -y glib2-devel clutter-devel gtk3-devel clutter-gtk-devel cairo-devel sqlite-devel libsoup-devel gobject-introspection-devel vala-devel + - dnf install -y glib2-devel clutter-devel gtk3-devel clutter-gtk-devel cairo-devel sqlite-devel libsoup3-devel libsoup-devel gobject-introspection-devel vala-devel .ccache-setup: &ccache-setup variables: @@ -22,6 +22,9 @@ build-champlain: - meson -Dwidgetry=true -Ddemos=true -Dgtk_doc=true -Dintrospection=true -Dvapi=true -Dlibsoup3=false _build . - ninja -C _build - ninja -C _build test + - meson configure _build -Dlibsoup3=true + - ninja -C _build + - ninja -C _build test - ninja -C _build champlain-0.12-doc - ccache --show-stats artifacts: diff --git a/champlain/champlain-network-bbox-tile-source.c b/champlain/champlain-network-bbox-tile-source.c index 56efc4e..70642e4 100644 --- a/champlain/champlain-network-bbox-tile-source.c +++ b/champlain/champlain-network-bbox-tile-source.c @@ -119,7 +119,7 @@ champlain_network_bbox_tile_source_set_property (GObject *object, { #ifdef CHAMPLAIN_LIBSOUP_3 GProxyResolver *resolver = soup_session_get_proxy_resolver (priv->soup_session); - if (!resolver && G_IS_SIMPLE_PROXY_RESOLVER (resolver)) + if (resolver && G_IS_SIMPLE_PROXY_RESOLVER (resolver)) g_simple_proxy_resolver_set_default_proxy (G_SIMPLE_PROXY_RESOLVER (resolver), priv->proxy_uri); #else g_object_set (G_OBJECT (priv->soup_session), "proxy-uri", diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c index 324e2e5..7cadfa5 100644 --- a/champlain/champlain-network-tile-source.c +++ b/champlain/champlain-network-tile-source.c @@ -498,7 +498,7 @@ champlain_network_tile_source_set_proxy_uri (ChamplainNetworkTileSource *tile_so if (priv->soup_session) { GProxyResolver *resolver = soup_session_get_proxy_resolver (priv->soup_session); - if (!resolver && G_IS_SIMPLE_PROXY_RESOLVER (resolver)) + if (resolver && G_IS_SIMPLE_PROXY_RESOLVER (resolver)) g_simple_proxy_resolver_set_default_proxy (G_SIMPLE_PROXY_RESOLVER (resolver), priv->proxy_uri); } #else |