[libgweather/mcatanzaro/soup3-default: 2/2] Switch to libsoup3 by default
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather/mcatanzaro/soup3-default: 2/2] Switch to libsoup3 by default
- Date: Wed, 22 Jun 2022 21:30:28 +0000 (UTC)
commit a7013ada6c28a727e74772f56623e5e108c2035f
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Fri Jun 17 13:25:42 2022 -0500
Switch to libsoup3 by default
Fixes #177
.gitlab-ci.yml | 8 ++++----
meson_options.txt | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4a5e47f..29643ab9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,7 +120,7 @@ fedora-x86_64:
redhat-rpm-config
vala
MESON_VERSION: "0.55.3"
- MESON_EXTRA_FLAGS: "--buildtype=debug -Dwerror=true -Dgtk_doc=false"
+ MESON_EXTRA_FLAGS: "--buildtype=debug -Dwerror=true -Dgtk_doc=false -Dsoup2=true"
fedora-x86_64-soup3:
extends: .build-default
@@ -207,7 +207,7 @@ static-scan:
python3-wheel
redhat-rpm-config
MESON_VERSION: "0.55.3"
- MESON_EXTRA_FLAGS: "--buildtype=debug -Dgtk_doc=false -Dintrospection=false"
+ MESON_EXTRA_FLAGS: "--buildtype=debug -Dgtk_doc=false -Dintrospection=false -Dsoup2=true"
script:
- meson setup --prefix /usr ${MESON_EXTRA_FLAGS} _scan_build .
- ninja -C _scan_build scan-build
@@ -244,7 +244,7 @@ asan-build:
redhat-rpm-config
vala
MESON_VERSION: "0.55.3"
- MESON_EXTRA_FLAGS: "--buildtype=debug -Db_sanitize=address -Db_lundef=false -Dintrospection=false
-Dgtk_doc=false"
+ MESON_EXTRA_FLAGS: "--buildtype=debug -Db_sanitize=address -Db_lundef=false -Dintrospection=false
-Dgtk_doc=false -Dsoup2=true"
script:
- CC=clang meson setup --prefix /usr ${MESON_EXTRA_FLAGS} _asan_build .
- meson compile -C _asan_build
@@ -279,7 +279,7 @@ coverage:
python3-wheel
redhat-rpm-config
MESON_VERSION: "0.55.3"
- MESON_EXTRA_FLAGS: "--buildtype=debug -Dgtk_doc=false -Dintrospection=false"
+ MESON_EXTRA_FLAGS: "--buildtype=debug -Dgtk_doc=false -Dintrospection=false -Dsoup2=true"
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script:
- meson setup --prefix /usr ${MESON_EXTRA_FLAGS} _build .
diff --git a/meson_options.txt b/meson_options.txt
index aeaace17..60dd16e3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,5 +10,5 @@ option('introspection', type: 'boolean', value: true,
description: 'Whether to generate introspection data')
option('tests', type: 'boolean', value: true,
description: 'Whether to build the tests and tools')
-option('soup2', type: 'boolean', value: true,
+option('soup2', type: 'boolean', value: false,
description: 'Whether to build with libsoup2')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]