CVS commit: pkgsrc/graphics/geeqie

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jan 11 18:18:58 UTC 2021

Modified Files:
        pkgsrc/graphics/geeqie: Makefile distinfo
        pkgsrc/graphics/geeqie/patches: patch-ac

Log Message:
graphics/geeqie: Fix clutter crash

Add patch cherry-picking an upstream commit, resolving crashes when
enabling clutter.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/geeqie/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/geeqie/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/geeqie/Makefile
diff -u pkgsrc/graphics/geeqie/Makefile:1.90 pkgsrc/graphics/geeqie/Makefile:1.91
--- pkgsrc/graphics/geeqie/Makefile:1.90        Sun Dec  6 10:22:21 2020
+++ pkgsrc/graphics/geeqie/Makefile     Mon Jan 11 18:18:58 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2020/12/06 10:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2021/01/11 18:18:58 gdt Exp $
 
 DISTNAME=      geeqie-1.6
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.geeqie.org/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/geeqie/distinfo
diff -u pkgsrc/graphics/geeqie/distinfo:1.20 pkgsrc/graphics/geeqie/distinfo:1.21
--- pkgsrc/graphics/geeqie/distinfo:1.20        Sun Dec  6 10:22:21 2020
+++ pkgsrc/graphics/geeqie/distinfo     Mon Jan 11 18:18:58 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2020/12/06 10:22:21 wiz Exp $
+$NetBSD: distinfo,v 1.21 2021/01/11 18:18:58 gdt Exp $
 
 SHA1 (geeqie-1.6.tar.xz) = f707374491170673e7a8db8c57eec7fc780045bf
 RMD160 (geeqie-1.6.tar.xz) = c104e9480a4d9fbf131bb50cad3e2d93c091dcb1
 SHA512 (geeqie-1.6.tar.xz) = 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 Size (geeqie-1.6.tar.xz) = 1693488 bytes
-SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
+SHA1 (patch-ac) = b85998dc728b92689bc34f4b2cfcbb44ce56a8e6

Index: pkgsrc/graphics/geeqie/patches/patch-ac
diff -u pkgsrc/graphics/geeqie/patches/patch-ac:1.5 pkgsrc/graphics/geeqie/patches/patch-ac:1.6
--- pkgsrc/graphics/geeqie/patches/patch-ac:1.5 Thu Sep 10 19:06:57 2015
+++ pkgsrc/graphics/geeqie/patches/patch-ac     Mon Jan 11 18:18:58 2021
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2015/09/10 19:06:57 gdt Exp $
+$NetBSD: patch-ac,v 1.6 2021/01/11 18:18:58 gdt Exp $
+
+* first hunk
 
 Comment from 2009/07/24:
 
@@ -7,9 +9,14 @@ Comment from 2009/07/24:
 
 This is not known to be reported upstream.
 
---- src/main.c.orig    2015-05-23 12:20:43.000000000 +0000
+* second hunk
+
+Avoid clutter crash.  Cherrypicked from upstream:
+  https://github.com/BestImageViewer/geeqie/commit/f34ea0700048c27319a2256408171adda32a7580
+
+--- src/main.c.orig    2020-11-20 21:36:33.000000000 +0000
 +++ src/main.c
-@@ -709,6 +709,7 @@ void exit_program(void)
+@@ -873,6 +873,7 @@ void exit_program(void)
   */
  /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
  
@@ -17,7 +24,7 @@ This is not known to be reported upstrea
  #if defined(SIGBUS) && defined(SA_SIGINFO)
  static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
  {
-@@ -717,9 +718,11 @@ static void sigbus_handler_cb(int signum
+@@ -881,9 +882,11 @@ static void sigbus_handler_cb(int signum
        mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
  }
  #endif
@@ -29,7 +36,7 @@ This is not known to be reported upstrea
  #if defined(SIGBUS) && defined(SA_SIGINFO)
        struct sigaction sigbus_action;
        sigfillset(&sigbus_action.sa_mask);
-@@ -728,6 +731,7 @@ static void setup_sigbus_handler(void)
+@@ -892,6 +895,7 @@ static void setup_sigbus_handler(void)
  
        sigaction(SIGBUS, &sigbus_action, NULL);
  #endif
@@ -37,3 +44,15 @@ This is not known to be reported upstrea
  }
  
  gint main(gint argc, gchar *argv[])
+@@ -905,11 +909,6 @@ gint main(gint argc, gchar *argv[])
+ #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();
+