From c99084ac5fc2fb854ff8e8abd4bd3298fb08fb43 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Sat, 9 Jan 2021 11:35:41 +0000
Subject: [PATCH] Fix #829: segfault with clutter-gtk

https://github.com/BestImageViewer/geeqie/issues/829

This fix might cause other problems which might be cured by calling:
LIBGL_ALWAYS_INDIRECT=1 geeqie

or, worst case:
geeqie --disable-clutter
---
 src/main.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main.c b/src/main.c
index f497240d..4af654fe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -904,11 +904,6 @@ gint main(gint argc, gchar *argv[])
 #ifdef HAVE_GTHREAD
 #if !GLIB_CHECK_VERSION(2,32,0)
 	g_thread_init(NULL);
-#endif
-#ifdef HAVE_CLUTTER
-/* FIXME: see below */
-	putenv("LIBGL_ALWAYS_INDIRECT=1");
-	XInitThreads();
 #endif
 	gdk_threads_init();
 	gdk_threads_enter();
-- 
2.34.0

 <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>refs</a><a class='active' href='/guix/log/gnu/services/ganeti.scm'>log</a><a href='/guix/tree/gnu/services/ganeti.scm?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>tree</a><a href='/guix/commit/gnu/services/ganeti.scm?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>commit</a><a href='/guix/diff/gnu/services/ganeti.scm?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/ganeti.scm'>
<input type='hidden' name='id' value='467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>root</a>/<a href='/guix/log/gnu?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>gnu</a>/<a href='/guix/log/gnu/services?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>services</a>/<a href='/guix/log/gnu/services/ganeti.scm?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8'>ganeti.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/ganeti.scm?id=467fb8abc515993ed39b1cfbbfcfc56ca47cfee8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-11-30 01:08:55 +0100'>2021-11-30</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=892f1b7273d57b25940700877a02618fe826cc08'>services: Accept &lt;inferior-package&gt;s in lieu of &lt;package&gt;s.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-11 18:59:44 +0200'>2021-10-11</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=fafa127d80d41df8afe96357ab30ec3dc6499122'>services: ganeti: Don't start the metadata daemon automatically.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-10-28 21:10:54 -0700'>2020-10-28</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=7db4dc60045082b79ea288573d8492a6e5d5903c'>gnu: ganeti-luxid-service-type: Fix typo.</a><span class='msg-avail'>...</span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2020-10-10 23:39:17 +0200'>2020-10-10</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=d7fb4199c770c3bd7ce755b1160aa19e9164f148'>services: ganeti: Fix typo.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-08-25 17:14:50 +0200'>2020-08-25</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=2e832d4b8a1c68a9f28d5953819954ee37d9800f'>services: ganeti-kvmd-service-type: Fix typo in description.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-07-21 23:54:44 +0200'>2020-07-21</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=938f3190e786baab4116ea826bde21d102396cc2'>services: ganeti: Fix erroneous gexp.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-07-19 14:23:16 +0200'>2020-07-19</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=41daf1286575f3a1998493c893f6d5a9c5b62de8'>services: ganeti: Use TLS on the remote API by default.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-07-16 21:51:44 +0200'>2020-07-16</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=9a622827559b223cc6b48733a82c74ce14a29bab'>services: Add ganeti.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>