pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

enlightenment-current: mark upstream merged patches



Module Name:	pkgsrc-wip
Committed By:	moihack <moihack@noreply.localhost>
Pushed By:	moihack
Date:		Sun Aug 30 01:45:49 2026 +0200
Changeset:	a1d2a0d2d91d9c13ea400c3872ce4cdc86db79f1

Modified Files:
	enlightenment-current/distinfo
	enlightenment-current/patches/patch-src_bin_system_e__system__acpi.c
	enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c
	enlightenment-current/patches/patch-src_modules_wizard_page__120.c

Log Message:
enlightenment-current: mark upstream merged patches

The patches in this commit are already upstreamed as part of:
https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
Note: wizard_page_120.c is partially merged, meaning the above PR
contains only part of the patch (NetBSD) in the upstream source.

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

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

diffstat:
 enlightenment-current/distinfo                                      | 6 +++---
 .../patches/patch-src_bin_system_e__system__acpi.c                  | 2 ++
 .../patches/patch-src_modules_procstats_e__mod__main.c              | 5 +++++
 enlightenment-current/patches/patch-src_modules_wizard_page__120.c  | 6 ++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diffs:
diff --git a/enlightenment-current/distinfo b/enlightenment-current/distinfo
index 94a3ec7b0c..7adb47936a 100644
--- a/enlightenment-current/distinfo
+++ b/enlightenment-current/distinfo
@@ -9,15 +9,15 @@ SHA1 (patch-src_bin_e__ckpasswd__main.c) = b15d94e48ce9fe377ea8355530f4317ebfa99
 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) = 96bb215f69d47a69c89cd234fa23a9001d8102f7
-SHA1 (patch-src_bin_system_e__system__acpi.c) = 29548d70094755d9727fe70c38cc42f55061fbbd
+SHA1 (patch-src_bin_system_e__system__acpi.c) = f1b7d2f13564265e8d3faed34cfbc26007a6e960
 SHA1 (patch-src_bin_system_e__system__main.c) = 9777e50cc4114100b8068112d067d69753c786a4
 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_e__mod__main.c) = 13d741222a452fca7bbd8db9b269511daf05e20f
 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_wizard_page__120.c) = 96cee5786b88ea3a857ad7222a776667ecd83005
 SHA1 (patch-src_modules_xkbswitch_e__mod__parse.c) = 68180fe3a4b9f131e7ac033aa324903827566fa2
diff --git a/enlightenment-current/patches/patch-src_bin_system_e__system__acpi.c b/enlightenment-current/patches/patch-src_bin_system_e__system__acpi.c
index 4b0b30d599..132ad1121c 100644
--- a/enlightenment-current/patches/patch-src_bin_system_e__system__acpi.c
+++ b/enlightenment-current/patches/patch-src_bin_system_e__system__acpi.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Merged upstream: https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+
 --- src/bin/system/e_system_acpi.c.orig	2025-02-08 14:04:44.419871685 +0000
 +++ src/bin/system/e_system_acpi.c
 @@ -3,6 +3,8 @@
diff --git a/enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c b/enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c
index 4b710e88ac..48392d005b 100644
--- a/enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c
+++ b/enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c
@@ -1,5 +1,10 @@
 $NetBSD$
 
+Merged upstream: https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+The PR also introduces a new (NetBSD) upstream change to e_mod_main.c,
+but the relevant code is not existing in enlightenment 0.27.1 yet,
+therefore no extra changes are required for this patch.
+
 --- src/modules/procstats/e_mod_main.c.orig	2023-12-23 16:08:09.000000000 +0000
 +++ src/modules/procstats/e_mod_main.c
 @@ -1,7 +1,7 @@
diff --git a/enlightenment-current/patches/patch-src_modules_wizard_page__120.c b/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
index 84ef2f82ba..6df3d0b005 100644
--- a/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
+++ b/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
@@ -1,7 +1,9 @@
 $NetBSD$
 
-* Add NetBSD support
-* Fix build without eeze on linux
+* Add NetBSD support. Merged upstream in:
+https://git.enlightenment.org/enlightenment/enlightenment/pulls/139
+* Fix build without eeze on linux (not upstream but not relevant for NetBSD).
+Can keep patch without NetBSD part in newer release.
 
 --- src/modules/wizard/page_120.c.orig	2023-12-23 16:08:09.000000000 +0000
 +++ src/modules/wizard/page_120.c


Home | Main Index | Thread Index | Old Index