diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-14 18:51:10 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-14 18:51:10 +0000 |
commit | aa44121f587698ace480d5ca16ae9e64fe1b4d0b (patch) | |
tree | 51e169f07cbed2c1aca51f5e6ae3152233d68f27 /net-libs | |
parent | 7d58bf45ea7b2d8f188fd2aa40484a8c9a3381a7 (diff) |
gentoo auto-resync : 14:11:2022 - 18:51:10
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/Manifest.gz | bin | 32964 -> 32798 bytes | |||
-rw-r--r-- | net-libs/gnet/Manifest | 11 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-autotools.patch | 37 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch | 35 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-context-leak.patch | 32 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch | 16 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-network-tests.patch | 32 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch | 32 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-unittest-build.patch | 22 | ||||
-rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-unittest-service.patch | 31 | ||||
-rw-r--r-- | net-libs/gnet/gnet-2.0.8-r4.ebuild | 62 | ||||
-rw-r--r-- | net-libs/gnet/metadata.xml | 8 |
12 files changed, 0 insertions, 318 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex c33e02b96d02..55a66cf0cb1a 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest deleted file mode 100644 index faea0d02b96c..000000000000 --- a/net-libs/gnet/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX gnet-2.0.8-autotools.patch 892 BLAKE2B c59c7c00f3dfd0fec790ca2f7104541eca131f206feae99985c688c142724632acd0b82be14b80e498893a259fa4e84ffb262511413b251b98f04dd76736e6b1 SHA512 9d07c47fb800e7b49b4f6d57b63614045c1519349481c426916a5a2b10426856c18020e1fea7ed78721d41febe9083031f7175ae529312d4be3dc9ca363060d3 -AUX gnet-2.0.8-check-usage-update.patch 1256 BLAKE2B 5ccb69dc29f55cc9d71337fa7b11b41129874c8f0a6fc7e8aaad363cadeb962c8b3b9e0f7729759acd62ee13838dfab6bea704eea683904ccf1c53dd74679621 SHA512 e69486e5240c9816991c6774fb24b8edd4709f8310f2fc5fb2d6ac59e96f9e30b74553834e4c6eb7a48e476dcee6dadb43224449d2ec9ff98b568965c3f40e81 -AUX gnet-2.0.8-context-leak.patch 838 BLAKE2B d8b780575bc38db378a9a9fc49ef8e89cc32a84d105e461f33522a5f8319789ec6704e01be58ed8b08d95539a4a2fea3a1849f2f7c43d49be960dbd3cdf302d7 SHA512 7d9a86f2580659372679846ae64050481064081c77f0019b1edddc3e565da13ba2f683a856d483268dd7a2c75d319956b5fab9393c5af8dba132457a2dba620d -AUX gnet-2.0.8-fix-pkgconfig-abuse.patch 830 BLAKE2B e09a507471e04dea3ddf94a74a59b5b2924973b53328eb36b9f1c2d6c8097e497e494a903c61681b40d87d1cc34356885c58414d0b9d276fbfb19fdd35a855f6 SHA512 59b07d390fc1c8478346e86430e1fd8fb81286d4e68b8d3014bb59099855586e828292458071ebf02309f7b56e77918025ed7d43bf0df82270d0f17dcbb4bc6f -AUX gnet-2.0.8-network-tests.patch 811 BLAKE2B f653d24b26c945efcc560b00ee5546a7da12556b4b6518be6f400a41e309a4dbecbfb921df69328d927584bc3c27d2e3e36bff98269e00678ea8b86b40b709ab SHA512 c500dc6806f84eb1e6121fb35b6275f3cbabe3957aecdc246e4c68ae95b39e33fe1d82f76df767e1a463cb58aa9150e4469f7b30ab57a9d66a218f8064b48cb5 -AUX gnet-2.0.8-test-existing-domain.patch 1000 BLAKE2B 26d58d6bf8a8fe3b46e7cc892f9ba1d222419ae7dd7c5808a2b107fe068b8c85fd8dff00075ac06a5e0993e25b8d8382df02e6d347ab55e784220e62afdc33ec SHA512 5c514357bd7ef59a4d97154c436aaf60e38e4fd1aa479df1a750df2329369e486bae6e74e1e5dace5b0a8e0b8d130707c6b2b87deb1aeca3ed9a2c95974bab4e -AUX gnet-2.0.8-unittest-build.patch 1041 BLAKE2B 0efb7cd8f6d2b2cd8e775ad499614a4de2659153070f940a5326de36ca70b621b6ea41d27307cc62b67a20b3a490416884e3438b506c152f8370c2bb38468292 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773 -AUX gnet-2.0.8-unittest-service.patch 1093 BLAKE2B 572ac32893cf3221c9e2743a97bdf91dd60bba521ed54dac9252d260445d0da67b6b2eb68d5b21cd760f1e7e61b71c6f8ec7ffbce8b8ad4f248e27ba55bf505e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b -DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f -EBUILD gnet-2.0.8-r4.ebuild 1800 BLAKE2B b9e7ed89492115500670d8fc63c30e37160e4cddd8726b11cc7d35c8ca4139a33a8e181e30846cce8e8524eac06e267c48a22668a06a634be4ad36a3f980b9e2 SHA512 96dbbcebfbd677d05540f7734df8663661c63cc53cfb1cc712940225f04b0d681b86dad4e81af81b3638ab9d64cc5046fb1ce64b9e4f29f77ee06320dfaa034b -MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/net-libs/gnet/files/gnet-2.0.8-autotools.patch b/net-libs/gnet/files/gnet-2.0.8-autotools.patch deleted file mode 100644 index 760e41398fa6..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-autotools.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ - - # Init autoconf and automake - AC_INIT([gnet], [2.0.8], [gnet@gnetlibrary.org]) -+AC_CONFIG_MACRO_DIR([macros]) - AC_CANONICAL_SYSTEM - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) - AM_MAINTAINER_MODE -@@ -127,7 +128,6 @@ - ############################### - # Check for programs - AC_PROG_CC --AM_PROG_CC_STDC - AC_PROG_INSTALL - AC_PROG_MAKE_SET - AC_LIBTOOL_WIN32_DLL -@@ -551,9 +551,6 @@ - if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations" -- if test "x$enable_debug" = "xyes"; then -- CFLAGS="$CFLAGS -Werror" -- fi - - if test "x$enable_ansi" = "xyes"; then - CFLAGS="$CFLAGS -ansi" -@@ -610,7 +607,7 @@ - # Outputs - ############################### - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_FILES([ - Makefile - src/Makefile diff --git a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch deleted file mode 100644 index 0ca2156b791d..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a61601a487394cbd5970c3b736aea71bf277ecc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk> -Date: Sat, 16 Oct 2010 20:13:52 +0100 -Subject: [PATCH] tests: require check >= 0.9.7 for unit tests, and fix for new API - -The check API changed slightly. Fix things for the new API. - -https://bugzilla.gnome.org/show_bug.cgi?id=632258 ---- - tests/check/gnetcheck.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/check/gnetcheck.h b/tests/check/gnetcheck.h -index aeb9f68..14b6c28 100644 ---- a/tests/check/gnetcheck.h -+++ b/tests/check/gnetcheck.h -@@ -311,11 +311,11 @@ int main (int argc, char **argv) \ - gboolean _gnet_check_run_test_func (const gchar * func_name); - - static inline void --__gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name, -- int sig, int start, int end) -+__gnet_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal, -+ int allowed_exit_value, int start, int end) - { -- if (_gnet_check_run_test_func (func_name)) { -- _tcase_add_test (tc, tf, func_name, sig, start, end); -+ if (_gnet_check_run_test_func (fname)) { -+ _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end); - } - } - --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch deleted file mode 100644 index a56e549edccf..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d6997987ce7f3e84d1125715b17502452d085073 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tpm@src.gnome.org> -Date: Tue, 13 May 2008 07:10:28 +0000 -Subject: [PATCH] Don't leak main context ref when one was set. Spotted by Kuang-Chun Cheng. - - * src/conn.c: (gnet_conn_unref): - Don't leak main context ref when one was set. - Spotted by Kuang-Chun Cheng. - - -svn path=/trunk/; revision=495 ---- - src/conn.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/conn.c b/src/conn.c -index f4de415..9d41fa6 100644 ---- a/src/conn.c -+++ b/src/conn.c -@@ -305,6 +305,9 @@ gnet_conn_unref (GConn* conn) - if (conn->inetaddr) - gnet_inetaddr_delete (conn->inetaddr); - -+ if (conn->context) -+ g_main_context_unref (conn->context); -+ - g_free (conn->buffer); - - g_free (conn); --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch deleted file mode 100644 index 9c85b72d8e29..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch +++ /dev/null @@ -1,16 +0,0 @@ -Bug-Debian: http://bugs.debian.org/652165 -Author: Julien Cristau <jcristau@debian.org> - -use pkg-config to get the glib include path, not hardcode it. - ---- gnet-2.0.8.orig/gnet-2.0.pc.in -+++ gnet-2.0.8/gnet-2.0.pc.in -@@ -6,5 +6,6 @@ - Name: Gnet - Description: A network compatibility layer library - Version: @VERSION@ --Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@ @GTHREAD_LIBS@ --Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ -+Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -+Requires.private: glib-2.0 gthread-2.0 -+Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ diff --git a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch deleted file mode 100644 index 7bb7cefd133c..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 576f6de12bf4a509882af0bbe4727e27e8bc9373 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 16 Nov 2010 14:18:08 +0100 -Subject: [PATCH] Do not build network related tests if not enabled - ---- - tests/check/gnet/gnetconn.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/tests/check/gnet/gnetconn.c b/tests/check/gnet/gnetconn.c -index 739b467..0558e28 100644 ---- a/tests/check/gnet/gnetconn.c -+++ b/tests/check/gnet/gnetconn.c -@@ -25,6 +25,7 @@ - - #include <string.h> - -+#ifdef GNET_ENABLE_NETWORK_TESTS - static void - conn_fail_cb (GConn * conn, GConnEvent * event, gpointer data) - { -@@ -243,6 +244,7 @@ GNET_START_TEST (test_conn_new_socket) - g_main_loop_unref (loop); - } - GNET_END_TEST; -+#endif - - static Suite * - gnetconn_suite (void) --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch deleted file mode 100644 index b75258e38d02..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk> -Date: Sat, 16 Oct 2010 23:10:15 +0100 -Subject: tests: update GConnHttp unit test to not use inactive domains - -www.gnetlibrary.org has been abandoned. - -diff --git a/tests/check/gnet/gnetconnhttp.c b/tests/check/gnet/gnetconnhttp.c -index b1cecce..4316f74 100644 ---- a/tests/check/gnet/gnetconnhttp.c -+++ b/tests/check/gnet/gnetconnhttp.c -@@ -487,7 +487,7 @@ GNET_END_TEST; - - GNET_START_TEST (test_gnet_http_get) - { -- const gchar *urls[] = {"http://www.gnetlibrary.org/src/", -+ const gchar *urls[] = {"http://www.gnome.org/", - "http://www.heise.de" }; - guint i; - -@@ -514,7 +514,7 @@ GNET_END_TEST; - - GNET_START_TEST (test_get_binary) - { -- gchar *uris[] = { "http://www.gnetlibrary.org/gnet.png" }; -+ gchar *uris[] = { "http://www.gnome.org/img/logo/foot-16.png" }; - guint i; - - for (i = 0; i < G_N_ELEMENTS (uris); ++i) { --- -cgit v0.10.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch deleted file mode 100644 index 9527dbe5da65..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build failure with newer releases of check library. - ---- a/tests/check/gnetcheck.h 2014-09-27 15:32:17.088312230 +0200 -+++ b/tests/check/gnetcheck.h 2014-09-27 15:32:35.728239492 +0200 -@@ -281,7 +281,7 @@ - _gnet_check_expecting_log = TRUE; \ - _gnet_check_raised_critical = FALSE; \ - code; \ -- _fail_unless (_gnet_check_raised_critical, __FILE__, __LINE__, \ -+ (_gnet_check_raised_critical) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \ - "Expected g_critical, got nothing", NULL); \ - _gnet_check_expecting_log = FALSE; \ - } G_STMT_END -@@ -291,7 +291,7 @@ - _gnet_check_expecting_log = TRUE; \ - _gnet_check_raised_warning = FALSE; \ - code; \ -- _fail_unless (_gnet_check_raised_warning, __FILE__, __LINE__, \ -+ (_gnet_check_raised_warning) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \ - "Expected g_warning, got nothing", NULL); \ - _gnet_check_expecting_log = FALSE; \ - } G_STMT_END diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch deleted file mode 100644 index f2946aaf438c..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch +++ /dev/null @@ -1,31 +0,0 @@ -Disable unittests requiring a running HTTP server on port 80. - ---- a/tests/check/gnet/gnetinetaddr.c.old 2014-09-27 17:56:51.130350306 +0200 -+++ b/tests/check/gnet/gnetinetaddr.c 2014-09-27 17:57:23.396114568 +0200 -@@ -443,7 +443,7 @@ - - GNET_START_TEST (test_inetaddr_list_async) - { -- do_test_inetaddr_list_async ("localhost"); -+/* do_test_inetaddr_list_async ("localhost"); */ - /* FIXME: these might not work right yet because of the timings in the test - #ifdef GNET_ENABLE_NETWORK_TESTS - do_test_inetaddr_list_async ("www.google.com"); -@@ -573,7 +573,7 @@ - - GNET_START_TEST (test_inetaddr_name_async) - { -- do_test_inetaddr_name_async ("localhost"); -+/* do_test_inetaddr_name_async ("localhost"); */ - - /* FIXME: these might not work right yet because of the timings in the test - #ifdef GNET_ENABLE_NETWORK_TESTS -@@ -798,7 +798,7 @@ - - GNET_START_TEST (test_inetaddr_reverse_async) - { -- do_test_inetaddr_reverse_async ("localhost"); -+/* do_test_inetaddr_reverse_async ("localhost"); */ - - #ifdef GNET_ENABLE_NETWORK_TESTS - do_test_inetaddr_reverse_async ("gabe.freedesktop.org"); diff --git a/net-libs/gnet/gnet-2.0.8-r4.ebuild b/net-libs/gnet/gnet-2.0.8-r4.ebuild deleted file mode 100644 index 9beafdec55d7..000000000000 --- a/net-libs/gnet/gnet-2.0.8-r4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -GNOME2_EAUTORECONF="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 - -DESCRIPTION="A simple network library" -HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -# FIXME: automagic use of valgrind -RDEPEND=">=dev-libs/glib-2.6:2" -# FIXME: check should only be needed with USE 'test', bug #349301 -# test? ( >=dev-libs/check-0.9.7 )" -DEPEND="${RDEPEND} - >=dev-libs/check-0.9.11" -BDEPEND=" - >=dev-util/gtk-doc-am-1.2 - virtual/pkgconfig" - -PATCHES=( - # Do not leak main context reference, from master - "${FILESDIR}"/${PN}-2.0.8-context-leak.patch - - # Fix usage of check framework, bug #296849, from master - # Disable this patch, bug 698654 - # "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch - - # ifdef around network tests code, refs. bug #320759 - "${FILESDIR}"/${PN}-2.0.8-network-tests.patch - - # Do not hardcode glib patch in pkgconfig file, debian bug #652165 - "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch - - # Compatibility with recent check releases, bug #498046 - "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch - - # gnetlibrary.org has been adandoned, from master - "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch - - # Do not depend on a running HTTP server on port 80 for unittest - "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch - - # Do not pass silly cflags with USE=debug, bug #320759, #672170 - "${FILESDIR}"/${PN}-2.0.8-autotools.patch -) - -src_configure() { - # Do not enable network tests in an ebuild environment - gnome2_src_configure \ - --disable-static \ - --disable-network-tests -} diff --git a/net-libs/gnet/metadata.xml b/net-libs/gnet/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-libs/gnet/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> |