[librest/gwagner/default_soup3] meson: build with soup3 by default
- From: Günther Wagner <gwagner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librest/gwagner/default_soup3] meson: build with soup3 by default
- Date: Fri, 17 Jun 2022 22:35:47 +0000 (UTC)
commit a9b75dfeb40efe18762740fec3dcb8733510c53a
Author: Günther Wagner <info gunibert de>
Date: Sat Jun 18 00:06:04 2022 +0200
meson: build with soup3 by default
Fixes https://gitlab.gnome.org/GNOME/librest/-/issues/11
.gitlab-ci.yml | 4 ++--
meson_options.txt | 2 +-
tests/helper/test-server.c | 4 ++--
tests/proxy-continuous.c | 2 +-
tests/threaded.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 862ba19..722b501 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ build-librest:
- dnf update -y --nogpgcheck
- dnf -y install --nogpgcheck redhat-rpm-config
glib2-devel gobject-introspection-devel libxml2-devel meson ninja-build
- libsoup-devel vala json-glib-devel git python3-jinja2 python3-toml python3-typogrify python3-pygments
+ libsoup3-devel vala json-glib-devel git python3-jinja2 python3-toml python3-typogrify python3-pygments
libadwaita-devel gtksourceview5-devel git libabigail
script:
- meson _build -Dexamples=true
@@ -84,7 +84,7 @@ reference:
git
glib2-devel
libxslt
- libsoup-devel
+ libsoup3-devel
gtk-doc
json-glib-devel
MESON_VERSION: "0.55.3"
diff --git a/meson_options.txt b/meson_options.txt
index f81f738..f67f3bf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,7 +30,7 @@ option('gtk_doc',
)
option('soup2',
type: 'boolean',
- value: true,
+ value: false,
description: 'Whether to build with libsoup2',
)
option('tests',
diff --git a/tests/helper/test-server.c b/tests/helper/test-server.c
index 1ddcb67..434d565 100644
--- a/tests/helper/test-server.c
+++ b/tests/helper/test-server.c
@@ -1,6 +1,6 @@
/* test-server.c
*
- * Copyright 2021 Günther Wagner <info gunibert de>
+ * Copyright 2021-2022 Günther Wagner <info gunibert de>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU Lesser General Public License,
@@ -85,7 +85,7 @@ run_server_thread (gpointer user_data)
g_object_set_data (G_OBJECT (server), "GMainLoop", loop);
// TODO: error handling
- soup_server_listen_local (server, 0, 0, &error);
+ soup_server_listen_local (server, 0, SOUP_SERVER_LISTEN_IPV4_ONLY, &error);
if (error != NULL)
g_error ("%s", error->message);
diff --git a/tests/proxy-continuous.c b/tests/proxy-continuous.c
index f489af5..fcb2655 100644
--- a/tests/proxy-continuous.c
+++ b/tests/proxy-continuous.c
@@ -155,7 +155,7 @@ continuous ()
server = soup_server_new (NULL, NULL);
- soup_server_listen_local (server, 0, 0, &error);
+ soup_server_listen_local (server, 0, SOUP_SERVER_LISTEN_IPV4_ONLY, &error);
g_assert_no_error (error);
soup_server_add_handler (server, NULL, server_callback, NULL, NULL);
diff --git a/tests/threaded.c b/tests/threaded.c
index 385156c..be134f8 100644
--- a/tests/threaded.c
+++ b/tests/threaded.c
@@ -96,7 +96,7 @@ static void ping ()
GSList *uris;
server = soup_server_new (NULL, NULL);
- soup_server_listen_local (server, 0, 0, &error);
+ soup_server_listen_local (server, 0, SOUP_SERVER_LISTEN_IPV4_ONLY, &error);
g_assert_no_error (error);
soup_server_add_handler (server, "/ping", server_callback,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]