Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wslay for openSUSE:Factory checked in at 2021-07-13 22:37:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wslay (Old) and /work/SRC/openSUSE:Factory/.wslay.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wslay" Tue Jul 13 22:37:27 2021 rev:6 rq:906024 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/wslay/wslay.changes 2020-08-05 20:29:52.819113685 +0200 +++ /work/SRC/openSUSE:Factory/.wslay.new.2625/wslay.changes 2021-07-13 22:37:54.093903192 +0200 @@ -1,0 +2,6 @@ +Fri Jul 9 08:52:27 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Add upstream patch to fix build with recent sphinx versions: + * 0001-Fix-sphinx-3.3-errors.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-sphinx-3.3-errors.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wslay.spec ++++++ --- /var/tmp/diff_new_pack.9ZoIe9/_old 2021-07-13 22:37:54.521899745 +0200 +++ /var/tmp/diff_new_pack.9ZoIe9/_new 2021-07-13 22:37:54.525899713 +0200 @@ -26,6 +26,10 @@ Group: Development/Libraries/C and C++ URL: https://github.com/tatsuhiro-t/wslay Source0: https://github.com/tatsuhiro-t/wslay/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz +# PATCH-FIX-UPSTREAM -- NOTE: It can only be used on Leap >= 15.3 and Tumbleweed +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +Patch0: 0001-Fix-sphinx-3.3-errors.patch +%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: cunit-devel @@ -88,7 +92,7 @@ This package holds the development files. %prep -%setup -q -n %{name}-release-%{version} +%autosetup -p1 -n %{name}-release-%{version} %build export CFLAGS="%{optflags} -fpermissive" ++++++ 0001-Fix-sphinx-3.3-errors.patch ++++++ >From 0b83f9703bf67a359995b0e219e98685df13a247 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa <tatsuhir...@gmail.com> Date: Thu, 14 Jan 2021 20:44:36 +0900 Subject: [PATCH] Fix sphinx 3.3 errors --- doc/sphinx/conf.py.in | 2 +- .../man/wslay_event_context_server_init.rst | 44 +++++++------------ .../man/wslay_event_queue_fragmented_msg.rst | 2 +- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in index fa58ad5..7765d1e 100644 --- a/doc/sphinx/conf.py.in +++ b/doc/sphinx/conf.py.in @@ -302,4 +302,4 @@ man_pages = [ ] def setup(app): - app.add_stylesheet('default2.css') + app.add_css_file('default2.css') diff --git a/doc/sphinx/man/wslay_event_context_server_init.rst b/doc/sphinx/man/wslay_event_context_server_init.rst index f549d79..dbf44d3 100644 --- a/doc/sphinx/man/wslay_event_context_server_init.rst +++ b/doc/sphinx/man/wslay_event_context_server_init.rst @@ -16,13 +16,13 @@ DESCRIPTION ----------- :c:func:`wslay_event_context_server_init` function initializes an -:c:event-based API context for WebSocket server use. +event-based API context for WebSocket server use. :c:func:`wslay_event_context_client_init` function initializes an -:c:event-based API context for WebSocket client use. If they return -:c:successfully, `ctx` will point to a structure which holds any -:c:necessary resources needed to process WebSocket protocol transfers. +event-based API context for WebSocket client use. If they return +successfully, `ctx` will point to a structure which holds any +necessary resources needed to process WebSocket protocol transfers. -*callbacks* is a pointer to :c:type:`struct wslay_event_callbacks`, +*callbacks* is a pointer to :c:type:`wslay_event_callbacks`, which is defined as follows:: struct wslay_event_callbacks { @@ -35,9 +35,7 @@ which is defined as follows:: wslay_event_on_msg_recv_callback on_msg_recv_callback; }; -**recv_callback** - - .. c:type:: typedef ssize_t (*wslay_event_recv_callback)(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, int flags, void *user_data) +.. c:type:: ssize_t (*wslay_event_recv_callback)(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, int flags, void *user_data) *recv_callback* is invoked by :c:func:`wslay_event_recv` when it wants to receive more data from peer. @@ -53,9 +51,7 @@ which is defined as follows:: set ``WSLAY_ERR_WOULDBLOCK`` instead. This is important because it tells :c:func:`wslay_event_recv` to stop receiving further data and return. -**send_callback** - - .. c:type:: typedef ssize_t (*wslay_event_send_callback)(wslay_event_context_ptr ctx, const uint8_t *data, size_t len, int flags, void *user_data) +.. c:type:: ssize_t (*wslay_event_send_callback)(wslay_event_context_ptr ctx, const uint8_t *data, size_t len, int flags, void *user_data) *send_callback* is invoked by :c:func:`wslay_event_send` when it wants to send more data to peer. @@ -76,9 +72,7 @@ which is defined as follows:: set ``WSLAY_ERR_WOULDBLOCK`` instead. This is important because it tells :c:func:`wslay_event_send` to stop sending data and return. -**genmask_callback** - - .. c:type:: typedef int (*wslay_event_genmask_callback)(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, void *user_data) +.. c:type:: int (*wslay_event_genmask_callback)(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, void *user_data) *genmask_callback* is invoked by :c:func:`wslay_event_send` when it wants new mask key. As described in RFC6455, only the traffic from @@ -90,14 +84,12 @@ which is defined as follows:: set error code ``WSLAY_ERR_CALLBACK_FAILURE`` using :c:func:`wslay_event_set_error`. -**on_frame_recv_start_callback** - - .. c:type:: typedef void (*wslay_event_on_frame_recv_start_callback)(wslay_event_context_ptr ctx, const struct wslay_event_on_frame_recv_start_arg *arg, void *user_data) +.. c:type:: void (*wslay_event_on_frame_recv_start_callback)(wslay_event_context_ptr ctx, const struct wslay_event_on_frame_recv_start_arg *arg, void *user_data) *on_frame_recv_start_callback* is invoked by :c:func:`wslay_event_recv` when a new frame starts to be received. This callback function is only invoked once for each - frame. :c:type:`struct wslay_event_on_frame_recv_start_arg` is defined as + frame. :c:type:`wslay_event_on_frame_recv_start_arg` is defined as follows:: struct wslay_event_on_frame_recv_start_arg { @@ -110,13 +102,11 @@ which is defined as follows:: *fin*, *rsv* and *opcode* is fin bit and reserved bits and opcode of a frame. *payload_length* is a payload length of a frame. -**on_frame_recv_chunk_callback** - - .. c:type:: typedef void (*wslay_event_on_frame_recv_chunk_callback)(wslay_event_context_ptr ctx, const struct wslay_event_on_frame_recv_chunk_arg *arg, void *user_data) +.. c:type:: void (*wslay_event_on_frame_recv_chunk_callback)(wslay_event_context_ptr ctx, const struct wslay_event_on_frame_recv_chunk_arg *arg, void *user_data) *on_frame_recv_chunk_callback* is invoked by :c:func:`wslay_event_recv` when a chunk of frame payload is received. - :c:type:`struct wslay_event_on_frame_recv_chunk_arg` is defined as follows:: + :c:type:`wslay_event_on_frame_recv_chunk_arg` is defined as follows:: struct wslay_event_on_frame_recv_chunk_arg { const uint8_t *data; @@ -126,20 +116,16 @@ which is defined as follows:: *data* points to a chunk of payload data. *data_length* is the length of a chunk. -**on_frame_recv_end_callback** - - .. c:type:: typedef void (*wslay_event_on_frame_recv_end_callback)(wslay_event_context_ptr ctx, void *user_data) +.. c:type:: void (*wslay_event_on_frame_recv_end_callback)(wslay_event_context_ptr ctx, void *user_data) *on_frame_recv_end_callback* is invoked by :c:func:`wslay_event_recv` when a frame is completely received. -**on_msg_recv_callback** - - .. c:type:: typedef void (*wslay_event_on_msg_recv_callback)(wslay_event_context_ptr ctx, const struct wslay_event_on_msg_recv_arg *arg, void *user_data) +.. c:type:: void (*wslay_event_on_msg_recv_callback)(wslay_event_context_ptr ctx, const struct wslay_event_on_msg_recv_arg *arg, void *user_data) *on_msg_recv_callback* is invoked by :c:func:`wslay_event_recv` when a message - is completely received. :c:type:`struct wslay_event_on_msg_recv_arg` is + is completely received. :c:type:`wslay_event_on_msg_recv_arg` is defined as follows:: struct wslay_event_on_msg_recv_arg { diff --git a/doc/sphinx/man/wslay_event_queue_fragmented_msg.rst b/doc/sphinx/man/wslay_event_queue_fragmented_msg.rst index faeff02..3d1db36 100644 --- a/doc/sphinx/man/wslay_event_queue_fragmented_msg.rst +++ b/doc/sphinx/man/wslay_event_queue_fragmented_msg.rst @@ -30,7 +30,7 @@ is defined as:: wslay_event_fragmented_msg_callback read_callback; }; -.. c:type:: typedef ssize_t (*wslay_event_fragmented_msg_callback)(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, const union wslay_event_msg_source *source, int *eof, void *user_data) +.. c:type:: ssize_t (*wslay_event_fragmented_msg_callback)(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, const union wslay_event_msg_source *source, int *eof, void *user_data) The *opcode* member is the opcode of the message. The *source* member is an union and normally it contains a "source" to -- 2.32.0
