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

t> <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=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>refs</a><a class='active' href='/guix/log/po/doc/guix-manual.fr.po'>log</a><a href='/guix/tree/po/doc/guix-manual.fr.po?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>tree</a><a href='/guix/commit/po/doc/guix-manual.fr.po?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>commit</a><a href='/guix/diff/po/doc/guix-manual.fr.po?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/doc/guix-manual.fr.po'>
<input type='hidden' name='id' value='af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'/><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=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>root</a>/<a href='/guix/log/po?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>po</a>/<a href='/guix/log/po/doc?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>doc</a>/<a href='/guix/log/po/doc/guix-manual.fr.po?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340'>guix-manual.fr.po</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/po/doc/guix-manual.fr.po?id=af2e9b413d6d31f0e8ef2dcd36ab5996c19e9340&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-28 16:41:18 +0100'>2021-01-28</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=a00af779047d92c0c0b4817b870bcae7fd610259'>nls: Update 'fr' translation.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-01-22 08:48:00 +0100'>2021-01-22</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=02e5c95db958a434a42c83f19c7f65437776831e'>Revert "nls: Update 'fr' translation."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 5d03ef73c3c1d995714abdaff650f73ac9fafc0f, which led
to these errors:

  /gnu/store/…-guix/fr.po:7206: 'msgstr' is not a valid Scheme format string, unlike 'msgid'. Reason: In the directive number 3, the character ' ' is not a valid conversion specifier.
  /gnu/store/…-guix/fr.po:7554: format specifications in 'msgid' and 'msgstr' are not equivalent
  /gnu/store/…-gettext-minimal-0.20.1/bin/msgfmt: found 2 fatal errors
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-01-22 00:31:28 +0100'>2021-01-22</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=5d03ef73c3c1d995714abdaff650f73ac9fafc0f'>nls: Update 'fr' translation.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-12-03 16:18:45 +0100'>2020-12-03</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=41fb3d5a9aa227b078fb95fdbf21d8198916a832'>nls: Update 'fr' translation of the manual.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-21 15:49:36 +0100'>2020-11-21</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=cf53ea79dda20c9ea90e3ca84bf7fdfd80b52e7d'>nls: Update 'fr' translation of the manual.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-09 00:14:17 +0100'>2020-11-09</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=f0ad0e85cdae95df17b2f66fec97fcf0a4e70a0b'>nls: Update 'fr' translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-11-03 12:47:43 +0100'>2020-11-03</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=595cd9cdb9070ffc6bb8e7b5c7d1285dcb756f8b'>nls: Update translations of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-10-30 00:59:37 +0100'>2020-10-30</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=61e839a9f9f7cc91982af696775c4f4ac72525f0'>nls: Update 'fr' translation of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-10-16 15:00:49 +0200'>2020-10-16</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=4dd989708c7ab34df0b60ce9b6c0a8ca5c15e858'>nls: Update manual translations.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-08-31 21:30:09 +0200'>2019-08-31</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=e60a3e74400efc9149083708e3369f1eeb6cb6d6'>nls: Update 'fr' translation of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2019-08-25 22:48:41 +0200'>2019-08-25</span></td><td><a href='/guix/commit/po/doc/guix-manual.fr.po?id=3bbd30e9b011d6f41e05de362c52c828bc07c8b5'>nls: Update 'fr' translation.</a></td><td>Ludovic Courtès</td></tr>