pkgsrc-WIP-changes archive

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

efl: sync with upstream patch



Module Name:	pkgsrc-wip
Committed By:	moihack <moihack@noreply.localhost>
Pushed By:	moihack
Date:		Sat Aug 29 15:27:00 2026 +0200
Changeset:	e641ca4207fc469fc417f383e7729f85d611b6bb

Modified Files:
	efl/distinfo
	efl/patches/patch-src_lib_eina_eina__file__posix.c

Log Message:
efl: sync with upstream patch

This was upstreamed as part of pull request:
https://git.enlightenment.org/enlightenment/efl/pulls/130

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

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

diffstat:
 efl/distinfo                                       |  2 +-
 efl/patches/patch-src_lib_eina_eina__file__posix.c | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diffs:
diff --git a/efl/distinfo b/efl/distinfo
index 4776bfa8e1..616d347487 100644
--- a/efl/distinfo
+++ b/efl/distinfo
@@ -8,5 +8,5 @@ SHA1 (patch-src_lib_ecore_Efl__Core.h) = 5f6720fbb737a54bc73dc07208280972af6d8df
 SHA1 (patch-src_lib_ecore_ecore__exe__posix.c) = 22d8ebb9df3e8b0f59f07bbd238a1cf5b6e02e28
 SHA1 (patch-src_lib_ecore_efl__core__proc__env.c) = 8d77fc851bef5a79b76fb80aaf71ac6350592db6
 SHA1 (patch-src_lib_ecore_efl__exe.c) = caacd04dd2a9338371c6f4fe778dea7f024c1847
-SHA1 (patch-src_lib_eina_eina__file__posix.c) = 5d38a9c90bc27418178e729f23f8f7982d314e92
+SHA1 (patch-src_lib_eina_eina__file__posix.c) = 8b9eca7a436a8a431908cf98185dba57340c38f0
 SHA1 (patch-src_lib_elementary_Efl__Ui.h) = d319c6242ca420ad788a82dfa80b5c5f03ea29ca
diff --git a/efl/patches/patch-src_lib_eina_eina__file__posix.c b/efl/patches/patch-src_lib_eina_eina__file__posix.c
index 1231d0ddd1..2bc38e52d7 100644
--- a/efl/patches/patch-src_lib_eina_eina__file__posix.c
+++ b/efl/patches/patch-src_lib_eina_eina__file__posix.c
@@ -1,27 +1,21 @@
 $NetBSD$
 
-Add Dirent / getdents wrapper.
+Add getdents wrapper. Use NetBSD dirent structure.
+Merged upstream: https://git.enlightenment.org/enlightenment/efl/pulls/130
 
---- src/lib/eina/eina_file_posix.c.orig	2023-12-23 15:56:36.000000000 +0000
+--- src/lib/eina/eina_file_posix.c.orig	2025-03-17 15:43:43.000000000 +0000
 +++ src/lib/eina/eina_file_posix.c
-@@ -1299,6 +1299,16 @@ typedef struct
+@@ -1285,6 +1285,9 @@ typedef struct
     unsigned char  ____pad[4];
     char           d_name[4096];
  } Dirent;
 +#elif defined(__NetBSD__)
 +# define do_getdents(fd, buf, size) getdents(fd, buf, size)
-+typedef struct
-+{
-+   ino_t          d_fileno;
-+   uint16_t       d_reclen;
-+   uint16_t       d_namlen;
-+   uint8_t        d_type;
-+   char           d_name[4096];
-+} Dirent;
++typedef struct dirent Dirent;
  #elif defined(__linux__)
  # define do_getdents(fd, buf, size) syscall(SYS_getdents64, fd, buf, size)
  // getdents64 added un glibc 2.30 ... so use raw syscall - will work
-@@ -1322,7 +1332,7 @@ eina_file_close_from(int fd, int *except
+@@ -1308,7 +1311,7 @@ eina_file_close_from(int fd, int *except
  #else
  #ifdef HAVE_DIRENT_H
  //# if 0


Home | Main Index | Thread Index | Old Index