File libsearpc-fix-compilation-glib2_68.patch of Package libsearpc

Overview Repositories Revisions Requests Users Attributes Meta

File libsearpc-fix-compilation-glib2_68.patch of Package libsearpc (Revision a69ebb0632dec16b4098046940d4a3b7)

Currently displaying revision a69ebb0632dec16b4098046940d4a3b7 , Show latest

From 36d75a8efe3f0f66a33acbe28f13ba729ed27fbe Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Fri, 12 Feb 2021 08:58:26 +0000
Subject: [PATCH] Wrap public declarations with G_BEGIN_DECLS/G_END_DECLS

Glib release 2.67.3 started conditionally using some C++ code[1] in the
public headers and it's no longer legal to include "glib.h" or anything
that includes it transitively from `extern "C"` block.

The solution recommended by the glib developers is to enclose all
declarations in a header within G_BEGIN_DECLS and G_END_DECLS as shown
in gobject developer manual[2].

[1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
[2] https://developer.gnome.org/gobject/stable/howto-gobject.html#howto-gobject-header
---
 lib/searpc-client.h               | 3 +++
 lib/searpc-named-pipe-transport.h | 4 ++++
 lib/searpc-server.h               | 4 ++++
 lib/searpc-utils.h                | 4 ++++
 4 files changed, 15 insertions(+)

Index: libsearpc-3.2.0.20220425/lib/searpc-client.h
===================================================================
--- libsearpc-3.2.0.20220425.orig/lib/searpc-client.h
+++ libsearpc-3.2.0.20220425/lib/searpc-client.h
@@ -19,6 +19,8 @@ extern "C" {
 #define DFT_DOMAIN g_quark_from_string(G_LOG_DOMAIN)
 #endif
 
+G_BEGIN_DECLS
+
 typedef char *(*TransportCB)(void *arg, const gchar *fcall_str,
                              size_t fcall_len, size_t *ret_len);
 
@@ -145,5 +147,6 @@ searpc_client_generic_callback (char *re
 }
 #endif
 
+G_END_DECLS
 
 #endif
Index: libsearpc-3.2.0.20220425/lib/searpc-named-pipe-transport.h
===================================================================
--- libsearpc-3.2.0.20220425.orig/lib/searpc-named-pipe-transport.h
+++ libsearpc-3.2.0.20220425/lib/searpc-named-pipe-transport.h
@@ -20,6 +20,8 @@ extern "C" {
 #define LIBSEARPC_API
 #endif
 
+G_BEGIN_DECLS
+
 // Implementatin of a searpc transport based on named pipe. It uses unix domain
 // sockets on linux/osx, and named pipes on windows.
 //
@@ -80,4 +82,6 @@ void searpc_free_client_with_pipe_transp
 }
 #endif
 
+G_END_DECLS
+
 #endif // SEARPC_NAMED_PIPE_TRANSPORT_H
Index: libsearpc-3.2.0.20220425/lib/searpc-server.h
===================================================================
--- libsearpc-3.2.0.20220425.orig/lib/searpc-server.h
+++ libsearpc-3.2.0.20220425/lib/searpc-server.h
@@ -19,6 +19,8 @@ extern "C" {
 #define DFT_DOMAIN g_quark_from_string(G_LOG_DOMAIN)
 #endif
 
+G_BEGIN_DECLS
+
 typedef gchar* (*SearpcMarshalFunc) (void *func, json_t *param_array,
     gsize *ret_len);
 typedef void (*RegisterMarshalFunc) (void);
@@ -142,4 +144,6 @@ char* searpc_compute_signature (const gc
 }
 #endif
 
+G_END_DECLS
+
 #endif
Index: libsearpc-3.2.0.20220425/lib/searpc-utils.h
===================================================================
--- libsearpc-3.2.0.20220425.orig/lib/searpc-utils.h
+++ libsearpc-3.2.0.20220425/lib/searpc-utils.h
@@ -10,6 +10,8 @@
 
 #define SEARPC_JSON_DOMAIN g_quark_from_string("SEARPC_JSON")
 
+G_BEGIN_DECLS
+
 typedef enum {
     SEARPC_JSON_ERROR_LOAD,
     SEARPC_JSON_ERROR_PACK,
@@ -80,3 +82,5 @@ inline static void json_array_add_json_o
         json_array_append_new (array, json_null ());
     }
 }
+
+G_END_DECLS

Places

File libsearpc-fix-compilation-glib2_68.patch of Package libsearpc (Revision a69ebb0632dec16b4098046940d4a3b7)

Places