| 1 |
commit: 4c8133327f5ef5aa53610089f13c2c5ea7c3976c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 19 00:23:33 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 19 00:24:53 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c813332 |
| 7 |
|
| 8 |
net-libs/libsoup: fix HTTP/2 on unsigned char arches, -Wstrict-prototype |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-libs/libsoup/files/strict-prototypes.patch | 20 ++++++++++++++++++++ |
| 13 |
net-libs/libsoup/files/unsigned-char-http2.patch | 21 +++++++++++++++++++++ |
| 14 |
...libsoup-3.4.0.ebuild => libsoup-3.4.0-r1.ebuild} | 4 ++++ |
| 15 |
3 files changed, 45 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-libs/libsoup/files/strict-prototypes.patch b/net-libs/libsoup/files/strict-prototypes.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..e9a84257ccb5 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-libs/libsoup/files/strict-prototypes.patch |
| 22 |
@@ -0,0 +1,20 @@ |
| 23 |
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/146f1c96f741fb9ab62d74d99585b2e859f6cb5f |
| 24 |
+ |
| 25 |
+From 146f1c96f741fb9ab62d74d99585b2e859f6cb5f Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Patrick Griffis <pgriffis@××××××.com> |
| 27 |
+Date: Fri, 17 Mar 2023 19:10:40 -0500 |
| 28 |
+Subject: [PATCH] Fix strict-prototype warning |
| 29 |
+ |
| 30 |
+--- a/libsoup/http2/soup-body-input-stream-http2.c |
| 31 |
++++ b/libsoup/http2/soup-body-input-stream-http2.c |
| 32 |
+@@ -72,7 +72,7 @@ static guint signals [LAST_SIGNAL] = { 0 }; |
| 33 |
+ * Returns: a new #GInputStream |
| 34 |
+ */ |
| 35 |
+ GInputStream * |
| 36 |
+-soup_body_input_stream_http2_new () |
| 37 |
++soup_body_input_stream_http2_new (void) |
| 38 |
+ { |
| 39 |
+ return G_INPUT_STREAM (g_object_new (SOUP_TYPE_BODY_INPUT_STREAM_HTTP2, NULL)); |
| 40 |
+ } |
| 41 |
+-- |
| 42 |
+GitLab |
| 43 |
|
| 44 |
diff --git a/net-libs/libsoup/files/unsigned-char-http2.patch b/net-libs/libsoup/files/unsigned-char-http2.patch |
| 45 |
new file mode 100644 |
| 46 |
index 000000000000..ceee9d360e4b |
| 47 |
--- /dev/null |
| 48 |
+++ b/net-libs/libsoup/files/unsigned-char-http2.patch |
| 49 |
@@ -0,0 +1,21 @@ |
| 50 |
+https://gitlab.gnome.org/GNOME/libsoup/-/commit/d1509188ebd2219db1a147e9d77ffd5b4d161a2e |
| 51 |
+ |
| 52 |
+From d1509188ebd2219db1a147e9d77ffd5b4d161a2e Mon Sep 17 00:00:00 2001 |
| 53 |
+From: Patrick Griffis <pgriffis@××××××.com> |
| 54 |
+Date: Fri, 17 Mar 2023 19:05:35 -0500 |
| 55 |
+Subject: [PATCH] Fix regression breaking HTTP/2 on platforms with unsigned |
| 56 |
+ char |
| 57 |
+ |
| 58 |
+--- a/libsoup/soup-connection-manager.c |
| 59 |
++++ b/libsoup/soup-connection-manager.c |
| 60 |
+@@ -378,7 +378,7 @@ static SoupConnection * |
| 61 |
+ soup_connection_manager_get_connection_locked (SoupConnectionManager *manager, |
| 62 |
+ SoupMessageQueueItem *item) |
| 63 |
+ { |
| 64 |
+- static gchar env_force_http1 = -1; |
| 65 |
++ static int env_force_http1 = -1; |
| 66 |
+ SoupMessage *msg = item->msg; |
| 67 |
+ gboolean need_new_connection; |
| 68 |
+ SoupConnection *conn; |
| 69 |
+-- |
| 70 |
+GitLab |
| 71 |
|
| 72 |
diff --git a/net-libs/libsoup/libsoup-3.4.0.ebuild b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild |
| 73 |
similarity index 94% |
| 74 |
rename from net-libs/libsoup/libsoup-3.4.0.ebuild |
| 75 |
rename to net-libs/libsoup/libsoup-3.4.0-r1.ebuild |
| 76 |
index 73364f0a5c02..af164f1c1964 100644 |
| 77 |
--- a/net-libs/libsoup/libsoup-3.4.0.ebuild |
| 78 |
+++ b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild |
| 79 |
@@ -54,6 +54,10 @@ BDEPEND=" |
| 80 |
PATCHES=( |
| 81 |
# Disable apache tests until they are usable on Gentoo, bug #326957 |
| 82 |
"${FILESDIR}"/disable-apache-tests.patch |
| 83 |
+ # Upstream patch to fix HTTP/2 on platforms w/ unsigned char |
| 84 |
+ "${FILESDIR}"/unsigned-char-http2.patch |
| 85 |
+ # Upstream patch to fix -Wstrict-prototypes |
| 86 |
+ "${FILESDIR}"/strict-prototypes.patch |
| 87 |
) |
| 88 |
|
| 89 |
src_prepare() { |
Archives