From 1d18b53ed419c49eb3f71637ccd58a431c1368d4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Apr 2023 05:44:50 +0100 Subject: gentoo auto-resync : 14:04:2023 - 05:44:49 --- net-libs/libsearpc/Manifest | 3 +- .../libsearpc/files/libsearpc-3.3.0-clang16.patch | 164 +++++++++++++++++++++ net-libs/libsearpc/libsearpc-3.3.0-r1.ebuild | 46 ++++++ net-libs/libsearpc/libsearpc-3.3.0.ebuild | 42 ------ 4 files changed, 212 insertions(+), 43 deletions(-) create mode 100644 net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch create mode 100644 net-libs/libsearpc/libsearpc-3.3.0-r1.ebuild delete mode 100644 net-libs/libsearpc/libsearpc-3.3.0.ebuild (limited to 'net-libs/libsearpc') diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest index 116c71645bcb..b760a333a169 100644 --- a/net-libs/libsearpc/Manifest +++ b/net-libs/libsearpc/Manifest @@ -1,7 +1,8 @@ +AUX libsearpc-3.3.0-clang16.patch 4788 BLAKE2B 4606c82c47f7c5be22a160fffc5b914ffaf229ebef76401657f0f62f1eaeb2f768716f5267d48cff2420503f629fe19246428cb63d715416e66d8efdaeba497d SHA512 5223412dd582a5c2f708612557d4cadee900c97843aff108bceac4c58abed393192fbf99b85f89115daf233268906d417f6f32dd1d2ff653305fdd698348a68d DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd DIST libsearpc-3.2.0_p1.tar.gz 54011 BLAKE2B 9bdfa72b207eb57d1242384e5581eea9083f4f30616a9bc8da1255b281c0a847ec1fc6d23db7510dc7988a67d7c836762b8343ac4fdffe07ce6296b65d9cf8c8 SHA512 2e1580ffa54e233b078385a94d2d9a7e080bfb2f8ccbaf96645c94f86d0eda686bd84277341cff39840afa03fc67abd05cb2f57a81d117fff4773280f9da265a DIST libsearpc-3.3.0.tar.gz 54140 BLAKE2B 6645a7e4c14c9d50b59ce8ebaecd13bb247d16d66449b0d251d27d12d46507cc2e4b8468e87f6f1b222da2243b59fc01b69349eb06e96b5cd0d6aabd1aeff72b SHA512 0fd07dcd417b540cb8ed53f1103a03bc6b1a2b9bbb8ca0858aef44a352e3d5d2b6ad51901a29ac6be27acfe25f93233530003982315d0f6e268fa43992f04240 EBUILD libsearpc-3.2.0-r2.ebuild 827 BLAKE2B 0ebbba012308b596e8698decfd326d4381463ef00284f41d4d82323845215c6ff87e3e99552dab209dedbfb22810107b41b908151edccedd4a911f02dc93757f SHA512 e6e058ff8661795cc06b5d961a61d9d38d89aaf1a6825fa0f55a5161e1edcf430887b0094142086448000941a7106aa5b6aed9b601d1b592713c07b6f33d460a EBUILD libsearpc-3.2.0_p1.ebuild 1018 BLAKE2B 2a87c16945071f6d5c332ec1560f3af5332a5ba75e4e849008b21cc4d4e499397fe333823e872db12d5e8c3e949aaf00c3cbd6abacc5222e7aa565faa3b120f2 SHA512 f347d2275f34a4728fde349a05b85d665e0b404f1490141ec875bbcfcd3765b29c475a23ccc06239f79cefe50a33a15f8db02c389a749afaf0e9ddc8def8a3d3 -EBUILD libsearpc-3.3.0.ebuild 1017 BLAKE2B 128a84a7b2a0d93312040cf75ec614edb19f037d5127d06ea9e91cbcab06602129d5503cbec0f557509dd7efb02db3c045bbcc891102d2c2842aa8bb27c19e71 SHA512 9ba55beda6557226b353d4c393fcc9aa672748826e57eff4165c8663c84220bb726b3d1e5e5f4b42efefb4eeb2a7d0bb576dce7ab72f063db9682b078ddc99c3 +EBUILD libsearpc-3.3.0-r1.ebuild 1072 BLAKE2B 8886acd2fc410f4a2e2260626fe76935aaacce7892be658731625e7215131f00a937ffb628a28a76ad0fbcd6e4b54ddb05221f9503a347dae3fe1d32f7e327fa SHA512 fa14f339c15d1da3c424ccc559c4081551b454f031b2f3a48c57fcb71ab142b54749f9af28de34bb1b20ba56b0f7a8009cf4c7eb61a4d5ecb0501c079e906faf MISC metadata.xml 480 BLAKE2B 087b5283b9c24e54190f2d964757dc82df0b887fc0ed1c6f70669bd2ca96ff3b098a31558993b982e5427c2c0b7a5ed86fe7fe44159fd494d4a7665ad00b5c7a SHA512 8497088fc5dd29ca69b2100c293562dd5f07c06d37d8097448b1233c17328c17618b3a4259dbf82ad6c2c32add052f288ee15d54ee1ae3bb0dbf7fcfc3d93cfa diff --git a/net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch b/net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch new file mode 100644 index 000000000000..3bdc191b1b1d --- /dev/null +++ b/net-libs/libsearpc/files/libsearpc-3.3.0-clang16.patch @@ -0,0 +1,164 @@ +https://bugs.gentoo.org/870544 +https://github.com/haiwen/libsearpc/pull/63 + +From ae466d2b3b503f4831bc701e97d0a600e23fed60 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 8 Apr 2023 16:53:07 -0700 +Subject: [PATCH 1/2] Fix -Werror=strict-prototypes + +--- + lib/searpc-client.c | 2 +- + lib/searpc-client.h | 2 +- + lib/searpc-codegen.py | 4 ++-- + lib/searpc-server.c | 2 +- + lib/searpc-server.h | 2 +- + tests/clar.c | 4 ++-- + tests/searpc.c | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/lib/searpc-client.c b/lib/searpc-client.c +index 050a524..916241a 100644 +--- a/lib/searpc-client.c ++++ b/lib/searpc-client.c +@@ -36,7 +36,7 @@ static void clean_objlist(GList *list) + + + SearpcClient * +-searpc_client_new () ++searpc_client_new (void) + { + return g_new0 (SearpcClient, 1); + } +diff --git a/lib/searpc-client.h b/lib/searpc-client.h +index 725fadd..157a407 100644 +--- a/lib/searpc-client.h ++++ b/lib/searpc-client.h +@@ -44,7 +44,7 @@ struct _SearpcClient { + typedef struct _SearpcClient LIBSEARPC_API SearpcClient; + + LIBSEARPC_API +-SearpcClient *searpc_client_new (); ++SearpcClient *searpc_client_new (void); + + LIBSEARPC_API void + searpc_client_free (SearpcClient *client); +diff --git a/lib/searpc-codegen.py b/lib/searpc-codegen.py +index dbbf8c9..acee024 100644 +--- a/lib/searpc-codegen.py ++++ b/lib/searpc-codegen.py +@@ -139,7 +139,7 @@ def generate_marshal_register_item(ret_type, arg_types): + signature_name=signature_name) + + def gen_marshal_register_function(f): +- write_file(f, "static void register_marshals()""") ++ write_file(f, "static void register_marshals(void)""") + write_file(f, "{") + for item in func_table: + write_file(f, generate_marshal_register_item(item[0], item[1])) +@@ -147,7 +147,7 @@ def gen_marshal_register_function(f): + + signature_template = r""" + inline static gchar * +-${signature_name}() ++${signature_name}(void) + { + return searpc_compute_signature (${args}); + } +diff --git a/lib/searpc-server.c b/lib/searpc-server.c +index 3d6dc09..a82fbe4 100644 +--- a/lib/searpc-server.c ++++ b/lib/searpc-server.c +@@ -248,7 +248,7 @@ searpc_server_reopen_slow_log (const char *slow_log_path) + #endif + + void +-searpc_server_final() ++searpc_server_final(void) + { + g_hash_table_destroy (service_table); + g_hash_table_destroy (marshal_table); +diff --git a/lib/searpc-server.h b/lib/searpc-server.h +index 02722a4..aa1a9fe 100644 +--- a/lib/searpc-server.h ++++ b/lib/searpc-server.h +@@ -67,7 +67,7 @@ searpc_server_reopen_slow_log (const char *slow_log_path); + * Free the server structure. + */ + LIBSEARPC_API +-void searpc_server_final (); ++void searpc_server_final (void); + + /** + * searpc_create_service: +diff --git a/tests/clar.c b/tests/clar.c +index 1546447..81da15a 100644 +--- a/tests/clar.c ++++ b/tests/clar.c +@@ -371,7 +371,7 @@ clar_test_init(int argc, char **argv) + } + + int +-clar_test_run() ++clar_test_run(void) + { + if (_clar.argc > 1) + clar_parse_args(_clar.argc, _clar.argv); +@@ -386,7 +386,7 @@ clar_test_run() + } + + void +-clar_test_shutdown() ++clar_test_shutdown(void) + { + clar_print_shutdown( + _clar.tests_ran, +diff --git a/tests/searpc.c b/tests/searpc.c +index 4c7edb7..7a2d5a5 100644 +--- a/tests/searpc.c ++++ b/tests/searpc.c +@@ -204,7 +204,7 @@ get_substring (const gchar *orig_str, int sub_len, GError **error) + } + + static SearpcClient * +-do_create_client_with_pipe_transport() ++do_create_client_with_pipe_transport(void) + { + SearpcNamedPipeClient *pipe_client = searpc_create_named_pipe_client(pipe_path); + cl_must_pass_(searpc_named_pipe_client_connect(pipe_client), "named pipe client failed to connect"); + +From d78aede0e4c559fa3dbce0e64ffc943da47fe76c Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 8 Apr 2023 17:13:55 -0700 +Subject: [PATCH 2/2] Fix -Werror=implicit-function-declaration + +unistd.h is needed for write, close and read +--- + demo/searpc-demo-packet.h | 1 + + demo/test-object.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/demo/searpc-demo-packet.h b/demo/searpc-demo-packet.h +index 926f36b..6552396 100644 +--- a/demo/searpc-demo-packet.h ++++ b/demo/searpc-demo-packet.h +@@ -4,6 +4,7 @@ + + #include + #include ++#include + #include + + #ifdef WIN32 +diff --git a/demo/test-object.h b/demo/test-object.h +index f3f7589..a6d8b5d 100644 +--- a/demo/test-object.h ++++ b/demo/test-object.h +@@ -4,6 +4,8 @@ + #include + #include + ++GType test_object_get_type (void); ++ + #define TEST_OBJECT_TYPE (test_object_get_type()) + #define TEST_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_OBJECT_TYPE, TestObject)) + #define IS_TEST_OBJCET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_OBJCET_TYPE)) diff --git a/net-libs/libsearpc/libsearpc-3.3.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.3.0-r1.ebuild new file mode 100644 index 000000000000..9df86b3f3be3 --- /dev/null +++ b/net-libs/libsearpc/libsearpc-3.3.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="15f6f0b9f451b9ecf99dedab72e9242e54e124eb" #tag v3.3-latest + +inherit autotools python-single-r1 + +DESCRIPTION="A simple C language RPC framework" +HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/" +SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + >=dev-libs/glib-2.26.0 + >=dev-libs/jansson-2.2.1:=" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + dev-python/simplejson[${PYTHON_USEDEP}] + ')" + +S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch #870544 +) + +src_prepare() { + default + sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die + eautoreconf +} + +src_install() { + default + # Remove unnecessary .la files + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-libs/libsearpc/libsearpc-3.3.0.ebuild b/net-libs/libsearpc/libsearpc-3.3.0.ebuild deleted file mode 100644 index 0cb48cecbff4..000000000000 --- a/net-libs/libsearpc/libsearpc-3.3.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -# Upstream is moving tags repeatedly, then we use commit hash. -RELEASE_COMMIT="15f6f0b9f451b9ecf99dedab72e9242e54e124eb" #tag v3.3-latest - -inherit autotools python-single-r1 - -DESCRIPTION="A simple C language RPC framework" -HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.26.0 - >=dev-libs/jansson-2.2.1:=" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/simplejson[${PYTHON_USEDEP}] - ')" - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_prepare() { - default - sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die - eautoreconf -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3