CVS commit: pkgsrc/wm/enlightenment16

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jul 14 00:53:02 UTC 2022

Modified Files:
        pkgsrc/wm/enlightenment16: Makefile distinfo
Added Files:
        pkgsrc/wm/enlightenment16/patches: patch-src_menus.c

Log Message:
enlightenment16: add an upstream fix for a crasher bug

This will be in the next release, but those are infrequent, so add it
here now.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/wm/enlightenment16/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/wm/enlightenment16/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/enlightenment16/patches/patch-src_menus.c

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

Modified files:

Index: pkgsrc/wm/enlightenment16/Makefile
diff -u pkgsrc/wm/enlightenment16/Makefile:1.20 pkgsrc/wm/enlightenment16/Makefile:1.21
--- pkgsrc/wm/enlightenment16/Makefile:1.20     Sat Jul  2 16:53:37 2022
+++ pkgsrc/wm/enlightenment16/Makefile  Thu Jul 14 00:53:02 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/07/02 16:53:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2022/07/14 00:53:02 gutteridge Exp $
 
 DISTNAME=      e16-1.0.25
 PKGNAME=       ${DISTNAME:S/e/enlightenment/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 

Index: pkgsrc/wm/enlightenment16/distinfo
diff -u pkgsrc/wm/enlightenment16/distinfo:1.8 pkgsrc/wm/enlightenment16/distinfo:1.9
--- pkgsrc/wm/enlightenment16/distinfo:1.8      Tue Jun 14 01:50:32 2022
+++ pkgsrc/wm/enlightenment16/distinfo  Thu Jul 14 00:53:02 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2022/06/14 01:50:32 gutteridge Exp $
+$NetBSD: distinfo,v 1.9 2022/07/14 00:53:02 gutteridge Exp $
 
 BLAKE2s (e16-1.0.25.tar.gz) = 992c5e56d045f797fa2010b6bd8ffc2da7390809fc0530f7b06063405de6aca8
 SHA512 (e16-1.0.25.tar.gz) = 6c69c2e345350115281c822805a072644cf3ce6c16e5c963146924ed94af235c51c5fd846ebba9ad97a6da2c397eafc54d3ffbcd460bb14c903ef3a4bf0621b1
 Size (e16-1.0.25.tar.gz) = 2395514 bytes
 SHA1 (patch-ac) = a5a2f2b0377212178480cc94e6975dd4ff364ced
+SHA1 (patch-src_menus.c) = 8ae49e4fcd0733e0e9afea41a1038f5c52167cc6

Added files:

Index: pkgsrc/wm/enlightenment16/patches/patch-src_menus.c
diff -u /dev/null pkgsrc/wm/enlightenment16/patches/patch-src_menus.c:1.1
--- /dev/null   Thu Jul 14 00:53:02 2022
+++ pkgsrc/wm/enlightenment16/patches/patch-src_menus.c Thu Jul 14 00:53:02 2022
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_menus.c,v 1.1 2022/07/14 00:53:02 gutteridge Exp $
+
+Fix potential crash if a currently displayed menu is re-requested.
+Upstream commit:
+http://git.enlightenment.org/e16/e16/commit/6369dfa7ddac282310fce83505212d8c9cf8f0e8
+
+--- src/menus.c.orig   2022-06-13 06:00:07.000000000 +0000
++++ src/menus.c
+@@ -1150,13 +1150,16 @@ MenusShowNamed(const char *name, const c
+    if (name2)
+       name = name2;
+ 
++   m = MenuFind(name, param);
++   if (m && m->shown)
++      return;                 /* Quit if already shown */
++
+    /* Hide any menus currently up */
+    if (MenusActive())
+       MenusHide();
+ 
+-   m = MenuFind(name, param);
+    if (!m)
+-      return;
++      return;                 /* Quit if menu not found */
+ 
+    if (!m->ewin)              /* Don't show if already shown */
+       MenuShow(m, 0);