From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- net-libs/gnet/Manifest | 12 ++++ .../gnet/files/gnet-2.0.8-check-usage-update.patch | 35 +++++++++++ net-libs/gnet/files/gnet-2.0.8-context-leak.patch | 32 +++++++++++ .../files/gnet-2.0.8-fix-pkgconfig-abuse.patch | 16 ++++++ net-libs/gnet/files/gnet-2.0.8-network-tests.patch | 32 +++++++++++ .../files/gnet-2.0.8-test-existing-domain.patch | 32 +++++++++++ .../gnet/files/gnet-2.0.8-unittest-build.patch | 22 +++++++ .../gnet/files/gnet-2.0.8-unittest-service.patch | 31 ++++++++++ net-libs/gnet/gnet-2.0.8-r2.ebuild | 67 ++++++++++++++++++++++ net-libs/gnet/metadata.xml | 8 +++ 10 files changed, 287 insertions(+) create mode 100644 net-libs/gnet/Manifest create mode 100644 net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch create mode 100644 net-libs/gnet/files/gnet-2.0.8-context-leak.patch create mode 100644 net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch create mode 100644 net-libs/gnet/files/gnet-2.0.8-network-tests.patch create mode 100644 net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch create mode 100644 net-libs/gnet/files/gnet-2.0.8-unittest-build.patch create mode 100644 net-libs/gnet/files/gnet-2.0.8-unittest-service.patch create mode 100644 net-libs/gnet/gnet-2.0.8-r2.ebuild create mode 100644 net-libs/gnet/metadata.xml (limited to 'net-libs/gnet') diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest new file mode 100644 index 000000000000..ecb94ab39ced --- /dev/null +++ b/net-libs/gnet/Manifest @@ -0,0 +1,12 @@ +AUX gnet-2.0.8-check-usage-update.patch 1256 SHA256 f6013b797ba9f5e0bf0bcf9f0d3686d672b29e059bd1c1d99b244288d40a16d5 SHA512 e69486e5240c9816991c6774fb24b8edd4709f8310f2fc5fb2d6ac59e96f9e30b74553834e4c6eb7a48e476dcee6dadb43224449d2ec9ff98b568965c3f40e81 WHIRLPOOL a893a33d3ff8eed735d33ff685e8c10f04ad123a4a6cbe415942b1d31ffa1a6e746ced95d71dfdd7b28acaf960830ce76882a449c51c0a4a9b57b46d00c5e63f +AUX gnet-2.0.8-context-leak.patch 838 SHA256 ff68ff73a8b46d6b78713aacb47ae558671dc241a01019b63fd0638c9fe102f8 SHA512 7d9a86f2580659372679846ae64050481064081c77f0019b1edddc3e565da13ba2f683a856d483268dd7a2c75d319956b5fab9393c5af8dba132457a2dba620d WHIRLPOOL 867d21e0b5e806e4e6fe3aa6bc33593bfccaa41495fcc38688e48852b512f77cdd6f6b7b000ddb322616197b2c4a816d677555ee0ec6756cd6671b826680f936 +AUX gnet-2.0.8-fix-pkgconfig-abuse.patch 830 SHA256 a6e9008880da95d4d57c4e8cbf92ca41f5dac9b6e8fa4e82fd9cda9eb240d5f7 SHA512 59b07d390fc1c8478346e86430e1fd8fb81286d4e68b8d3014bb59099855586e828292458071ebf02309f7b56e77918025ed7d43bf0df82270d0f17dcbb4bc6f WHIRLPOOL 59aec0dfa87b279c1ff3d617604d364b9a96a192b18fa3bc8745f1b77b3a2876646bc46754ea970ef09221c847925a7afe4ef971cafed563cf16781c2388fb5a +AUX gnet-2.0.8-network-tests.patch 811 SHA256 0883e4a0d6c19e96f2f168b201966fe33ced2f17462fcd0231c682b2fdfd7b76 SHA512 c500dc6806f84eb1e6121fb35b6275f3cbabe3957aecdc246e4c68ae95b39e33fe1d82f76df767e1a463cb58aa9150e4469f7b30ab57a9d66a218f8064b48cb5 WHIRLPOOL e3f00018f4fb441eadb5b1e70980e084813a56d53cf850b9145831bc3cbaeb3e2fdfcd6f7371922f96ce07063fd4234ff28d9ab93364ef9019710c0c407b912d +AUX gnet-2.0.8-test-existing-domain.patch 1000 SHA256 4f9cc07979fe08b63f5b0c64461e7ad698348d82ecd2f6b9edc74a60d1e9ef4d SHA512 5c514357bd7ef59a4d97154c436aaf60e38e4fd1aa479df1a750df2329369e486bae6e74e1e5dace5b0a8e0b8d130707c6b2b87deb1aeca3ed9a2c95974bab4e WHIRLPOOL 7a6f46db09c65908784918d8418b16bb9b1b5ef5de572132058b463705331aac542d5b4b4851da196d535affc81c218f81bc19eb8ef15e9399026558ae776e1b +AUX gnet-2.0.8-unittest-build.patch 1041 SHA256 6ee1a7a7bf0090ac07129d6723faf812c280dac14344e289a96e9f4fe4334df5 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773 WHIRLPOOL c63ccdb0a23a48e151bb63f6a2a67b1ada93c409b43b9daef50d4e6d031098ce7602c87cbcb479ca799c5747509ee0543771c842b69ad5f508e0092ff9f01d95 +AUX gnet-2.0.8-unittest-service.patch 1093 SHA256 a83fa961f1d25e02f22eadd51ad0cd03ebd9c65512915c1962c7a6401b434f1e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b WHIRLPOOL 7a5c4096d7dccfbe0468793f8097c211b2d46c6c7259d18a7eef0e9d61c29e55e7e49148f498b97b4a972a82903711f6ecd74e15bfcbd34175c8e328e0e34eac +DIST gnet-2.0.8.tar.bz2 514019 SHA256 14034c7ef571a93f2aca21b2280fa86b35ef5730541d3eb57557dd42d7cc506b SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f WHIRLPOOL f259f28194b9932f30a72cfe9cbd7a645dbf18a0d02b8b3a506e4bf90ffb77a76f45500142d0b7b2e2c370f0da2f40e99710f5599336ff7d1080de108a60cbfd +EBUILD gnet-2.0.8-r2.ebuild 1971 SHA256 737d37fb88cd71ab8b111b699ebfe3fe3995aba6f5c7fe1c8e1c707516c5e1e9 SHA512 5a39460034ce9131a07a7f861cc017344878a505f9779b0cd32f0f03c7c8220b7d629761f4389a7484877659f1a375ad803ec37621ece792ea562708913ad4bf WHIRLPOOL f881b97dd40c2df5ccea1660ea1716b9c95dbbe6a880bc60e90a084543cc0a011f3f5447fae6c9c36c880ec7be57f12df5ead03323cbb9f973b342dd6b7cd699 +MISC ChangeLog 2945 SHA256 2c79811bee59dc891aadf19a822cb7c4e1e026fad29c06e1551ec590bbd9238a SHA512 eb95293e299d3ee77edcd167d2310d2f41067f6193b6888d659e974aa9da1b6e41b30ee52081d3d464d04d2a6d74efd08a2f84aff57f84cabd75402e5391df6e WHIRLPOOL c593631377e3108c84b9771e90edf1402349a5ddaaef26b86a1a879657f9348ddc7f2114b97a8c3d213abf6c4bb5f0577d1f99b9dae115385ec324f71584dba8 +MISC ChangeLog-2015 11445 SHA256 2c44db54f2f7cd736605f49f8ea6f943590c76061cd289d38ca7c535482400ec SHA512 7733e0056232ba1680231e0cb86213a9ff111a6814a18975f6ccd02cc7e3e4720a25b7aa41670011d8e32943dc8ee1247610cef8b2bd6116bbc51d07ba79b6c0 WHIRLPOOL f8a65802983c73e9e82da0274cbdacc1774e74c8fac9a434d06aed47f833c3f45aa60c4abff96bf195c32244257d0ad57b28455ca7bed65227be403c905abf69 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 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 new file mode 100644 index 000000000000..0ca2156b791d --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch @@ -0,0 +1,35 @@ +From a61601a487394cbd5970c3b736aea71bf277ecc1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +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 new file mode 100644 index 000000000000..a56e549edccf --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch @@ -0,0 +1,32 @@ +From d6997987ce7f3e84d1125715b17502452d085073 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +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 new file mode 100644 index 000000000000..9c85b72d8e29 --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch @@ -0,0 +1,16 @@ +Bug-Debian: http://bugs.debian.org/652165 +Author: Julien Cristau + +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 new file mode 100644 index 000000000000..7bb7cefd133c --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch @@ -0,0 +1,32 @@ +From 576f6de12bf4a509882af0bbe4727e27e8bc9373 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +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 + ++#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 new file mode 100644 index 000000000000..b75258e38d02 --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch @@ -0,0 +1,32 @@ +From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +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 new file mode 100644 index 000000000000..9527dbe5da65 --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch @@ -0,0 +1,22 @@ +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 new file mode 100644 index 000000000000..f2946aaf438c --- /dev/null +++ b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch @@ -0,0 +1,31 @@ +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-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r2.ebuild new file mode 100644 index 000000000000..2f980c56423d --- /dev/null +++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit autotools eutils 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="test" + +# FIXME: automagic use of valgrind +RDEPEND=">=dev-libs/glib-2.6:2" +DEPEND="${RDEPEND} + >=dev-libs/check-0.9.11 + >=dev-util/gtk-doc-am-1.2 + virtual/pkgconfig +" +# FIXME: check should only be needed with USE 'test', bug #349301 +# test? ( >=dev-libs/check-0.9.7 )" + +src_prepare() { + # Do not leak main context reference, from master + epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch + + # Fix usage of check framework, bug #296849, from master + epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch + + # ifdef around network tests code, refs. bug #320759 + epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch + + # Do not hardcode glib patch in pkgconfig file, debian bug #652165 + epatch "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch + + # Compatibility with recent check releases, bug #498046 + epatch "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch + + # gnetlibrary.org has been adandoned, from master + epatch "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch + + # Do not depend on a running HTTP server on port 80 for unittest + epatch "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch + + # Do not pass silly cflags with USE=debug, bug #320759 + sed -i \ + -e 's:-Werror::' \ + -e '/AM_PROG_CC_STDC/d' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \ + configure.ac || die + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO" + # 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 new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/net-libs/gnet/metadata.xml @@ -0,0 +1,8 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + -- cgit v1.2.3