pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

enlightment: Update to 0.26.0

Module Name:	pkgsrc-wip
Committed By:	Matthew Danielson <matthewd%fastmail.us@localhost>
Pushed By:	matthewd
Date:		Sun May 19 17:06:26 2024 -0700
Changeset:	052f7346377cad800671f13f6ff2f2d420bdb7e0

Modified Files:
	enlightenment-current/Makefile
	enlightenment-current/PLIST
	enlightenment-current/TODO
	enlightenment-current/distinfo
	enlightenment-current/patches/patch-src_bin_system_e__system__power.c
	enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
	enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
	enlightenment-current/patches/patch-src_modules_wizard_page__120.c
Added Files:
	enlightenment-current/patches/patch-src_bin_e__ckpasswd__main.c
	enlightenment-current/patches/patch-src_bin_e__util__suid.h
	enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c
	enlightenment-current/patches/patch-src_modules_procstats_process.c
Removed Files:
	enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c

Log Message:
enlightment: Update to 0.26.0

Tested on NetBSD 10 - starts, and runs, with minimal cpu usage.

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

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

diffstat:
 enlightenment-current/Makefile                     |  21 ++--
 enlightenment-current/PLIST                        | 106 ++++++++++-----------
 enlightenment-current/TODO                         |  14 +--
 enlightenment-current/distinfo                     |  19 ++--
 .../patches/patch-src_bin_e__ckpasswd__main.c      |  26 +++++
 .../patches/patch-src_bin_e__util__suid.h          |  15 +++
 .../patch-src_bin_system_e__system__power.c        |  20 ++--
 .../patch-src_modules_battery_e__mod__main.c       |  35 ++-----
 .../patch-src_modules_battery_e__mod__main.h       |  36 ++-----
 .../patch-src_modules_battery_e__mod__sysctl.c     |  67 -------------
 .../patch-src_modules_procstats_e__mod__main.c     |  13 +++
 .../patches/patch-src_modules_procstats_process.c  |  65 +++++++++++++
 .../patches/patch-src_modules_wizard_page__120.c   |  35 ++-----
 13 files changed, 228 insertions(+), 244 deletions(-)

diffs:
diff --git a/enlightenment-current/Makefile b/enlightenment-current/Makefile
index 9236ed862f..991b229a98 100644
--- a/enlightenment-current/Makefile
+++ b/enlightenment-current/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 0.2 2018/09/06 16:15:10 andyb Exp $
 
-DISTNAME=	enlightenment-0.24.2
+DISTNAME=	enlightenment-0.26.0
 PKGNAME=	${DISTNAME:S/enlightenment/enlightenment-current/}
 CATEGORIES=	wm
-PKGREVISION=	5
 MASTER_SITES=	https://download.enlightenment.org/rel/apps/enlightenment/
 EXTRACT_SUFX=	.tar.xz
 
@@ -12,7 +11,7 @@ HOMEPAGE=	https://www.enlightenment.org/
 COMMENT=	The Enlightenment window manager
 LICENSE=	2-clause-bsd
 
-CONFLICTS=	enlightenment-[0-9]*
+CONFLICTS=	enlightenment-[0-9]* moksha-[0-9]*
 
 USE_TOOLS+=	pkg-config
 
@@ -28,6 +27,9 @@ CONF_FILES+=	${EGDIR}/e-applications.menu \
 
 BUILD_DEFS+=	PKG_SYSCONFBASE
 
+# For src/bin/enlightenment_ckpasswd
+LDFLAGS.NetBSD+=	-lcrypt
+
 INSTALLATION_DIRS=	${EGDIR}
 MAKE_DIRS=		${PKG_SYSCONFDIR}/enlightenment
 MAKE_DIRS+=		${PKG_SYSCONFBASE}/xdg/menus
@@ -42,11 +44,10 @@ SUBST_VARS.prefix=	PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=	cpufreq sysinfo temperature linux
+PLIST_VARS+=	cpufreq temperature linux
 
 .if ${OPSYS} != "NetBSD"
 PLIST.cpufreq=		yes
-PLIST.sysinfo=		yes
 PLIST.temperature=	yes
 .endif
 
@@ -59,12 +60,17 @@ PLIST_SUBST+=	PLATFORM=${LOWER_OPSYS}
 
 .if ${OPSYS} == "NetBSD"
 MESON_ARGS+=		-Dcpufreq=false
-MESON_ARGS+=		-Dsysinfo=false
 MESON_ARGS+=		-Dtemperature=false
 .endif
-MESON_ARGS+=		-Ddevice-udev=false
 .if ${OPSYS} != "Linux"
 MESON_ARGS+=		-Dsystemd=false
+MESON_ARGS+=		-Ddevice-udev=false
+MESON_ARGS+=		-Dmount-udisks=false
+MESON_ARGS+=		-Dmount-eeze=false
+MESON_ARGS+=		-Dbluez5=false
+MESON_ARGS+=		-Delput=false
+MESON_ARGS+=		-Dgesture-recognition=false
+
 .else
 MESON_ARGS+=		-Dsystemdunitdir=${PREFIX}/lib/systemd/user
 .endif
@@ -79,6 +85,7 @@ CPPFLAGS+=	-DPKGSRC_X11BASE=\"${X11BASE:Q}\"
 
 .include "../../devel/meson/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/efl/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
diff --git a/enlightenment-current/PLIST b/enlightenment-current/PLIST
index 4b57561c5f..c64590703f 100644
--- a/enlightenment-current/PLIST
+++ b/enlightenment-current/PLIST
@@ -3,8 +3,10 @@ bin/emixer
 bin/enlightenment
 bin/enlightenment_askpass
 bin/enlightenment_filemanager
+bin/enlightenment_fprint
 bin/enlightenment_imc
 bin/enlightenment_open
+bin/enlightenment_paledit
 bin/enlightenment_remote
 bin/enlightenment_start
 include/enlightenment/config.h
@@ -19,7 +21,6 @@ include/enlightenment/e_auth.h
 include/enlightenment/e_backlight.h
 include/enlightenment/e_bg.h
 include/enlightenment/e_bindings.h
-include/enlightenment/e_bryce.h
 include/enlightenment/e_client.h
 include/enlightenment/e_client.x
 include/enlightenment/e_client_volume.h
@@ -30,6 +31,7 @@ include/enlightenment/e_comp_canvas.h
 include/enlightenment/e_comp_cfdata.h
 include/enlightenment/e_comp_object.h
 include/enlightenment/e_comp_x.h
+include/enlightenment/e_comp_x_devices.h
 include/enlightenment/e_comp_x_randr.h
 include/enlightenment/e_config.h
 include/enlightenment/e_config_data.h
@@ -67,8 +69,7 @@ include/enlightenment/e_focus.h
 include/enlightenment/e_font.h
 include/enlightenment/e_gadcon.h
 include/enlightenment/e_gadcon_popup.h
-include/enlightenment/e_gadget.h
-include/enlightenment/e_gadget_types.h
+include/enlightenment/e_gesture.h
 include/enlightenment/e_grab_dialog.h
 include/enlightenment/e_grabinput.h
 include/enlightenment/e_hints.h
@@ -126,8 +127,10 @@ include/enlightenment/e_signals.h
 include/enlightenment/e_slidecore.h
 include/enlightenment/e_slider.h
 include/enlightenment/e_slidesel.h
+include/enlightenment/e_sound.h
 include/enlightenment/e_spectrum.h
 include/enlightenment/e_startup.h
+include/enlightenment/e_state.h
 include/enlightenment/e_sys.h
 include/enlightenment/e_system.h
 include/enlightenment/e_test.h
@@ -139,6 +142,7 @@ include/enlightenment/e_update.h
 include/enlightenment/e_user.h
 include/enlightenment/e_utils.h
 include/enlightenment/e_video.h
+include/enlightenment/e_watchdog.h
 include/enlightenment/e_widget.h
 include/enlightenment/e_widget_aspect.h
 include/enlightenment/e_widget_bgpreview.h
@@ -184,9 +188,9 @@ lib/enlightenment/modules/battery/e-module-battery.edj
 lib/enlightenment/modules/battery/module.desktop
 lib/enlightenment/modules/battery/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/batget
 lib/enlightenment/modules/battery/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-lib/enlightenment/modules/bluez5/e-module-bluez5.edj
-lib/enlightenment/modules/bluez5/module.desktop
-lib/enlightenment/modules/bluez5/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.linux}lib/enlightenment/modules/bluez5/e-module-bluez5.edj
+${PLIST.linux}lib/enlightenment/modules/bluez5/module.desktop
+${PLIST.linux}lib/enlightenment/modules/bluez5/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/clock/e-module-clock.edj
 lib/enlightenment/modules/clock/module.desktop
 lib/enlightenment/modules/clock/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
@@ -196,16 +200,19 @@ lib/enlightenment/modules/conf/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.
 lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
 lib/enlightenment/modules/conf_applications/module.desktop
 lib/enlightenment/modules/conf_applications/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_bindings/e-module-conf_bindings.edj
 lib/enlightenment/modules/conf_bindings/module.desktop
 lib/enlightenment/modules/conf_bindings/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
 lib/enlightenment/modules/conf_dialogs/module.desktop
 lib/enlightenment/modules/conf_dialogs/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_display/e-module-conf_display.edj
 lib/enlightenment/modules/conf_display/module.desktop
 lib/enlightenment/modules/conf_display/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
 lib/enlightenment/modules/conf_interaction/module.desktop
 lib/enlightenment/modules/conf_interaction/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_intl/e-module-conf_intl.edj
 lib/enlightenment/modules/conf_intl/module.desktop
 lib/enlightenment/modules/conf_intl/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
@@ -223,6 +230,7 @@ lib/enlightenment/modules/conf_randr/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/m
 lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
 lib/enlightenment/modules/conf_shelves/module.desktop
 lib/enlightenment/modules/conf_shelves/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_theme/e-module-conf_theme.edj
 lib/enlightenment/modules/conf_theme/module.desktop
 lib/enlightenment/modules/conf_theme/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
@@ -260,12 +268,10 @@ lib/enlightenment/modules/ibox/e-module-ibox.edj
 lib/enlightenment/modules/ibox/module.desktop
 lib/enlightenment/modules/ibox/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/lokker/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-lib/enlightenment/modules/luncher/e-module-luncher.edj
-lib/enlightenment/modules/luncher/module.desktop
-lib/enlightenment/modules/luncher/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/mixer/e-module-mixer.edj
 lib/enlightenment/modules/mixer/module.desktop
 lib/enlightenment/modules/mixer/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/mixer/sink-icons.txt
 lib/enlightenment/modules/msgbus/e-module-msgbus.edj
 lib/enlightenment/modules/msgbus/module.desktop
 lib/enlightenment/modules/msgbus/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
@@ -284,6 +290,9 @@ lib/enlightenment/modules/pager/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module
 lib/enlightenment/modules/polkit/e-module-polkit.edj
 lib/enlightenment/modules/polkit/module.desktop
 lib/enlightenment/modules/polkit/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/procstats/e-module-procstats.edj
+lib/enlightenment/modules/procstats/module.desktop
+lib/enlightenment/modules/procstats/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
 lib/enlightenment/modules/quickaccess/module.desktop
 lib/enlightenment/modules/quickaccess/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
@@ -303,27 +312,18 @@ lib/enlightenment/modules/start/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module
 lib/enlightenment/modules/syscon/e-module-syscon.edj
 lib/enlightenment/modules/syscon/module.desktop
 lib/enlightenment/modules/syscon/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-${PLIST.sysinfo}lib/enlightenment/modules/sysinfo/e-module-sysinfo.edj
-${PLIST.sysinfo}lib/enlightenment/modules/sysinfo/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-${PLIST.sysinfo}lib/enlightenment/modules/sysinfo/module.desktop
 lib/enlightenment/modules/systray/e-module-systray.edj
 lib/enlightenment/modules/systray/module.desktop
 lib/enlightenment/modules/systray/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/tasks/e-module-tasks.edj
 lib/enlightenment/modules/tasks/module.desktop
 lib/enlightenment/modules/tasks/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-lib/enlightenment/modules/teamwork/e-module-teamwork.edj
-lib/enlightenment/modules/teamwork/module.desktop
-lib/enlightenment/modules/teamwork/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 ${PLIST.temperature}lib/enlightenment/modules/temperature/e-module-temperature.edj
 ${PLIST.temperature}lib/enlightenment/modules/temperature/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 ${PLIST.temperature}lib/enlightenment/modules/temperature/module.desktop
 lib/enlightenment/modules/tiling/e-module-tiling.edj
 lib/enlightenment/modules/tiling/module.desktop
 lib/enlightenment/modules/tiling/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-lib/enlightenment/modules/time/e-module-time.edj
-lib/enlightenment/modules/time/module.desktop
-lib/enlightenment/modules/time/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/vkbd/dicts/English_US.dic
 lib/enlightenment/modules/vkbd/dicts/English_US_Small.dic
 lib/enlightenment/modules/vkbd/e-module-vkbd.edj
@@ -348,9 +348,6 @@ lib/enlightenment/modules/vkbd/theme.edj
 lib/enlightenment/modules/winlist/e-module-winlist.edj
 lib/enlightenment/modules/winlist/module.desktop
 lib/enlightenment/modules/winlist/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
-lib/enlightenment/modules/wireless/e-module-wireless.edj
-lib/enlightenment/modules/wireless/module.desktop
-lib/enlightenment/modules/wireless/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/wizard/def-ibar.txt
 lib/enlightenment/modules/wizard/desktop/home.desktop
 lib/enlightenment/modules/wizard/desktop/root.desktop
@@ -395,45 +392,33 @@ ${PLIST.linux}lib/systemd/user/enlightenment.service
 share/applications/emixer.desktop
 share/applications/enlightenment_askpass.desktop
 share/applications/enlightenment_filemanager.desktop
+share/applications/enlightenment_fprint.desktop
+share/applications/enlightenment_paledit.desktop
 share/enlightenment/AUTHORS
 share/enlightenment/COPYING
-share/enlightenment/data/backgrounds/Brown_Rock_Hi.edj
-share/enlightenment/data/backgrounds/Colorful_Roses.edj
-share/enlightenment/data/backgrounds/Curly_Leaves.edj
-share/enlightenment/data/backgrounds/Dark_Gradient.edj
-share/enlightenment/data/backgrounds/Darkconcrete.edj
-share/enlightenment/data/backgrounds/Flower_Petals.edj
-share/enlightenment/data/backgrounds/Go_Away.edj
-share/enlightenment/data/backgrounds/Grassy.edj
-share/enlightenment/data/backgrounds/Green_Stem.edj
-share/enlightenment/data/backgrounds/Hills.edj
-share/enlightenment/data/backgrounds/Japanesemaple.edj
-share/enlightenment/data/backgrounds/Lakegrass.edj
-share/enlightenment/data/backgrounds/Lantern_Cluster.edj
-share/enlightenment/data/backgrounds/Leafy_Red.edj
-share/enlightenment/data/backgrounds/Light.edj
-share/enlightenment/data/backgrounds/Light_Gradient.edj
-share/enlightenment/data/backgrounds/Mossstring.edj
-share/enlightenment/data/backgrounds/Motleyrock.edj
-share/enlightenment/data/backgrounds/Newgrowth.edj
-share/enlightenment/data/backgrounds/Ocean_Beach.edj
-share/enlightenment/data/backgrounds/Orange_Roses.edj
-share/enlightenment/data/backgrounds/Pattern_Radial.edj
-share/enlightenment/data/backgrounds/Pattern_Vertical.edj
-share/enlightenment/data/backgrounds/Pattern_Vertical_Hi.edj
-share/enlightenment/data/backgrounds/Pine_Silhouettes.edj
-share/enlightenment/data/backgrounds/Purple_Flower_Bunch.edj
-share/enlightenment/data/backgrounds/Ramen.edj
-share/enlightenment/data/backgrounds/Shady_Leaves.edj
-share/enlightenment/data/backgrounds/Skywall.edj
-share/enlightenment/data/backgrounds/Stringflower.edj
-share/enlightenment/data/backgrounds/Temple.edj
-share/enlightenment/data/backgrounds/Train.edj
-share/enlightenment/data/backgrounds/Wall_Lanterns.edj
-share/enlightenment/data/backgrounds/Wetgrass.edj
-share/enlightenment/data/backgrounds/Wetleaf.edj
-share/enlightenment/data/backgrounds/Whiterock.edj
-share/enlightenment/data/backgrounds/Windy_Palm.edj
+share/enlightenment/data/backgrounds/Bamboo.edj
+share/enlightenment/data/backgrounds/Dunes.edj
+share/enlightenment/data/backgrounds/Flat-Fan.edj
+share/enlightenment/data/backgrounds/Flat-Stone-Pattern.edj
+share/enlightenment/data/backgrounds/Foggy-Trees.edj
+share/enlightenment/data/backgrounds/God-Rays.edj
+share/enlightenment/data/backgrounds/Green-Maple.edj
+share/enlightenment/data/backgrounds/Lichen-Branches.edj
+share/enlightenment/data/backgrounds/Mountain.edj
+share/enlightenment/data/backgrounds/Paper-Flower.edj
+share/enlightenment/data/backgrounds/Peaks.edj
+share/enlightenment/data/backgrounds/Red-Maple.edj
+share/enlightenment/data/backgrounds/Sea-of-Lanterns.edj
+share/enlightenment/data/backgrounds/Snow-Trees.edj
+share/enlightenment/data/backgrounds/Spruce-Needles.edj
+share/enlightenment/data/backgrounds/Squiggle-Dark.edj
+share/enlightenment/data/backgrounds/Squiggle-Light.edj
+share/enlightenment/data/backgrounds/Squiggle-Mid.edj
+share/enlightenment/data/backgrounds/Squiggle.edj
+share/enlightenment/data/backgrounds/Sunset-Clouds.edj
+share/enlightenment/data/backgrounds/Sunset-Hills.edj
+share/enlightenment/data/backgrounds/White-Flower.edj
+share/enlightenment/data/backgrounds/Yellow-Flower.edj
 share/enlightenment/data/config/default/e.cfg
 share/enlightenment/data/config/default/e_bindings.cfg
 share/enlightenment/data/config/profile.cfg
@@ -580,6 +565,7 @@ share/enlightenment/data/images/test.edj
 share/enlightenment/data/images/test.jpg
 share/enlightenment/data/images/test.png
 share/enlightenment/data/images/test.svg
+share/enlightenment/data/images/wayland.png
 share/enlightenment/data/input_methods/fcitx.imc
 share/enlightenment/data/input_methods/gcin.imc
 share/enlightenment/data/input_methods/hime.imc
@@ -593,10 +579,13 @@ share/enlightenment/doc/documentation.html
 share/enlightenment/doc/enlightenment.png
 share/enlightenment/doc/illume2.html
 share/enlightenment/doc/illume2.png
+share/enlightenment/themes/enlightenment_fprint.edj
 share/examples/enlightenment/e-applications.menu
 share/examples/enlightenment/sysactions.conf
 share/examples/enlightenment/system.conf
 share/icons/hicolor/128x128/apps/emixer.png
+share/icons/hicolor/128x128/apps/enlightenment_fprint.png
+share/icons/hicolor/128x128/apps/enlightenment_paledit.png
 share/icons/hicolor/512x512/apps/enlightenment.png
 share/icons/hicolor/512x512/apps/enlightenment_badge-symbolic.png
 share/icons/hicolor/512x512/places/enlightenment.png
@@ -625,6 +614,7 @@ share/locale/hr/LC_MESSAGES/enlightenment.mo
 share/locale/hu/LC_MESSAGES/enlightenment.mo
 share/locale/it/LC_MESSAGES/enlightenment.mo
 share/locale/ja/LC_MESSAGES/enlightenment.mo
+share/locale/ka/LC_MESSAGES/enlightenment.mo
 share/locale/km/LC_MESSAGES/enlightenment.mo
 share/locale/ko/LC_MESSAGES/enlightenment.mo
 share/locale/lt/LC_MESSAGES/enlightenment.mo
diff --git a/enlightenment-current/TODO b/enlightenment-current/TODO
index 0c52bbb2a1..13ff99f8c5 100644
--- a/enlightenment-current/TODO
+++ b/enlightenment-current/TODO
@@ -1,14 +1,14 @@
 #### Status
 Build on:
-- NetBSD 9.1_STABLE amd64, pkgsrc-2020Q3
-- Linux 5.9.8-2-MANJARO x86_64, pkgsrc-2020Q3
-
-3rd party binary repository:
-`# echo "https://sourceforge.net/projects/kikadf/files/NetBSD/amd64/All/"; >> /usr/pkg/etc/pkgin/repositories.conf`
-`# pkgin -f update`
-`# pkgin install enlightenment-current`
+- NetBSD 10.0_STABLE amd64, pkgsrc-2024Q1
+- Linux 5.10.0-23-amd64 Debian x86_64, pkgsrc-2024Q1
 
 #### Plan
 - Test, optimize dependencies << opengl issue
 - Try to enbale battery with upower << enabled, test
 - Add another OS support
+
+
+### Notes: 2024-05-19 (matthewda)
+- disable glib mainloop on NetBSD - cpu usage decreases.
+- opengl seems to be working on NetBSD
diff --git a/enlightenment-current/distinfo b/enlightenment-current/distinfo
index 5597136c09..7d7686b9fc 100644
--- a/enlightenment-current/distinfo
+++ b/enlightenment-current/distinfo
@@ -1,18 +1,21 @@
 $NetBSD$
 
-RMD160 (enlightenment-0.24.2.tar.xz) = 3a5071ea54bcbffd67da9d416e4d1778457574ef
-SHA512 (enlightenment-0.24.2.tar.xz) = 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-Size (enlightenment-0.24.2.tar.xz) = 28716060 bytes
+BLAKE2s (enlightenment-0.26.0.tar.xz) = fa6d959cd72ff14f34c2f86d2e0bae62853d8d11a84afc7dc630c679ea4afa28
+SHA512 (enlightenment-0.26.0.tar.xz) = 52a656b397348a4f6baa28b9da4b42c81160b06d28dba58c22bdf00bf749aed3a9b194e171a5ac349745a4c11afc8ae8c38f9bf8c31bacbc0d196cfb24b15a1e
+Size (enlightenment-0.26.0.tar.xz) = 409678784 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__sys__main.c) = fd525e5ea548cc5276e7624ba1be1df36cb4451b
+SHA1 (patch-src_bin_e__util__suid.h) = 7a1e0b9ccb45f46dae39cdfcd36ccded66193fb1
 SHA1 (patch-src_bin_system_e__system__main.c) = 9777e50cc4114100b8068112d067d69753c786a4
-SHA1 (patch-src_bin_system_e__system__power.c) = 254d430d50f3a122b64cc70c390c48355cbad3a3
-SHA1 (patch-src_modules_battery_e__mod__main.c) = 024cd540ffc5dee129e662088e7f837820ac7b8a
-SHA1 (patch-src_modules_battery_e__mod__main.h) = b599d39991497faba70e5a62278e4f29b06fcc69
-SHA1 (patch-src_modules_battery_e__mod__sysctl.c) = 1db5e700635cfd428b2599ebb592d71847f23e7f
+SHA1 (patch-src_bin_system_e__system__power.c) = 2f53cf670a6eb0ea8d9dbc275454ad9932f524d9
+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_wizard_page__011.c) = 4c63aa82af4ab9c94dad926cf6d023fe9410d011
-SHA1 (patch-src_modules_wizard_page__120.c) = 3635cab6a98393eae0353ccdaf83317f0376dc9e
+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__ckpasswd__main.c b/enlightenment-current/patches/patch-src_bin_e__ckpasswd__main.c
new file mode 100644
index 0000000000..b464cc4696
--- /dev/null
+++ b/enlightenment-current/patches/patch-src_bin_e__ckpasswd__main.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- src/bin/e_ckpasswd_main.c.orig	2023-12-23 16:08:09.000000000 +0000
++++ src/bin/e_ckpasswd_main.c
+@@ -1,4 +1,3 @@
+-#include "e_util_suid.h"
+ 
+ #include "config.h"
+ 
+@@ -16,6 +15,7 @@
+ #include <Ecore.h>
+ #include <Eldbus.h>
+ 
++#include "e_util_suid.h"
+ static uid_t uid = -1; // uid of person running me
+ static gid_t gid = -1; // gid of person running me
+ static char *user_name = NULL;
+@@ -39,7 +39,7 @@ _check_auth(uid_t id, const char *guess)
+ 
+ 
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) | defined(__NetBSD__)
+ #include <security/pam_constants.h>
+ 
+ static int
diff --git a/enlightenment-current/patches/patch-src_bin_e__util__suid.h b/enlightenment-current/patches/patch-src_bin_e__util__suid.h
new file mode 100644
index 0000000000..2b924ee4e3
--- /dev/null
+++ b/enlightenment-current/patches/patch-src_bin_e__util__suid.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/bin/e_util_suid.h.orig	2023-12-23 16:08:09.000000000 +0000
++++ src/bin/e_util_suid.h
+@@ -11,6 +11,10 @@
+ # ifdef HAVE_ENVIRON
+ #  define _GNU_SOURCE 1
+ # endif
++
++#if defined(__NetBSD__)
++extern char** environ;
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
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 d80aa223c4..b2bc6363ea 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,6 @@
 $NetBSD$
 
-* Add NetBSD support
-
---- src/bin/system/e_system_power.c.orig	2020-07-26 16:39:12.083981300 +0000
+--- src/bin/system/e_system_power.c.orig	2023-12-23 16:08:09.000000000 +0000
 +++ src/bin/system/e_system_power.c
 @@ -32,7 +32,7 @@ _cb_power_hibernate(void *data EINA_UNUS
  static void
@@ -39,20 +37,20 @@ $NetBSD$
     //             *:
     //    PATH/sleep.sh
     //    /etc/acpi/sleep.sh force
-@@ -93,6 +96,8 @@ _power_hibernate_init(void)
- #if defined (__FreeBSD__) || defined (__OpenBSD__)
-    if (ecore_file_app_installed("acpiconf"))
-      _cmd_hibernate = strdup("acpiconf -s4");
+@@ -96,6 +99,8 @@ _power_hibernate_init(void)
+ #elif defined (__OpenBSD__)
+    if (ecore_file_app_installed("ZZZ"))
+      _cmd_suspend = strdup("ZZZ");
 +#elif defined (__NetBSD__)
 +     _cmd_hibernate = strdup("sysctl -w hw.acpi.sleep.state=4");
  #else
     if (ecore_file_app_installed("systemctl"))
       _cmd_hibernate = strdup("systemctl hibernate");
-@@ -107,6 +112,7 @@ _power_hibernate_init(void)
- #endif
+@@ -111,6 +116,7 @@ _power_hibernate_init(void)
     // linux systemd: PATH/systemctl hibernate
-    // bsd: acpiconf -s4
-+   //        NetBSD: sysctl
+    // FreeBSD: acpiconf -s4
+    // OpenBSD: ZZZ
++   // Netbsd: sysctl
     // if exist:
     //    PATH/hibernate.sh
     //    /etc/acpi/hibernate.sh force
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
index ca97088b07..fb604d1416 100644
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
+++ b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
@@ -1,43 +1,22 @@
 $NetBSD$
 
-* NetBSD's sysctl is different than in other BSD's,
-* use upower backend
-
---- src/modules/battery/e_mod_main.c.orig	2020-07-26 16:39:12.087314600 +0000
+--- src/modules/battery/e_mod_main.c.orig	2023-12-23 16:08:09.000000000 +0000
 +++ src/modules/battery/e_mod_main.c
-@@ -366,7 +366,7 @@ _battery_config_updated(void)
-      {
- #ifdef HAVE_EEZE
-         ok = _battery_udev_start();
--#elif defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD__ || defined __NetBSD__
-+#elif defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD__
-         ok = _battery_sysctl_start();
- #else
-         ok = _battery_upower_start();
-@@ -736,7 +736,7 @@ e_modapi_init(E_Module *m)
+@@ -1051,7 +1051,7 @@ e_modapi_init(E_Module *m)
     E_CONFIG_VAL(D, T, alert_timeout, INT);
     E_CONFIG_VAL(D, T, suspend_below, INT);
     E_CONFIG_VAL(D, T, force_mode, INT);
--#if defined HAVE_EEZE || defined __OpenBSD__ || defined __NetBSD__
-+#if defined HAVE_EEZE || defined __OpenBSD__
+-#if defined HAVE_EEZE || defined(__OpenBSD__)
++#if defined HAVE_EEZE || defined(__OpenBSD__) || defined(__NetBSD__)
     E_CONFIG_VAL(D, T, fuzzy, INT);
  #endif
     E_CONFIG_VAL(D, T, desktop_notifications, INT);
-@@ -751,7 +751,7 @@ e_modapi_init(E_Module *m)
+@@ -1066,7 +1066,7 @@ e_modapi_init(E_Module *m)
          battery_config->alert_timeout = 0;
          battery_config->suspend_below = 0;
          battery_config->force_mode = 0;
--#if defined HAVE_EEZE || defined __OpenBSD__ || defined __NetBSD__
-+#if defined HAVE_EEZE || defined __OpenBSD__
+-#if defined HAVE_EEZE || defined(__OpenBSD__)
++#if defined HAVE_EEZE || defined(__OpenBSD__) || defined(__NetBSD__)
          battery_config->fuzzy = 0;
  #endif
          battery_config->desktop_notifications = 0;
-@@ -824,7 +824,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSE
- 
- #ifdef HAVE_EEZE
-    _battery_udev_stop();
--#elif defined (__OpenBSD__) || defined (__DragonFly__) || defined (__FreeBSD__) || defined (__NetBSD__)
-+#elif defined (__OpenBSD__) || defined (__DragonFly__) || defined (__FreeBSD__)
-    _battery_sysctl_stop();
- #else
-    _battery_upower_stop();
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
index c780a7f6ac..52234f5d84 100644
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
+++ b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
@@ -3,38 +3,14 @@ $NetBSD$
 * NetBSD's sysctl is different than in other BSD's,
 * use upower backend
 
---- src/modules/battery/e_mod_main.h.orig	2020-07-26 16:39:12.087314600 +0000
+--- src/modules/battery/e_mod_main.h.orig	2023-12-23 16:08:09.000000000 +0000
 +++ src/modules/battery/e_mod_main.h
-@@ -53,7 +53,7 @@ struct _Config
-    Eeze_Udev_Watch     *acwatch;
-    Eeze_Udev_Watch     *batwatch;
- #endif
--#if defined HAVE_EEZE || defined __OpenBSD__ || defined __NetBSD__
-+#if defined HAVE_EEZE || defined __OpenBSD__
-    Eina_Bool            fuzzy;
-    int                  fuzzcount;
- #endif
-@@ -65,12 +65,12 @@ typedef struct _Ac_Adapter Ac_Adapter;
- struct _Battery
- {
-    const char *udi;
--#if defined HAVE_EEZE || defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD__ || defined __NetBSD__
-+#if defined HAVE_EEZE || defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD__
-    Ecore_Poller *poll;
- #endif
-    Eina_Bool present E_BITFIELD;
-    Eina_Bool charging E_BITFIELD;
--#if defined HAVE_EEZE || defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD__ || defined __NetBSD__
-+#if defined HAVE_EEZE || defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD__
-    double last_update;
-    double percent;
-    double current_charge;
-@@ -122,7 +122,7 @@ void _battery_device_update(void);
- int  _battery_udev_start(void);
- void _battery_udev_stop(void);
+@@ -123,7 +123,7 @@ void        _battery_device_update(void)
+ int         _battery_udev_start(void);
+ void        _battery_udev_stop(void);
  /* end e_mod_udev.c */
 -#elif !defined __OpenBSD__ && !defined __DragonFly__ && !defined __FreeBSD__ && !defined __NetBSD__
 +#elif !defined __OpenBSD__ && !defined __DragonFly__ && !defined __FreeBSD__
  /* in e_mod_dbus.c */
- int _battery_upower_start(void);
- void _battery_upower_stop(void);
+ int         _battery_upower_start(void);
+ void        _battery_upower_stop(void);
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c b/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c
deleted file mode 100644
index 57dfc50088..0000000000
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD$
-
-* NetBSD's sysctl is different than in other BSD's,
-* use upower backend
-
---- src/modules/battery/e_mod_sysctl.c.orig	2020-07-26 16:39:12.087314600 +0000
-+++ src/modules/battery/e_mod_sysctl.c
-@@ -1,12 +1,12 @@
- #include "e.h"
- #include "e_mod_main.h"
- 
--#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- # include <err.h>
- # include <sys/types.h>
- # include <sys/sysctl.h>
- 
--#if defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__OpenBSD__)
- # include <sys/param.h>
- # include <sys/sensors.h>
- #endif
-@@ -24,7 +24,7 @@ static Battery *bat = NULL;
- int
- _battery_sysctl_start(void)
- {
--# if defined(__OpenBSD__) || defined(__NetBSD__)
-+# if defined(__OpenBSD__)
-    int mib[] = {CTL_HW, HW_SENSORS, 0, 0, 0};
-    int devn;
-    struct sensordev snsrdev;
-@@ -33,7 +33,7 @@ _battery_sysctl_start(void)
-    size_t len;
- # endif
- 
--# if defined(__OpenBSD__) || defined(__NetBSD__)
-+# if defined(__OpenBSD__)
-    for (devn = 0;; devn++) {
-         mib[2] = devn;
-         if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1)
-@@ -170,7 +170,7 @@ static int
- _battery_sysctl_battery_update()
- {
-    double _time;
--# if defined(__OpenBSD__) || defined(__NetBSD__)
-+# if defined(__OpenBSD__)
-    double charge;
-    struct sensor s;
-    size_t slen = sizeof(struct sensor);
-@@ -184,7 +184,7 @@ _battery_sysctl_battery_update()
-        /* update the poller interval */
-        ecore_poller_poller_interval_set(bat->poll,
-                                         battery_config->poll_interval);
--# if defined(__OpenBSD__) || defined(__NetBSD__)
-+# if defined(__OpenBSD__)
-        charge = 0;
- 
-        /* last full capacity */
-@@ -312,7 +312,7 @@ _battery_sysctl_battery_update()
- 
-    if (ac)
-      {
--# if defined(__OpenBSD__) || defined(__NetBSD__)
-+# if defined(__OpenBSD__)
-        /* AC State */
-        ac->mib[3] = 9;
-        ac->mib[4] = 0;
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
new file mode 100644
index 0000000000..4b710e88ac
--- /dev/null
+++ b/enlightenment-current/patches/patch-src_modules_procstats_e__mod__main.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 @@
+ # include <e.h>
+ #include "process.h"
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+ # include <sys/types.h>
+ # include <sys/sysctl.h>
+ #endif
diff --git a/enlightenment-current/patches/patch-src_modules_procstats_process.c b/enlightenment-current/patches/patch-src_modules_procstats_process.c
new file mode 100644
index 0000000000..771c239df8
--- /dev/null
+++ b/enlightenment-current/patches/patch-src_modules_procstats_process.c
@@ -0,0 +1,65 @@
+$NetBSD$
+
+--- src/modules/procstats/process.c.orig	2023-12-23 16:08:09.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__)
+ # include <sys/user.h>
++#endif
+ # include <sys/proc.h>
+ # include <libgen.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ # include <libgen.h>
+ # include <unistd.h>
+ # include <fcntl.h>
+@@ -93,7 +95,7 @@ _process_state_name(char state)
+       case SIDL:
+         statename = "idle";
+         break;
+-
++#if !defined(__NetBSD__)
+       case SRUN:
+         statename = "run";
+         break;
+@@ -101,17 +103,33 @@ _process_state_name(char state)
+       case SSLEEP:
+         statename = "sleep";
+         break;
++#else
++      case LSRUN:
++        statename = "run";
++        break;
+ 
++      case LSSLEEP:
++        statename = "sleep";
++        break;
++#endif
+       case SSTOP:
+         statename = "stop";
+         break;
+ 
+-#if !defined(__OpenBSD__)
++#if !defined(__OpenBSD__) 
++#if defined(__NetBSD__)
++      case PWAIT:
++#else
+       case SWAIT:
++#endif
+         statename = "wait";
+         break;
+ 
++#if defined(__NetBSD__)
++      case PLOCK:
++#else
+       case SLOCK:
++#endif
+         statename = "lock";
+         break;
+ 
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 a67f15ba17..84ef2f82ba 100644
--- a/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
+++ b/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
@@ -3,17 +3,8 @@ $NetBSD$
 * Add NetBSD support
 * Fix build without eeze on linux
 
---- src/modules/wizard/page_120.c.orig	2020-11-24 12:08:02.226764880 +0000
+--- src/modules/wizard/page_120.c.orig	2023-12-23 16:08:09.000000000 +0000
 +++ src/modules/wizard/page_120.c
-@@ -34,7 +34,7 @@
-    }
-  */
- 
--#if defined (__FreeBSD__) || defined (__OpenBSD__)
-+#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
- #else
- static Eina_List *
- _wizard_temperature_get_bus_files(const char *bus)
 @@ -100,7 +100,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_
     Eina_List *tempdevs = NULL;
  #endif
@@ -23,27 +14,15 @@ $NetBSD$
     // figure out on bsd if we have temp sensors
  #else
     const char *sensor_path[] = {
-@@ -116,11 +116,11 @@ wizard_page_show(E_Wizard_Page *pg EINA_
- 
+@@ -113,10 +113,10 @@ wizard_page_show(E_Wizard_Page *pg EINA_
+       "/sys/devices/platform/thinkpad_hwmon/temp1_input",
+       NULL
+    };
++#endif
+
  #ifdef HAVE_EEZE
     tempdevs = eeze_udev_find_by_type(EEZE_UDEV_TYPE_IS_IT_HOT_OR_IS_IT_COLD_SENSOR, NULL);
 -#endif
     if (tempdevs && (eina_list_count(tempdevs)))
       hav_temperature = 1;
     else
-      {
-+#endif
-         int i = 0;
- 
-         while(sensor_path[i] != NULL)
-@@ -170,8 +170,10 @@ wizard_page_show(E_Wizard_Page *pg EINA_
-                   eina_list_free(therms);
-                }
-           }
-+#ifdef HAVE_EEZE
-      }
- #endif
-+#endif
-    if (!hav_temperature)
-      {
-         E_Config_Module *em;
Home | Main Index | Thread Index | Old Index