pkgsrc-WIP-changes archive

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

efl-current: add NetBSD specific patches



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon May 25 16:57:33 2020 +0200
Changeset:	1f8c6261889169eb8a8c92a036b96679bb9fae65

Modified Files:
	efl-current/Makefile
	efl-current/distinfo
Added Files:
	efl-current/patches/patch-src_lib_ecore_efl__core__proc__env.c
	efl-current/patches/patch-src_lib_ecore_efl__exe.c

Log Message:
efl-current: add NetBSD specific patches

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

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

diffstat:
 efl-current/Makefile                               |  7 +++++
 efl-current/distinfo                               |  2 ++
 .../patch-src_lib_ecore_efl__core__proc__env.c     | 33 ++++++++++++++++++++++
 efl-current/patches/patch-src_lib_ecore_efl__exe.c | 24 ++++++++++++++++
 4 files changed, 66 insertions(+)

diffs:
diff --git a/efl-current/Makefile b/efl-current/Makefile
index c9fa5c5b1f..96700ed315 100644
--- a/efl-current/Makefile
+++ b/efl-current/Makefile
@@ -44,6 +44,13 @@ SUBST_FILES.fix-paths=		src/bin/exactness/*.in
 SUBST_SED.fix-paths=		-e 's,@EXACTNESS_PLAY_PRELOAD_PATH@,${PREFIX}/lib/libexactness_play.so.${PKGVERSION},g'
 SUBST_SED.fix-paths+=		-e 's,@EXACTNESS_RECORD_PRELOAD_PATH@,${PREFIX}/lib/libexactness_record.so.${PKGVERSION},g'
 
+SUBST_CLASSES+=		xdg
+SUBST_MESSAGE.xdg=	Fixing XDG_DATA_DIRS and XDG_CONFIG_DIRS
+SUBST_STAGE.xdg=	pre-configure
+SUBST_FILES.xdg=	src/lib/efreet/efreet_base.c
+SUBST_SED.xdg=		-e 's,/usr/share:/usr/local/share,${PREFIX}/share,'
+SUBST_SED.xdg+=		-e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
+
 REPLACE_PYTHON+=	src/bin/exactness/exactness_play.in
 REPLACE_PYTHON+=	src/bin/exactness/exactness_record.in
 
diff --git a/efl-current/distinfo b/efl-current/distinfo
index 7b50c20e88..fe6e88956e 100644
--- a/efl-current/distinfo
+++ b/efl-current/distinfo
@@ -4,3 +4,5 @@ SHA1 (efl-1.24.1.tar.xz) = edf97e6e8a79d847839e179e97825c8aa4d0280e
 RMD160 (efl-1.24.1.tar.xz) = de15ce9a28dde6247213d6ae01e2baed6120395d
 SHA512 (efl-1.24.1.tar.xz) = 6fe4d87a9db1e0022c1dff94c14d334d61e561608016072bcb1d2633054ff9a6a74c84bc9903592d716abc9e1fae48b6ff66b259a5a59114a1cd54f083ce8b51
 Size (efl-1.24.1.tar.xz) = 72277640 bytes
+SHA1 (patch-src_lib_ecore_efl__core__proc__env.c) = 1efcc1a40f5da8990fe489f8120c95566fbbaeb4
+SHA1 (patch-src_lib_ecore_efl__exe.c) = 7422ef573e8c244bae06c621975b6a5103ef24c0
diff --git a/efl-current/patches/patch-src_lib_ecore_efl__core__proc__env.c b/efl-current/patches/patch-src_lib_ecore_efl__core__proc__env.c
new file mode 100644
index 0000000000..db8d1609a9
--- /dev/null
+++ b/efl-current/patches/patch-src_lib_ecore_efl__core__proc__env.c
@@ -0,0 +1,33 @@
+$NetBSD$
+
+* Add NetBSD support
+
+--- src/lib/ecore/efl_core_proc_env.c.orig	2020-05-11 11:32:41.000000000 +0000
++++ src/lib/ecore/efl_core_proc_env.c
+@@ -13,7 +13,7 @@
+ 
+ #define MY_CLASS EFL_CORE_PROC_ENV_CLASS
+ 
+-#if defined (__FreeBSD__) || defined (__OpenBSD__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+ # include <dlfcn.h>
+ static char ***_dl_environ;
+ #else
+@@ -42,7 +42,7 @@ _sync(Efl_Core_Env *obj, Efl_Core_Proc_E
+         existing_keys = eina_list_append(existing_keys, key);
+      }
+ 
+-#if defined (__FreeBSD__) || defined (__OpenBSD__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+    _dl_environ = dlsym(NULL, "environ");
+    if (_dl_environ) loc_env = *_dl_environ;
+    else ERR("Can't find envrion symbol");
+@@ -121,7 +121,7 @@ _efl_core_proc_env_efl_core_env_clear(Eo
+ #ifdef HAVE_CLEARENV
+         clearenv();
+ #else
+-# if defined (__FreeBSD__) || defined (__OpenBSD__)
++# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+         _dl_environ = dlsym(NULL, "environ");
+         if (_dl_environ) *_dl_environ = NULL;
+         else ERR("Can't find envrion symbol");
diff --git a/efl-current/patches/patch-src_lib_ecore_efl__exe.c b/efl-current/patches/patch-src_lib_ecore_efl__exe.c
new file mode 100644
index 0000000000..f5743a855e
--- /dev/null
+++ b/efl-current/patches/patch-src_lib_ecore_efl__exe.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+* Add NetBSD support
+
+--- src/lib/ecore/efl_exe.c.orig	2020-05-11 11:32:41.000000000 +0000
++++ src/lib/ecore/efl_exe.c
+@@ -32,7 +32,7 @@
+ #  include <sys/wait.h>
+ # endif
+ # ifndef HAVE_CLEARENV
+-#  if defined (__FreeBSD__) || defined (__OpenBSD__)
++#  if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+ #   include <dlfcn.h>
+ static char ***_dl_environ;
+ #  else
+@@ -531,7 +531,7 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_D
+ # ifdef HAVE_CLEARENV
+         clearenv();
+ # else
+-#  if defined (__FreeBSD__) || defined (__OpenBSD__)
++#  if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+         _dl_environ = dlsym(NULL, "environ");
+         if (_dl_environ) *_dl_environ = NULL;
+         else ERR("Can't find envrion symbol");


Home | Main Index | Thread Index | Old Index