diff options
| author | Günther Wagner <info@gunibert.de> | 2022-06-18 00:06:04 +0200 |
|---|---|---|
| committer | Günther Wagner <info@gunibert.de> | 2022-06-18 01:01:30 +0200 |
| commit | cad5496562a52e146ec5efc9265e7ef8e6e03ae3 (patch) | |
| tree | f93bb17106cdc24c01abc47b254d22ea2b107f62 | |
| parent | 2fc0a24574ee15704d588626f194dea2ca288997 (diff) | |
| download | librest-cad5496562a52e146ec5efc9265e7ef8e6e03ae3.tar.gz | |
meson: build with soup3 by default
Fixes https://gitlab.gnome.org/GNOME/librest/-/issues/11
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | tests/helper/test-server.c | 4 | ||||
| -rw-r--r-- | tests/proxy-continuous.c | 2 | ||||
| -rw-r--r-- | tests/threaded.c | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 862ba19..73152d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,8 @@ build-librest: before_script: - 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 + glib2-devel gobject-introspection-devel libxml2-devel meson ninja-build libsoup-devel + 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 @@ -83,8 +83,9 @@ reference: gettext git glib2-devel + libxml2-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, |