enlightenment-current: sync with upstream patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: enlightenment-current: sync with upstream patches
From: moihack (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 29 Aug 2026 22:30:58 +0000
Module Name:	pkgsrc-wip
Committed By:	moihack <moihack@noreply.localhost>
Pushed By:	moihack
Date:		Sun Aug 30 00:25:47 2026 +0200
Changeset:	2ecf4a80f556c2fd81ca246a7838fa0cb79f077a

Modified Files:
	enlightenment-current/distinfo
	enlightenment-current/patches/patch-src_bin_e__signals.c
	enlightenment-current/patches/patch-src_bin_e__util__suid.h
	enlightenment-current/patches/patch-src_bin_system_e__system__power.c
	enlightenment-current/patches/patch-src_modules_procstats_process.c

Log Message:
enlightenment-current: sync with upstream patches

The patches in this commit are already upstreamed as part of:
https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
Modfified existing patches to be the same as upstream,
to ease package update when new enlightenment version gets released.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2ecf4a80f556c2fd81ca246a7838fa0cb79f077a

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

diffstat:
 enlightenment-current/distinfo                     |  8 ++---
 .../patches/patch-src_bin_e__signals.c             | 13 +++++----
 .../patches/patch-src_bin_e__util__suid.h          | 18 ++++++++----
 .../patch-src_bin_system_e__system__power.c        | 34 ++++++++++++----------
 .../patches/patch-src_modules_procstats_process.c  | 32 +++++++++++---------
 5 files changed, 62 insertions(+), 43 deletions(-)

diffs:
diff --git a/enlightenment-current/distinfo b/enlightenment-current/distinfo
index 8368a7b3ce..94a3ec7b0c 100644
--- a/enlightenment-current/distinfo
+++ b/enlightenment-current/distinfo
@@ -6,18 +6,18 @@ Size (enlightenment-0.27.1.tar.xz) = 409707272 bytes
 SHA1 (patch-data_etc_meson.build) = da003d08faf0634549a264799313be6382956068
 SHA1 (patch-meson.build) = b753950d9ab5aa6d8b596fc7bba0f9dc54a7c197
 SHA1 (patch-src_bin_e__ckpasswd__main.c) = b15d94e48ce9fe377ea8355530f4317ebfa99450
-SHA1 (patch-src_bin_e__signals.c) = e9c5fa656a74d6f304cf15c9a88b62f90701c9f0
+SHA1 (patch-src_bin_e__signals.c) = 9ba29758a0e108c5f6f774fa9354b2959d5af4db
 SHA1 (patch-src_bin_e__sys__main.c) = fd525e5ea548cc5276e7624ba1be1df36cb4451b
-SHA1 (patch-src_bin_e__util__suid.h) = 7a1e0b9ccb45f46dae39cdfcd36ccded66193fb1
+SHA1 (patch-src_bin_e__util__suid.h) = 96bb215f69d47a69c89cd234fa23a9001d8102f7
 SHA1 (patch-src_bin_system_e__system__acpi.c) = 29548d70094755d9727fe70c38cc42f55061fbbd
 SHA1 (patch-src_bin_system_e__system__main.c) = 9777e50cc4114100b8068112d067d69753c786a4
-SHA1 (patch-src_bin_system_e__system__power.c) = 2f53cf670a6eb0ea8d9dbc275454ad9932f524d9
+SHA1 (patch-src_bin_system_e__system__power.c) = 6428a9a514c38d3b0859722170fc4b4e8310409a
 SHA1 (patch-src_modules_battery_e__mod__main.c) = 89682076005db945ba4aef0e909186ab7e0dc764
 SHA1 (patch-src_modules_battery_e__mod__main.h) = c32a3708129cdfc6b41951b9e4d5b9cdc6e67a54
 SHA1 (patch-src_modules_battery_e__mod__upower.c) = 5bfe428696fbc165585fbfe3242e402174c5d178
 SHA1 (patch-src_modules_conf__menus_e__int__config__menus.c) = fbc29cfa5e6b809e74c3fe011e21b3b9ac8719cf
 SHA1 (patch-src_modules_procstats_e__mod__main.c) = e9244c32cc8f6d610bb769f9fee63da323190369
-SHA1 (patch-src_modules_procstats_process.c) = ad04d6d675ef6bd788f0d21b03c34a7215842120
+SHA1 (patch-src_modules_procstats_process.c) = 1d84a315e06e8b4710a8dd7a24484912faa996ba
 SHA1 (patch-src_modules_wizard_page__011.c) = 4c63aa82af4ab9c94dad926cf6d023fe9410d011
 SHA1 (patch-src_modules_wizard_page__120.c) = 817aeb9d84ce25f71cb150907ac58686b7bedc2d
 SHA1 (patch-src_modules_xkbswitch_e__mod__parse.c) = 68180fe3a4b9f131e7ac033aa324903827566fa2
diff --git a/enlightenment-current/patches/patch-src_bin_e__signals.c b/enlightenment-current/patches/patch-src_bin_e__signals.c
index 3874dc2840..220edf88d8 100644
--- a/enlightenment-current/patches/patch-src_bin_e__signals.c
+++ b/enlightenment-current/patches/patch-src_bin_e__signals.c
@@ -1,13 +1,16 @@
 $NetBSD$
-Unsupported Signal on Non Linux Systems
 
---- src/bin/e_signals.c.orig	2025-04-19 01:41:14.744630370 +0000
+Unsupported Signal (SEGV_PKUERR) under NetBSD.
+Merged upstream: https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+Works under FreeBSD according to the discussion as found in the above PR.
+
+--- src/bin/e_signals.c.orig	2025-03-17 17:18:54.000000000 +0000
 +++ src/bin/e_signals.c
-@@ -107,8 +107,8 @@ _e_siginfo(int sig, siginfo_t *info)
-       NAME(SEGV_ACCERR);
+@@ -108,7 +108,9 @@ _e_siginfo(int sig, siginfo_t *info)
  #ifdef __linux__
        NAME(SEGV_BNDERR);
--#endif
+ #endif
++#ifndef __NetBSD__
        NAME(SEGV_PKUERR);
 +#endif
        NUMX(info->si_code);
diff --git a/enlightenment-current/patches/patch-src_bin_e__util__suid.h b/enlightenment-current/patches/patch-src_bin_e__util__suid.h
index 2b924ee4e3..9bb91bfc5e 100644
--- a/enlightenment-current/patches/patch-src_bin_e__util__suid.h
+++ b/enlightenment-current/patches/patch-src_bin_e__util__suid.h
@@ -1,15 +1,23 @@
 $NetBSD$
 
---- src/bin/e_util_suid.h.orig	2023-12-23 16:08:09.000000000 +0000
+Merged upstream: https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+
+--- src/bin/e_util_suid.h.orig	2025-03-17 17:18:54.000000000 +0000
 +++ src/bin/e_util_suid.h
-@@ -11,6 +11,10 @@
+@@ -11,6 +11,7 @@
  # ifdef HAVE_ENVIRON
  #  define _GNU_SOURCE 1
  # endif
 +
-+#if defined(__NetBSD__)
-+extern char** environ;
-+#endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
+@@ -33,6 +34,9 @@
+ # include <sys/procctl.h>
+ #endif
+
++#ifdef HAVE_ENVIRON
++extern char **environ;
++#endif
+
+ #define E_UTIL_SUID_ERR(args...) do { fprintf(stderr, "E_SUID_ERR: "); fprintf(stderr, ##args); } while (0)
diff --git a/enlightenment-current/patches/patch-src_bin_system_e__system__power.c b/enlightenment-current/patches/patch-src_bin_system_e__system__power.c
index b2bc6363ea..9139666652 100644
--- a/enlightenment-current/patches/patch-src_bin_system_e__system__power.c
+++ b/enlightenment-current/patches/patch-src_bin_system_e__system__power.c
@@ -1,8 +1,10 @@
 $NetBSD$
 
---- src/bin/system/e_system_power.c.orig	2023-12-23 16:08:09.000000000 +0000
+Merged upstream: https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+
+--- src/bin/system/e_system_power.c.orig	2025-03-17 17:18:54.000000000 +0000
 +++ src/bin/system/e_system_power.c
-@@ -32,7 +32,7 @@ _cb_power_hibernate(void *data EINA_UNUS
+@@ -46,7 +46,7 @@ _cb_power_suspend_then_hibernate(void *d
  static void
  _power_halt_init(void)
  {
@@ -11,16 +13,16 @@ $NetBSD$
     _cmd_halt = strdup("shutdown -p now");
  #else
     if (ecore_file_app_installed("systemctl"))
-@@ -41,7 +41,7 @@ _power_halt_init(void)
-      _cmd_halt = strdup("shutdown -h now");
- #endif
-    // linux systemd: PATH/systemctl poweroff
--   //           bsd: /sbin/shutdown -p no
-+   //           bsd: /sbin/shutdown -p now
-    // *            : /sbin/shutdown -h now
- }
- 
-@@ -66,6 +66,8 @@ _power_suspend_init(void)
+@@ -62,7 +62,7 @@ _power_halt_init(void)
+ static void
+ _power_reboot_init(void)
+ {
+-#if defined (__FreeBSD__) || defined (__OpenBSD__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+    _cmd_reboot = strdup("shutdown -r now");
+ #else
+    if (ecore_file_app_installed("systemctl"))
+@@ -80,6 +80,8 @@ _power_suspend_init(void)
  #if defined (__FreeBSD__) || defined (__OpenBSD__)
     if (ecore_file_app_installed("zzz"))
       _cmd_suspend = strdup("zzz");
@@ -29,15 +31,15 @@ $NetBSD$
  #else
     if (ecore_file_app_installed("systemctl"))
       _cmd_suspend = strdup("systemctl suspend");
-@@ -80,6 +82,7 @@ _power_suspend_init(void)
+@@ -94,6 +96,7 @@ _power_suspend_init(void)
  #endif
     // linux systemd: PATH/systemctl suspend
     //           bsd: /usr/sbin/zzz
-+   //        NetBSD: sysctl
++   //        NetBSD: /sbin/sysctl
     //             *:
     //    PATH/sleep.sh
     //    /etc/acpi/sleep.sh force
-@@ -96,6 +99,8 @@ _power_hibernate_init(void)
+@@ -110,6 +113,8 @@ _power_hibernate_init(void)
  #elif defined (__OpenBSD__)
     if (ecore_file_app_installed("ZZZ"))
       _cmd_suspend = strdup("ZZZ");
@@ -46,7 +48,7 @@ $NetBSD$
  #else
     if (ecore_file_app_installed("systemctl"))
       _cmd_hibernate = strdup("systemctl hibernate");
-@@ -111,6 +116,7 @@ _power_hibernate_init(void)
+@@ -125,6 +130,7 @@ _power_hibernate_init(void)
     // linux systemd: PATH/systemctl hibernate
     // FreeBSD: acpiconf -s4
     // OpenBSD: ZZZ
diff --git a/enlightenment-current/patches/patch-src_modules_procstats_process.c b/enlightenment-current/patches/patch-src_modules_procstats_process.c
index 771c239df8..5ea905169f 100644
--- a/enlightenment-current/patches/patch-src_modules_procstats_process.c
+++ b/enlightenment-current/patches/patch-src_modules_procstats_process.c
@@ -1,13 +1,15 @@
 $NetBSD$
 
---- src/modules/procstats/process.c.orig	2023-12-23 16:08:09.000000000 +0000
+Merged upstream: https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+
+--- src/modules/procstats/process.c.orig	2025-03-17 17:18:54.000000000 +0000
 +++ src/modules/procstats/process.c
 @@ -1,12 +1,14 @@
 -#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
 +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
  # include <sys/types.h>
  # include <sys/sysctl.h>
-+#if ! defined(__NetBSD__)
++#if !defined(__NetBSD__)
  # include <sys/user.h>
 +#endif
  # include <sys/proc.h>
@@ -28,7 +30,7 @@ $NetBSD$
        case SRUN:
          statename = "run";
          break;
-@@ -101,17 +103,33 @@ _process_state_name(char state)
+@@ -101,12 +103,20 @@ _process_state_name(char state)
        case SSLEEP:
          statename = "sleep";
          break;
@@ -46,20 +48,24 @@ $NetBSD$
          break;
  
 -#if !defined(__OpenBSD__)
-+#if !defined(__OpenBSD__) 
-+#if defined(__NetBSD__)
-+      case PWAIT:
-+#else
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
        case SWAIT:
-+#endif
          statename = "wait";
          break;
+@@ -115,6 +125,16 @@ _process_state_name(char state)
+         statename = "lock";
+         break;
  
 +#if defined(__NetBSD__)
++      case PWAIT:
++        statename = "wait";
++        break;
++
 +      case PLOCK:
-+#else
-       case SLOCK:
++        statename = "lock";
++        break;
 +#endif
-         statename = "lock";
-         break;
- 
++
+ #endif
+       case SZOMB:
+         statename = "zomb";
Prev by Date: fsel: honor CFLAGS, LDFLAGS.
Next by Date: enlightenment-current: mark upstream merged patches
Previous by Thread: fsel: honor CFLAGS, LDFLAGS.
Next by Thread: enlightenment-current: mark upstream merged patches
Indexes:
Home | Main Index | Thread Index | Old Index