diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,4 +1,3 @@ -libX11.so.6 libc.so.6 libcairo.so.2 libchamplain-0.12.so.0 diff --git a/files/0001-Fix-segfault-with-clutter-gtk.patch b/files/0001-Fix-segfault-with-clutter-gtk.patch new file mode 100644 --- /dev/null +++ b/files/0001-Fix-segfault-with-clutter-gtk.patch @@ -0,0 +1,33 @@ +From f34ea0700048c27319a2256408171adda32a7580 Mon Sep 17 00:00:00 2001 +From: Colin Clark +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(); + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : geeqie version : '1.6' -release : 2 +release : 3 source : - https://github.com/BestImageViewer/geeqie/releases/download/v1.6/geeqie-1.6.tar.xz : 48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920 homepage : http://geeqie.org/ @@ -27,6 +27,7 @@ - perl-image-exiftool setup : | %patch -p1 < $pkgfiles/0001-Remove-Help-and-Changelog-references-to-docs.patch + %patch -p1 < $pkgfiles/0001-Fix-segfault-with-clutter-gtk.patch sed -i 's/\-Werror//' configure.ac %reconfigure build : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -89,8 +89,8 @@ - - 2020-12-02 + + 2021-01-13 1.6 Packaging update Algent Albrahimi