diff options
author | gutteridge <gutteridge@pkgsrc.org> | 2022-11-26 22:51:03 +0000 |
---|---|---|
committer | gutteridge <gutteridge@pkgsrc.org> | 2022-11-26 22:51:03 +0000 |
commit | 387bd5c80d313115f1813f704ec5da32c32ea61b (patch) | |
tree | d0d6cfd3afcb112cb0eb10d5e2739ace6a040f10 /wm | |
parent | 6b44632e632f83213f3e3c8e0a0914ab5e42ef32 (diff) | |
download | pkgsrc-387bd5c80d313115f1813f704ec5da32c32ea61b.tar.gz |
enlightenment16: update to 1.0.27
e16 v1.0.27 - 2022-11-25
------------------------
- 1.0.27
- e_gen_menu: Fix menu generation
- timers: Properly fix timer lockup issue
- timers: Fix potential lockup when switching desks fast
Diffstat (limited to 'wm')
-rw-r--r-- | wm/enlightenment16/Makefile | 5 | ||||
-rw-r--r-- | wm/enlightenment16/distinfo | 9 | ||||
-rw-r--r-- | wm/enlightenment16/patches/patch-src_timers.c | 109 |
3 files changed, 6 insertions, 117 deletions
diff --git a/wm/enlightenment16/Makefile b/wm/enlightenment16/Makefile index bbea35a3bea..90078c079fc 100644 --- a/wm/enlightenment16/Makefile +++ b/wm/enlightenment16/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2022/11/13 00:52:01 gutteridge Exp $ +# $NetBSD: Makefile,v 1.25 2022/11/26 22:51:03 gutteridge Exp $ -DISTNAME= e16-1.0.26 +DISTNAME= e16-1.0.27 PKGNAME= ${DISTNAME:S/e/enlightenment/} -PKGREVISION= 1 CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/wm/enlightenment16/distinfo b/wm/enlightenment16/distinfo index f330d308dc7..8153e3f19be 100644 --- a/wm/enlightenment16/distinfo +++ b/wm/enlightenment16/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.11 2022/11/13 00:52:01 gutteridge Exp $ +$NetBSD: distinfo,v 1.12 2022/11/26 22:51:03 gutteridge Exp $ -BLAKE2s (e16-1.0.26.tar.gz) = a6bb822d20004fbed92e04243d5dad64063a4908f46e5b5f9c9c505281908b22 -SHA512 (e16-1.0.26.tar.gz) = 4a14fd7df5621bc291b053b9da4a1d384b058e8099d6c4856f8ec334559ee8b9346e13f1609909402932dead6ffd9cc3d3f9a36401a38bebe9ec3d4335015926 -Size (e16-1.0.26.tar.gz) = 2407581 bytes +BLAKE2s (e16-1.0.27.tar.gz) = de07adc7676a9261ad7da848962d4aaceaae263b9b6d49c6ee07d38ce464b19e +SHA512 (e16-1.0.27.tar.gz) = a8284bd18172d40ab625c7cf946df6e392e8cfb867814499421833a1610458f382a05294081292098f8e327778a64676cbc8a6751da20cae76a482fc599a3eb1 +Size (e16-1.0.27.tar.gz) = 2386028 bytes SHA1 (patch-ac) = a5a2f2b0377212178480cc94e6975dd4ff364ced -SHA1 (patch-src_timers.c) = 556b2d5a36c029e108a6554c42f37c17b50ed5b0 diff --git a/wm/enlightenment16/patches/patch-src_timers.c b/wm/enlightenment16/patches/patch-src_timers.c deleted file mode 100644 index ab753539bc8..00000000000 --- a/wm/enlightenment16/patches/patch-src_timers.c +++ /dev/null @@ -1,109 +0,0 @@ -$NetBSD: patch-src_timers.c,v 1.1 2022/11/13 00:52:01 gutteridge Exp $ - -Fix timer lockup issue. -Upstream commit 6a0c30e77ff598e90d38dd3c58f4552a996ab4b5. - ---- src/timers.c.orig 2022-05-28 14:15:04.000000000 +0000 -+++ src/timers.c -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors -- * Copyright (C) 2006-2019 Kim Woelders -+ * Copyright (C) 2006-2022 Kim Woelders - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to -@@ -25,6 +25,13 @@ - #include "list.h" - #include "timers.h" - -+#define DEBUG_TIMERS 0 -+#if DEBUG_TIMERS -+#define Dprintf(fmt...) if(EDebug(EDBUG_TYPE_TIMERS))Eprintf(fmt) -+#else -+#define Dprintf(fmt...) -+#endif -+ - struct _timer { - unsigned int in_time; - unsigned int at_time; -@@ -109,14 +116,19 @@ TimerAdd(int dt_ms, int (*func)(void *da - void - TimersRun(unsigned int t_ms) - { -- Timer *timer, *q_old, *q_run; -+ Timer *timer, *q_old, *q_new, *q_run; - - timer = q_first; - if (!timer) - return; /* No timers pending */ - -- q_run = q_old = timer; -- for (; timer; timer = q_first) -+ Dprintf("%s - A\n", __func__); -+ -+ q_new = timer; /* q_new is now temporarily the timer queue */ -+ q_old = timer; /* q_old is the old timer queue */ -+ q_first = NULL; /* q_first holds timers added during timer processing */ -+ q_run = NULL; /* q_run holds the last run timer */ -+ for (; timer; timer = q_new) - { - if (tdiff(timer->at_time, t_ms) > 0) - break; -@@ -125,22 +137,25 @@ TimersRun(unsigned int t_ms) - Eprintf("%s - run %p: func=%p data=%p: %8d\n", __func__, timer, - timer->func, timer->data, timer->at_time - t_ms); - -- q_first = timer->next; -+ q_new = timer->next; - - /* Run this callback */ - timer->again = timer->func(timer->data); - q_run = timer; - } - -- if (q_old != q_first) -+ if (q_run) - { - /* At least one timer has run */ - q_run->next = NULL; /* Terminate expired timer list */ - - /* Re-schedule/remove timers that have run */ -- for (timer = q_old; timer; timer = q_old) -+ q_run = q_new; /* Swap q_first and q_new ... */ -+ q_new = q_first; /* q_new are the new added timers */ -+ q_first = q_run; /* q_first is now the timer queue */ -+ for (timer = q_old; timer; timer = q_run) - { -- q_old = timer->next; -+ q_run = timer->next; - if (timer->again) - { - timer->at_time += timer->in_time; -@@ -151,6 +166,17 @@ TimersRun(unsigned int t_ms) - _TimerDel(timer); - } - } -+ -+ /* Schedule timers that have been added */ -+ for (timer = q_new; timer; timer = q_run) -+ { -+ q_run = timer->next; -+ _TimerSet(timer); /* Add to timer queue */ -+ } -+ } -+ else -+ { -+ q_first = q_old; /* Restore timer queue */ - } - - if (EDebug(EDBUG_TYPE_TIMERS) > 1) -@@ -160,6 +186,8 @@ TimersRun(unsigned int t_ms) - timer, timer->func, timer->data, timer->at_time - t_ms, - timer->in_time); - } -+ -+ Dprintf("%s - B\n", __func__); - } - - int |