diff options
| author | joerg <joerg> | 2013-05-25 23:45:34 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-05-25 23:45:34 +0000 |
| commit | 9a465b3bd1e0cc71e68288eb7c8cbd3e73f2bc23 (patch) | |
| tree | b97af206ed46408c93dc331a2d5e7e1ce8fb5e35 /net | |
| parent | c6b7476b3f64c74a5c967e0434c668e28767f30e (diff) | |
| download | pkgsrc-9a465b3bd1e0cc71e68288eb7c8cbd3e73f2bc23.tar.gz | |
Avoid deprecated interfaces.
Diffstat (limited to 'net')
| -rw-r--r-- | net/linc/distinfo | 3 | ||||
| -rw-r--r-- | net/linc/patches/patch-src_linc.c | 52 |
2 files changed, 54 insertions, 1 deletions
diff --git a/net/linc/distinfo b/net/linc/distinfo index 345702fb8a5..83386b162f8 100644 --- a/net/linc/distinfo +++ b/net/linc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2012/05/07 00:20:34 dholland Exp $ +$NetBSD: distinfo,v 1.14 2013/05/25 23:45:34 joerg Exp $ SHA1 (linc-1.1.1.tar.bz2) = efebe15c4e29f9c03dfda04191161e557b1e1982 RMD160 (linc-1.1.1.tar.bz2) = 0b8607abf3a9fa877c83f43586e5227a3fb85d66 @@ -8,3 +8,4 @@ SHA1 (patch-include_linc_linc-connection_h) = a6bbddfc11f7bb40e129ea33c4d4589f6c SHA1 (patch-include_linc_linc-protocol_h) = 1b02124daa240ec827c841eb68f0bb02828a4ac3 SHA1 (patch-include_linc_linc-server_h) = 4d11642b396c7fbfe017e6f2bbaf21c3d86fa439 SHA1 (patch-include_linc_linc-types_h) = 1437a91a5a13966c79f015a93b183ad5c3de244c +SHA1 (patch-src_linc.c) = ced3dcef8c5b38d973ef1d725f77b9738c36e6be diff --git a/net/linc/patches/patch-src_linc.c b/net/linc/patches/patch-src_linc.c new file mode 100644 index 00000000000..9629af72cc6 --- /dev/null +++ b/net/linc/patches/patch-src_linc.c @@ -0,0 +1,52 @@ +$NetBSD: patch-src_linc.c,v 1.1 2013/05/25 23:45:34 joerg Exp $ + +--- src/linc.c.orig 2013-05-25 17:31:27.000000000 +0000 ++++ src/linc.c +@@ -182,15 +182,9 @@ linc_io_thread_fn (gpointer data) + void + linc_init (gboolean init_threads) + { +- if ((init_threads || linc_threaded) && +- !g_thread_supported ()) +- g_thread_init (NULL); +- + if (!linc_threaded && init_threads) + linc_threaded = TRUE; + +- g_type_init (); +- + /* + * Linc's raison d'etre is for ORBit2 and Bonobo + * +@@ -246,8 +240,6 @@ linc_init (gboolean init_threads) + linc_lifecycle_mutex = linc_mutex_new (); + + if (init_threads) { +- GError *error = NULL; +- + if (pipe (linc_wakeup_fds) < 0) /* cf. g_main_context_init_pipe */ + g_error ("Can't create CORBA main-thread wakeup pipe"); + +@@ -256,11 +248,9 @@ linc_init (gboolean init_threads) + NULL, (G_IO_IN | G_IO_PRI), + linc_mainloop_handle_input, NULL); + +- linc_io_thread = g_thread_create_full +- (linc_io_thread_fn, NULL, 0, TRUE, FALSE, +- G_THREAD_PRIORITY_NORMAL, &error); ++ linc_io_thread = g_thread_new("io", linc_io_thread_fn, NULL); + +- if (!linc_io_thread || error) ++ if (!linc_io_thread) + g_error ("Failed to create linc worker thread"); + } + } +@@ -317,7 +307,7 @@ linc_mutex_new (void) + linc_mutex_new_called = TRUE; + + #ifdef G_THREADS_ENABLED +- if (linc_threaded && g_thread_supported ()) ++ if (linc_threaded) + return g_mutex_new (); + #endif + |