diff options
| author |   Sam James <sam@gentoo.org> | 2023-03-19 00:23:33 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-03-19 00:24:53 +0000 |
| commit | 4c8133327f5ef5aa53610089f13c2c5ea7c3976c (patch) | |
| tree | 1fa054436161ca4cedc4371389778adc3531d670 /net-libs/libsoup | |
| parent | net-misc/nx: drop 3.5.99.25 (diff) | |
| download | gentoo-4c8133327f5ef5aa53610089f13c2c5ea7c3976c.tar.gz gentoo-4c8133327f5ef5aa53610089f13c2c5ea7c3976c.tar.bz2 gentoo-4c8133327f5ef5aa53610089f13c2c5ea7c3976c.zip | |
net-libs/libsoup: fix HTTP/2 on unsigned char arches, -Wstrict-prototype
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-libs/libsoup')
| -rw-r--r-- | net-libs/libsoup/files/strict-prototypes.patch | 20 | ||||
| -rw-r--r-- | net-libs/libsoup/files/unsigned-char-http2.patch | 21 | ||||
| -rw-r--r-- | net-libs/libsoup/libsoup-3.4.0-r1.ebuild (renamed from net-libs/libsoup/libsoup-3.4.0.ebuild) | 4 |
3 files changed, 45 insertions, 0 deletions
diff --git a/net-libs/libsoup/files/strict-prototypes.patch b/net-libs/libsoup/files/strict-prototypes.patch new file mode 100644 index 000000000000..e9a84257ccb5 --- /dev/null +++ b/net-libs/libsoup/files/strict-prototypes.patch @@ -0,0 +1,20 @@ +https://gitlab.gnome.org/GNOME/libsoup/-/commit/146f1c96f741fb9ab62d74d99585b2e859f6cb5f + +From 146f1c96f741fb9ab62d74d99585b2e859f6cb5f Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <pgriffis@igalia.com> +Date: Fri, 17 Mar 2023 19:10:40 -0500 +Subject: [PATCH] Fix strict-prototype warning + +--- a/libsoup/http2/soup-body-input-stream-http2.c ++++ b/libsoup/http2/soup-body-input-stream-http2.c +@@ -72,7 +72,7 @@ static guint signals [LAST_SIGNAL] = { 0 }; + * Returns: a new #GInputStream + */ + GInputStream * +-soup_body_input_stream_http2_new () ++soup_body_input_stream_http2_new (void) + { + return G_INPUT_STREAM (g_object_new (SOUP_TYPE_BODY_INPUT_STREAM_HTTP2, NULL)); + } +-- +GitLab diff --git a/net-libs/libsoup/files/unsigned-char-http2.patch b/net-libs/libsoup/files/unsigned-char-http2.patch new file mode 100644 index 000000000000..ceee9d360e4b --- /dev/null +++ b/net-libs/libsoup/files/unsigned-char-http2.patch @@ -0,0 +1,21 @@ +https://gitlab.gnome.org/GNOME/libsoup/-/commit/d1509188ebd2219db1a147e9d77ffd5b4d161a2e + +From d1509188ebd2219db1a147e9d77ffd5b4d161a2e Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <pgriffis@igalia.com> +Date: Fri, 17 Mar 2023 19:05:35 -0500 +Subject: [PATCH] Fix regression breaking HTTP/2 on platforms with unsigned + char + +--- a/libsoup/soup-connection-manager.c ++++ b/libsoup/soup-connection-manager.c +@@ -378,7 +378,7 @@ static SoupConnection * + soup_connection_manager_get_connection_locked (SoupConnectionManager *manager, + SoupMessageQueueItem *item) + { +- static gchar env_force_http1 = -1; ++ static int env_force_http1 = -1; + SoupMessage *msg = item->msg; + gboolean need_new_connection; + SoupConnection *conn; +-- +GitLab diff --git a/net-libs/libsoup/libsoup-3.4.0.ebuild b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild index 73364f0a5c02..af164f1c1964 100644 --- a/net-libs/libsoup/libsoup-3.4.0.ebuild +++ b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild @@ -54,6 +54,10 @@ BDEPEND=" PATCHES=( # Disable apache tests until they are usable on Gentoo, bug #326957 "${FILESDIR}"/disable-apache-tests.patch + # Upstream patch to fix HTTP/2 on platforms w/ unsigned char + "${FILESDIR}"/unsigned-char-http2.patch + # Upstream patch to fix -Wstrict-prototypes + "${FILESDIR}"/strict-prototypes.patch ) src_prepare() { |